focus-lock - npm Package Compare versions

Comparing version 0.6.4 to 0.6.5

dist/cjs/focusMerge.js

@@ -115,7 +115,10 @@ 'use strict';
 var reorderNodes = function reorderNodes(srcNodes, dstNodes) {
-  return srcNodes.map(function (dnode) {
-    return dstNodes.find(function (_ref) {
-      var node = _ref.node;
-      return dnode === node;
-    });
+  var remap = new Map();
+  // no Set(dstNodes) for IE11 :(
+  dstNodes.forEach(function (entity) {
+    return remap.set(entity.node, entity);
+  });
+  // remap to dstNodes
+  return srcNodes.map(function (node) {
+    return remap.get(node);
   }).filter(Boolean);
@@ -128,13 +131,13 @@ };
   var outerNodes = (0, _DOMutils.getTabbableNodes)([commonParent], true);
-  var innerElements = (0, _DOMutils.getTabbableNodes)(entries).filter(function (_ref2) {
+  var innerElements = (0, _DOMutils.getTabbableNodes)(entries).filter(function (_ref) {
+    var node = _ref.node;
+    return notAGuard(node);
+  }).map(function (_ref2) {
     var node = _ref2.node;
-    return notAGuard(node);
-  }).map(function (_ref3) {
-    var node = _ref3.node;
     return node;
   });
 
-  return outerNodes.map(function (_ref4) {
-    var node = _ref4.node,
-        index = _ref4.index;
+  return outerNodes.map(function (_ref3) {
+    var node = _ref3.node,
+        index = _ref3.index;
     return {
@@ -155,4 +158,4 @@ node: node,
 
-  var innerElements = (0, _DOMutils.getTabbableNodes)(entries).filter(function (_ref5) {
-    var node = _ref5.node;
+  var innerElements = (0, _DOMutils.getTabbableNodes)(entries).filter(function (_ref4) {
+    var node = _ref4.node;
     return notAGuard(node);
@@ -162,4 +165,4 @@ });
   if (!innerElements[0]) {
-    innerElements = (0, _DOMutils.getAllTabbableNodes)(entries).filter(function (_ref6) {
-      var node = _ref6.node;
+    innerElements = (0, _DOMutils.getAllTabbableNodes)(entries).filter(function (_ref5) {
+      var node = _ref5.node;
       return notAGuard(node);
@@ -172,9 +175,9 @@ });
 
-  var outerNodes = (0, _DOMutils.getTabbableNodes)([commonParent]).map(function (_ref7) {
-    var node = _ref7.node;
+  var outerNodes = (0, _DOMutils.getTabbableNodes)([commonParent]).map(function (_ref6) {
+    var node = _ref6.node;
     return node;
   });
   var orderedInnerElements = reorderNodes(outerNodes, innerElements);
-  var innerNodes = orderedInnerElements.map(function (_ref8) {
-    var node = _ref8.node;
+  var innerNodes = orderedInnerElements.map(function (_ref7) {
+    var node = _ref7.node;
     return node;
@@ -181,0 +184,0 @@ });

dist/es2015/focusMerge.js

@@ -99,7 +99,10 @@ import { getCommonParent, getTabbableNodes, getAllTabbableNodes, parentAutofocusables } from './utils/DOMutils';
 var reorderNodes = function reorderNodes(srcNodes, dstNodes) {
-  return srcNodes.map(function (dnode) {
-    return dstNodes.find(function (_ref) {
-      var node = _ref.node;
-      return dnode === node;
-    });
+  var remap = new Map();
+  // no Set(dstNodes) for IE11 :(
+  dstNodes.forEach(function (entity) {
+    return remap.set(entity.node, entity);
+  });
+  // remap to dstNodes
+  return srcNodes.map(function (node) {
+    return remap.get(node);
   }).filter(Boolean);
@@ -112,13 +115,13 @@ };
   var outerNodes = getTabbableNodes([commonParent], true);
-  var innerElements = getTabbableNodes(entries).filter(function (_ref2) {
+  var innerElements = getTabbableNodes(entries).filter(function (_ref) {
+    var node = _ref.node;
+    return notAGuard(node);
+  }).map(function (_ref2) {
     var node = _ref2.node;
-    return notAGuard(node);
-  }).map(function (_ref3) {
-    var node = _ref3.node;
     return node;
   });
 
-  return outerNodes.map(function (_ref4) {
-    var node = _ref4.node,
-        index = _ref4.index;
+  return outerNodes.map(function (_ref3) {
+    var node = _ref3.node,
+        index = _ref3.index;
     return {
@@ -139,4 +142,4 @@ node: node,
 
-  var innerElements = getTabbableNodes(entries).filter(function (_ref5) {
-    var node = _ref5.node;
+  var innerElements = getTabbableNodes(entries).filter(function (_ref4) {
+    var node = _ref4.node;
     return notAGuard(node);
@@ -146,4 +149,4 @@ });
   if (!innerElements[0]) {
-    innerElements = getAllTabbableNodes(entries).filter(function (_ref6) {
-      var node = _ref6.node;
+    innerElements = getAllTabbableNodes(entries).filter(function (_ref5) {
+      var node = _ref5.node;
       return notAGuard(node);
@@ -156,9 +159,9 @@ });
 
-  var outerNodes = getTabbableNodes([commonParent]).map(function (_ref7) {
-    var node = _ref7.node;
+  var outerNodes = getTabbableNodes([commonParent]).map(function (_ref6) {
+    var node = _ref6.node;
     return node;
   });
   var orderedInnerElements = reorderNodes(outerNodes, innerElements);
-  var innerNodes = orderedInnerElements.map(function (_ref8) {
-    var node = _ref8.node;
+  var innerNodes = orderedInnerElements.map(function (_ref7) {
+    var node = _ref7.node;
     return node;
@@ -165,0 +168,0 @@ });

package.json

 {
   "name": "focus-lock",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "DOM trap for a focus",
@@ -5,0 +5,0 @@ "main": "dist/cjs/index.js",

No alert changes

Improved metrics

Total package byte prevSize

40704

increased by0.43%

Lines of code

843

increased by0.72%

No dependency changes