fix: dont use array.find, fixes #9

theKashey · Jun 10, 2019 · cbeec63 · cbeec63
1 parent b334e13
commit cbeec63
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/focusMerge.js b/src/focusMerge.js
@@ -97,11 +97,13 @@ const allParentAutofocusables = entries => (
   entries.reduce((acc, node) => acc.concat(parentAutofocusables(node)), [])
 );
 
-const reorderNodes = (srcNodes, dstNodes) => (
-  srcNodes
-    .map(dnode => dstNodes.find(({ node }) => dnode === node))
-    .filter(Boolean)
-);
+const reorderNodes = (srcNodes, dstNodes) => {
+  const remap = new Map();
+  // no Set(dstNodes) for IE11 :(
+  dstNodes.forEach(entity => remap.set(entity.node, entity));
+  // remap to dstNodes
+  return srcNodes.map(node => remap.get(node)).filter(Boolean);
+};
 
 export const getFocusabledIn = (topNode) => {
   const entries = getAllAffectedNodes(topNode).filter(notAGuard);