fix: fix guard order

theKashey · Mar 11, 2019 · c390b1a · c390b1a
1 parent c3e068c
commit c390b1a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/utils/DOMutils.js b/src/utils/DOMutils.js
@@ -52,7 +52,7 @@ export const filterFocusable = nodes =>
     .filter(node => notHiddenInput(node));
 
 export const getTabbableNodes = (topNodes, withGuards) => (
-  orderByTabIndex(filterFocusable(getFocusables(topNodes, withGuards)), true)
+  orderByTabIndex(filterFocusable(getFocusables(topNodes, withGuards)), true, withGuards)
 );
 
 export const getAllTabbableNodes = topNodes => (

diff --git a/src/utils/tabOrder.js b/src/utils/tabOrder.js
@@ -12,12 +12,12 @@ export const tabSort = (a, b) => {
   return tabDiff || indexDiff;
 };
 
-export const orderByTabIndex = (nodes, filterNegative) =>
+export const orderByTabIndex = (nodes, filterNegative, keepGuards) =>
   toArray(nodes)
     .map((node, index) => ({
       node,
       index,
-      tabIndex: node.tabIndex === -1
+      tabIndex: keepGuards && node.tabIndex === -1
         ? ((node.dataset || {}).focusGuard ? 0 : -1)
         : node.tabIndex,
     }))