fix: use only auto guards

theKashey · Mar 11, 2019 · 12dab4a · 12dab4a
1 parent 33fcd0b
commit 12dab4a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/Trap.js b/src/Trap.js
@@ -33,10 +33,16 @@ function autoGuard(startIndex, end, step, allNodes) {
   let lastGuard = null;
   let i = startIndex;
   do {
-    const node = allNodes[i];
-    if (node.guard) {
-      lastGuard = node;
-    } else if (node.lockItem) {
+    const item = allNodes[i];
+    if (item.guard) {
+      if (item.node.dataset.focusAutoGuard) {
+        lastGuard = item;
+      }
+    } else if (item.lockItem) {
+      if (i !== startIndex) {
+        // we will tab to the next element
+        return;
+      }
       lastGuard = null;
     } else {
       break;