diff --git a/packages/radix-vue/src/Dialog/DialogContentImpl.vue b/packages/radix-vue/src/Dialog/DialogContentImpl.vue index 09050eed7..02c4c29ae 100644 --- a/packages/radix-vue/src/Dialog/DialogContentImpl.vue +++ b/packages/radix-vue/src/Dialog/DialogContentImpl.vue @@ -3,7 +3,7 @@ import type { DismissableLayerEmits, DismissableLayerProps, } from '@/DismissableLayer' -import { useForwardExpose, useId } from '@/shared' +import { getActiveElement, useForwardExpose, useId } from '@/shared' export type DialogContentImplEmits = DismissableLayerEmits & { /** @@ -54,8 +54,8 @@ onMounted(() => { rootContext.contentElement = contentElement // Preserve the `DialogTrigger` element in case it was triggered programmatically - if (document.activeElement !== document.body) - rootContext.triggerElement.value = document.activeElement as HTMLElement + if (getActiveElement() !== document.body) + rootContext.triggerElement.value = getActiveElement() as HTMLElement }) if (process.env.NODE_ENV !== 'production') { diff --git a/packages/radix-vue/src/FocusScope/FocusScope.vue b/packages/radix-vue/src/FocusScope/FocusScope.vue index 216f301ad..66cc0899d 100644 --- a/packages/radix-vue/src/FocusScope/FocusScope.vue +++ b/packages/radix-vue/src/FocusScope/FocusScope.vue @@ -1,6 +1,6 @@ @@ -87,7 +84,6 @@ function handleKeydown(event: KeyboardEvent) {