Skip to content

fix(webkit): restore focus to the popover trigger's focusable child #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabriel-lisboa-azion wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(webkit): restore focus to the popover trigger's focusable child #882

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
098cadf
fix(webkit): restore focus to the popover trigger's focusable child
gabriel-lisboa-azion Aug 11, 2026
014275e
Merge branch 'main' into fix/popover-focus-restore
herbert-julio-azion Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions packages/webkit/src/components/overlay/popover/popover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
inheritAttrs: false
})

/** Focusable, enabled elements — used both to trap Tab and to restore focus on close. */
const FOCUSABLE_SELECTOR =
'a[href],button:not([disabled]),input:not([disabled]),select:not([disabled]),textarea:not([disabled]),[tabindex]:not([tabindex="-1"])'

defineSlots<{
default(): unknown
}>()
Expand Down Expand Up @@ -99,16 +103,25 @@
}

function focusTrigger() {
triggerRef.value?.focus({ preventScroll: true })
const trigger = triggerRef.value
if (!trigger) return
// `PopoverTrigger` is a PASSTHROUGH <span> with no tabindex, so focusing it directly
// is a no-op: the focusable thing is the consumer's child (a Button, a link). Calling
// `.focus()` on the wrapper therefore left focus wherever it was — and since the
// panel is unmounting at that moment, the browser dropped it on <body>, silently
// losing the user's place every time an overlay closed with focus inside it.
// (Dialog/Drawer triggers do not have this problem: their wrappers carry tabindex="0".)
const target = trigger.matches(FOCUSABLE_SELECTOR)
? trigger
: (trigger.querySelector<globalThis.HTMLElement>(FOCUSABLE_SELECTOR) ?? trigger)
target.focus({ preventScroll: true })
}

/** Returns the focusable, enabled elements inside the panel, in DOM order. */
function getFocusable(): globalThis.HTMLElement[] {
const panel = panelRef.value
if (!panel) return []
const selector =
'a[href],button:not([disabled]),input:not([disabled]),select:not([disabled]),textarea:not([disabled]),[tabindex]:not([tabindex="-1"])'
return Array.from(panel.querySelectorAll<globalThis.HTMLElement>(selector))
return Array.from(panel.querySelectorAll<globalThis.HTMLElement>(FOCUSABLE_SELECTOR))
}

function onDocumentMousedown(event: globalThis.MouseEvent) {
Expand Down
Loading