From e68998e570e92fd3e5132fb23c4e257308537971 Mon Sep 17 00:00:00 2001 From: JB Date: Sun, 9 Aug 2020 22:54:53 +0200 Subject: [PATCH] fix: only prevent tab if next tabbable is found --- src/Dialog/Dialog.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Dialog/Dialog.ts b/src/Dialog/Dialog.ts index cde722b..503f9a8 100644 --- 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()