Set focus before transition

ArthurClemens · Aug 17, 2024 · bfd2e1c · bfd2e1c
1 parent 8835c85
commit bfd2e1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/prompt.ts b/src/prompt.ts
@@ -231,11 +231,11 @@ const showView = async (
   options.willShow?.(elements);
   options.getStatus?.(prompt.status);
 
+  focusFirstElement(content, isFocusFirst, focusFirstSelector);
+
   const duration = getDuration(content);
   await wait(duration);
 
-  focusFirstElement(content, isFocusFirst, focusFirstSelector);
-
   prompt.status = {
     ...INITIAL_STATUS,
     didShow: true,

diff --git a/src/util.ts b/src/util.ts
@@ -101,7 +101,6 @@ export const getFirstFocusable = (content: HTMLElement) => {
     ) as HTMLElement[]
   )
     // Omit focus trap element
-    .filter(el => !(el.getAttribute('aria-hidden') === 'true'))
     .filter(el => isFocusable(el, true))
     .sort((a, b) => a.tabIndex - b.tabIndex);
   return focusable[0] || content;