Updates

KonnorRogers · Jan 10, 2024 · 8ab18a7 · 8ab18a7
1 parent 0948eaf
commit 8ab18a7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/inline-module-9e804879e37a77d0185feb25684c241c.js b/inline-module-9e804879e37a77d0185feb25684c241c.js
@@ -523,7 +523,12 @@ class Trap {
 
     const addition = this.tabDirection === 'forward' ? 1 : -1;
 
+    let count = 0;
     while(true) {
+      if (count >= tabbableElements.length) {
+        break
+      }
+
       if (currentFocusIndex + addition >= tabbableElements.length) {
         currentFocusIndex = 0;
       } else if (currentFocusIndex + addition < 0) {
@@ -552,9 +557,11 @@ class Trap {
       this.currentFocus?.focus({ preventScroll: this.preventScroll });
 
       // @ts-expect-error
-      if ([...activeElements()].includes(this.currentFocus)) {
+      if (![...activeElements()].includes(this.previousFocus)) {
         break
       }
+
+      count++;
     }
   }