@reach/dialog - npm Package Compare versions

Comparing version 0.1.1 to 0.1.2

es/index.js

@@ -47,7 +47,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-var portalDidMount = function portalDidMount(_ref) {
-  var refs = _ref.refs;
-
+var portalDidMount = function portalDidMount(refs, initialFocusRef) {
   refs.disposeAriaHider = createAriaHider(refs.overlayNode);
   refs.trap = createFocusTrap(refs.overlayNode, {
+    initialFocus: initialFocusRef ? function () {
+      return initialFocusRef.current;
+    } : undefined,
     fallbackFocus: refs.contentNode,
@@ -60,4 +61,4 @@ escapeDeactivates: false,
 
-var contentWillUnmount = function contentWillUnmount(_ref2) {
-  var refs = _ref2.refs;
+var contentWillUnmount = function contentWillUnmount(_ref) {
+  var refs = _ref.refs;
 
@@ -70,10 +71,11 @@ refs.trap.deactivate();
 
-var DialogOverlay = React.forwardRef(function (_ref3, forwardRef) {
-  var _ref3$isOpen = _ref3.isOpen,
-      isOpen = _ref3$isOpen === undefined ? true : _ref3$isOpen,
-      _ref3$onDismiss = _ref3.onDismiss,
-      onDismiss = _ref3$onDismiss === undefined ? k : _ref3$onDismiss,
-      onClick = _ref3.onClick,
-      onKeyDown = _ref3.onKeyDown,
-      props = _objectWithoutProperties(_ref3, ["isOpen", "onDismiss", "onClick", "onKeyDown"]);
+var DialogOverlay = React.forwardRef(function (_ref2, forwardRef) {
+  var _ref2$isOpen = _ref2.isOpen,
+      isOpen = _ref2$isOpen === undefined ? true : _ref2$isOpen,
+      _ref2$onDismiss = _ref2.onDismiss,
+      onDismiss = _ref2$onDismiss === undefined ? k : _ref2$onDismiss,
+      initialFocusRef = _ref2.initialFocusRef,
+      onClick = _ref2.onClick,
+      onKeyDown = _ref2.onKeyDown,
+      props = _objectWithoutProperties(_ref2, ["isOpen", "onDismiss", "initialFocusRef", "onClick", "onKeyDown"]);
 
@@ -90,3 +92,7 @@ return React.createElement(
           refs: { overlayNode: null, contentNode: null },
-          didMount: portalDidMount,
+          didMount: function didMount(_ref3) {
+            var refs = _ref3.refs;
+
+            portalDidMount(refs, initialFocusRef);
+          },
           willUnmount: contentWillUnmount
@@ -125,2 +131,6 @@ },
 
+DialogOverlay.propTypes = {
+  initialFocusRef: function initialFocusRef() {}
+};
+
 var stopPropagation = function stopPropagation(event) {
@@ -127,0 +137,0 @@ return event.stopPropagation();

index.js

@@ -66,7 +66,8 @@ "use strict";
 
-var portalDidMount = function portalDidMount(_ref) {
-  var refs = _ref.refs;
-
+var portalDidMount = function portalDidMount(refs, initialFocusRef) {
   refs.disposeAriaHider = createAriaHider(refs.overlayNode);
   refs.trap = (0, _focusTrap2.default)(refs.overlayNode, {
+    initialFocus: initialFocusRef ? function () {
+      return initialFocusRef.current;
+    } : undefined,
     fallbackFocus: refs.contentNode,
@@ -79,4 +80,4 @@ escapeDeactivates: false,
 
-var contentWillUnmount = function contentWillUnmount(_ref2) {
-  var refs = _ref2.refs;
+var contentWillUnmount = function contentWillUnmount(_ref) {
+  var refs = _ref.refs;
 
@@ -89,10 +90,11 @@ refs.trap.deactivate();
 
-var DialogOverlay = _react2.default.forwardRef(function (_ref3, forwardRef) {
-  var _ref3$isOpen = _ref3.isOpen,
-      isOpen = _ref3$isOpen === undefined ? true : _ref3$isOpen,
-      _ref3$onDismiss = _ref3.onDismiss,
-      onDismiss = _ref3$onDismiss === undefined ? k : _ref3$onDismiss,
-      onClick = _ref3.onClick,
-      onKeyDown = _ref3.onKeyDown,
-      props = _objectWithoutProperties(_ref3, ["isOpen", "onDismiss", "onClick", "onKeyDown"]);
+var DialogOverlay = _react2.default.forwardRef(function (_ref2, forwardRef) {
+  var _ref2$isOpen = _ref2.isOpen,
+      isOpen = _ref2$isOpen === undefined ? true : _ref2$isOpen,
+      _ref2$onDismiss = _ref2.onDismiss,
+      onDismiss = _ref2$onDismiss === undefined ? k : _ref2$onDismiss,
+      initialFocusRef = _ref2.initialFocusRef,
+      onClick = _ref2.onClick,
+      onKeyDown = _ref2.onKeyDown,
+      props = _objectWithoutProperties(_ref2, ["isOpen", "onDismiss", "initialFocusRef", "onClick", "onKeyDown"]);
 
@@ -109,3 +111,7 @@ return _react2.default.createElement(
           refs: { overlayNode: null, contentNode: null },
-          didMount: portalDidMount,
+          didMount: function didMount(_ref3) {
+            var refs = _ref3.refs;
+
+            portalDidMount(refs, initialFocusRef);
+          },
           willUnmount: contentWillUnmount
@@ -144,2 +150,6 @@ },
 
+DialogOverlay.propTypes = {
+  initialFocusRef: function initialFocusRef() {}
+};
+
 var stopPropagation = function stopPropagation(event) {
@@ -146,0 +156,0 @@ return event.stopPropagation();

package.json

 {
   "name": "@reach/dialog",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Accessible React Modal Dialog.",
@@ -17,3 +17,3 @@ "author": "Ryan Florence <@ryanflorence>",
     "@reach/portal": "^0.1.1",
-    "@reach/utils": "^0.1.1",
+    "@reach/utils": "^0.1.2",
     "focus-trap": "^3.0.0"
@@ -20,0 +20,0 @@ },

src/index.js

@@ -41,5 +41,6 @@ import React from "react";
 
-let portalDidMount = ({ refs }) => {
+let portalDidMount = (refs, initialFocusRef) => {
   refs.disposeAriaHider = createAriaHider(refs.overlayNode);
   refs.trap = createFocusTrap(refs.overlayNode, {
+    initialFocus: initialFocusRef ? () => initialFocusRef.current : undefined,
     fallbackFocus: refs.contentNode,
@@ -61,3 +62,10 @@ escapeDeactivates: false,
   (
-    { isOpen = true, onDismiss = k, onClick, onKeyDown, ...props },
+    {
+      isOpen = true,
+      onDismiss = k,
+      initialFocusRef,
+      onClick,
+      onKeyDown,
+      ...props
+    },
     forwardRef
@@ -70,3 +78,5 @@ ) => (
             refs={{ overlayNode: null, contentNode: null }}
-            didMount={portalDidMount}
+            didMount={({ refs }) => {
+              portalDidMount(refs, initialFocusRef);
+            }}
             willUnmount={contentWillUnmount}
@@ -103,2 +113,6 @@ >
 
+DialogOverlay.propTypes = {
+  initialFocusRef: () => {}
+};
+
 let stopPropagation = event => event.stopPropagation();
@@ -105,0 +119,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

16818

increased by6.23%

Lines of code

457

increased by7.28%

Dependency changes

• Updated@reach/utils@^0.1.2