Skip to content
Merged
Changes from all commits
Commits
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
29 changes: 25 additions & 4 deletions packages/vuetify/src/components/VMenu/VMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ export const VMenu = genericComponent<OverlaySlots>()({
})
onDeactivated(() => isActive.value = false)

let focusTrapSuppressed = false
let focusTrapSuppressionTimeout = -1

async function onPointerdown () {
focusTrapSuppressed = true
focusTrapSuppressionTimeout = window.setTimeout(() => {
focusTrapSuppressed = false
}, 100)
}

async function onFocusIn (e: FocusEvent) {
const before = e.relatedTarget as HTMLElement | null
const after = e.target as HTMLElement | null
Expand All @@ -119,27 +129,38 @@ export const VMenu = genericComponent<OverlaySlots>()({
isActive.value &&
before !== after &&
overlay.value?.contentEl &&
// We're the topmost menu
overlay.value?.globalTop &&
// We're the menu without open submenus or overlays
overlay.value?.localTop &&
// It isn't the document or the menu body
![document, overlay.value.contentEl].includes(after!) &&
// It isn't inside the menu body
!overlay.value.contentEl.contains(after)
) {
const focusable = focusableChildren(overlay.value.contentEl)
focusable[0]?.focus()
if (focusTrapSuppressed) {
if (!props.openOnHover || !overlay.value.activatorEl?.contains(after)) {
isActive.value = false
}
} else {
const focusable = focusableChildren(overlay.value.contentEl)
focusable[0]?.focus()

document.removeEventListener('pointerdown', onPointerdown)
}
}
}

watch(isActive, val => {
if (val) {
parent?.register()
if (IN_BROWSER && !props.disableInitialFocus) {
document.addEventListener('pointerdown', onPointerdown)
document.addEventListener('focusin', onFocusIn, { once: true })
}
} else {
parent?.unregister()
if (IN_BROWSER) {
clearTimeout(focusTrapSuppressionTimeout)
document.removeEventListener('pointerdown', onPointerdown)
document.removeEventListener('focusin', onFocusIn)
}
}
Expand Down