(focus-trap/src/destination.ts) Fix inefficient code

DaviDevMod · May 19, 2023 · 79b0e44 · 79b0e44
1 parent 22641b7
commit 79b0e44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/warm-moles-share.md b/.changeset/warm-moles-share.md
@@ -0,0 +1,5 @@
+---
+'@davidevmod/focus-trap': patch
+---
+
+Fix inefficient code in destination.ts
diff --git a/packages/focus-trap/src/destination.ts b/packages/focus-trap/src/destination.ts
@@ -126,11 +126,11 @@ const nextFirstOrLastZeroOrPositiveTabbable = (
     if (direction === 'BACKWARD') destinationRootIndex--;
   }
 
+  const firstOrLastZeroInTrap = firstOrLastZeroTabbable(roots, direction === 'FORWARD' ? 'LAST' : 'FIRST');
+
   for (let i = destinationRootIndex; Math.abs(i) < 2 * roots.length; i += direction === 'FORWARD' ? 1 : -1) {
     const alternativeDestinationRootIndex = modulo(i, roots.length);
 
-    const firstOrLastZeroInTrap = firstOrLastZeroTabbable(roots, direction === 'FORWARD' ? 'LAST' : 'FIRST');
-
     if (
       !firstOrLastZeroInTrap ||
       origin === firstOrLastZeroInTrap ||