fix: only prevent tab if next tabbable is found

visualjerk · Aug 9, 2020 · e68998e · e68998e
1 parent 1140299
commit e68998e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Dialog/Dialog.ts b/src/Dialog/Dialog.ts
@@ -121,8 +121,11 @@ function handleTab(
   )
   const tabbableElements = getTabbableElements(ref.value)
   if (!event.shiftKey && reachedLastTabbable(tabbableElements)) {
-    getNextTabbable(disclosure)?.focus()
-    event.preventDefault()
+    const nextTabbable = getNextTabbable(disclosure)
+    if (nextTabbable) {
+      nextTabbable.focus()
+      event.preventDefault()
+    }
   } else if (event.shiftKey && reachedFirstTabbable(tabbableElements)) {
     disclosure.focus()
     event.preventDefault()