Be ready for slow next menu

ai · Apr 2, 2024 · c991530 · c991530
1 parent e03ced1
commit c991530
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/jump.js b/jump.js
@@ -24,32 +24,34 @@ export function jumpKeyUX() {
       }
     }
 
-    function jumpIfFound(area) {
-      let next = area.querySelector(
-        'a, button, select, textarea, ' +
-          'input:not([type=radio]), [type=radio]:checked, ' +
-          '[tabindex]:not([tabindex="-1"])'
-      )
-      if (next) focus(next)
-      return next
-    }
+    let tries = 0
+    let finding
 
     function jump(from) {
+      clearInterval(finding)
       let ariaControls = from.getAttribute('aria-controls')
       if (!ariaControls) return
-      setTimeout(() => {
+      finding = setInterval(() => {
+        if (tries++ > 50) {
+          clearInterval(finding)
+          return
+        }
         let area = window.document.getElementById(ariaControls)
         if (area) {
-          area.dispatchEvent(
-            new window.CustomEvent('keyuxJump', { bubbles: true })
+          let next = area.querySelector(
+            'a, button, select, textarea, ' +
+              'input:not([type=radio]), [type=radio]:checked, ' +
+              '[tabindex]:not([tabindex="-1"])'
           )
-          if (!jumpIfFound(area)) {
-            setTimeout(() => {
-              jumpIfFound(area)
-            }, 100)
+          if (next) {
+            clearInterval(finding)
+            area.dispatchEvent(
+              new window.CustomEvent('keyuxJump', { bubbles: true })
+            )
+            focus(next)
           }
         }
-      }, 10)
+      }, 50)
     }
 
     function click(event) {

diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
       "import": {
         "./index.js": "{ startKeyUX, hotkeyKeyUX, pressKeyUX, focusGroupKeyUX, jumpKeyUX, hiddenKeyUX, likelyWithKeyboard, getHotKeyHint }"
       },
-      "limit": "1957 B"
+      "limit": "1967 B"
     }
   ],
   "clean-publish": {