focus-lock - npm Package Compare versions

Comparing version 0.5.3 to 0.5.4

dist/cjs/focusMerge.js

@@ -109,13 +109,20 @@ 'use strict';
   });
+
   if (!innerElements[0]) {
-    return undefined;
+    innerElements = (0, _DOMutils.getAllTabbableNodes)(entries).filter(function (_ref2) {
+      var node = _ref2.node;
+      return notAGuard(node);
+    });
+    if (!innerElements[0]) {
+      return undefined;
+    }
   }
 
-  var innerNodes = innerElements.map(function (_ref2) {
-    var node = _ref2.node;
+  var innerNodes = innerElements.map(function (_ref3) {
+    var node = _ref3.node;
     return node;
   });
 
-  var outerNodes = (0, _DOMutils.getTabbableNodes)([commonParent]).map(function (_ref3) {
-    var node = _ref3.node;
+  var outerNodes = (0, _DOMutils.getTabbableNodes)([commonParent]).map(function (_ref4) {
+    var node = _ref4.node;
     return node;
@@ -122,0 +129,0 @@ });

dist/cjs/utils/DOMutils.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.parentAutofocusables = exports.getTabbableNodes = exports.filterFocusable = exports.getCommonParent = exports.notHiddenInput = exports.isVisible = undefined;
+exports.parentAutofocusables = exports.getAllTabbableNodes = exports.getTabbableNodes = exports.filterFocusable = exports.getCommonParent = exports.notHiddenInput = exports.isVisible = undefined;
 
@@ -62,7 +62,11 @@ var _tabOrder = require('./tabOrder');
 var getTabbableNodes = exports.getTabbableNodes = function getTabbableNodes(topNodes) {
-  return (0, _tabOrder.orderByTabIndex)(filterFocusable((0, _tabUtils.getFocusables)(topNodes)));
+  return (0, _tabOrder.orderByTabIndex)(filterFocusable((0, _tabUtils.getFocusables)(topNodes)), true);
 };
 
+var getAllTabbableNodes = exports.getAllTabbableNodes = function getAllTabbableNodes(topNodes) {
+  return (0, _tabOrder.orderByTabIndex)(filterFocusable((0, _tabUtils.getFocusables)(topNodes)), false);
+};
+
 var parentAutofocusables = exports.parentAutofocusables = function parentAutofocusables(topNode) {
   return filterFocusable((0, _tabUtils.getParentAutofocusables)(topNode));
 };

dist/cjs/utils/tabOrder.js

@@ -22,3 +22,3 @@ 'use strict';
 
-var orderByTabIndex = exports.orderByTabIndex = function orderByTabIndex(nodes) {
+var orderByTabIndex = exports.orderByTabIndex = function orderByTabIndex(nodes, filterNegative) {
   return (0, _array.toArray)(nodes).map(function (node, index) {
@@ -31,4 +31,4 @@ return {
   }).filter(function (data) {
-    return data.tabIndex >= 0;
+    return !filterNegative || data.tabIndex >= 0;
   }).sort(tabSort);
 };

dist/es2015/focusMerge.js

@@ -1,2 +0,2 @@
-import { getCommonParent, getTabbableNodes, parentAutofocusables } from './utils/DOMutils';
+import { getCommonParent, getTabbableNodes, getAllTabbableNodes, parentAutofocusables } from './utils/DOMutils';
 import pickFirstFocus from './utils/firstFocus';
@@ -94,13 +94,20 @@ import getAllAffectedNodes from './utils/all-affected';
   });
+
   if (!innerElements[0]) {
-    return undefined;
+    innerElements = getAllTabbableNodes(entries).filter(function (_ref2) {
+      var node = _ref2.node;
+      return notAGuard(node);
+    });
+    if (!innerElements[0]) {
+      return undefined;
+    }
   }
 
-  var innerNodes = innerElements.map(function (_ref2) {
-    var node = _ref2.node;
+  var innerNodes = innerElements.map(function (_ref3) {
+    var node = _ref3.node;
     return node;
   });
 
-  var outerNodes = getTabbableNodes([commonParent]).map(function (_ref3) {
-    var node = _ref3.node;
+  var outerNodes = getTabbableNodes([commonParent]).map(function (_ref4) {
+    var node = _ref4.node;
     return node;
@@ -107,0 +114,0 @@ });

dist/es2015/utils/DOMutils.js

@@ -52,7 +52,11 @@ import { orderByTabIndex } from './tabOrder';
 export var getTabbableNodes = function getTabbableNodes(topNodes) {
-  return orderByTabIndex(filterFocusable(getFocusables(topNodes)));
+  return orderByTabIndex(filterFocusable(getFocusables(topNodes)), true);
 };
 
+export var getAllTabbableNodes = function getAllTabbableNodes(topNodes) {
+  return orderByTabIndex(filterFocusable(getFocusables(topNodes)), false);
+};
+
 export var parentAutofocusables = function parentAutofocusables(topNode) {
   return filterFocusable(getParentAutofocusables(topNode));
 };

dist/es2015/utils/tabOrder.js

@@ -15,3 +15,3 @@ import { toArray } from './array';
 
-export var orderByTabIndex = function orderByTabIndex(nodes) {
+export var orderByTabIndex = function orderByTabIndex(nodes, filterNegative) {
   return toArray(nodes).map(function (node, index) {
@@ -24,4 +24,4 @@ return {
   }).filter(function (data) {
-    return data.tabIndex >= 0;
+    return !filterNegative || data.tabIndex >= 0;
   }).sort(tabSort);
 };

package.json

 {
   "name": "focus-lock",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "DOM trap for a focus",
@@ -16,3 +16,4 @@ "main": "dist/cjs/index.js",
     "lint": "eslint src tests",
-    "lint:fix": "eslint src tests --fix"
+    "lint:fix": "eslint src tests --fix",
+    "size": "yarn size-limit"
   },
@@ -51,4 +52,5 @@ "repository": {
     "mocha": "^3.4.2",
-    "sinon": "3.2.1"
+    "sinon": "3.2.1",
+    "size-limit": "^0.21.1"
   }
 }

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

329567

increased by123.28%

Number of package files

35

increased by2.94%

Lines of code

719

increased by2.57%

Worsened metrics

Dev dependency count

18

increased by5.88%

No dependency changes