Skip to content

Commit 9b91ee4

Browse files
authored
fix(Header/DashboardSidebar/Sidebar): allow auto focus in menu for proper focus trapping (#6266)
1 parent faf6fbe commit 9b91ee4

3 files changed

Lines changed: 3 additions & 14 deletions

File tree

src/runtime/components/DashboardSidebar.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,7 @@ const Menu = computed(() => ({
133133
drawer: UDrawer
134134
})[props.mode as DashboardSidebarMode])
135135
136-
const menuProps = toRef(() => defu(props.menu, {
137-
content: {
138-
onOpenAutoFocus: (e: Event) => e.preventDefault()
139-
}
140-
}, props.mode === 'modal' ? { fullscreen: true, transition: false } : props.mode === 'slideover' ? { side: 'left' } : {}) as DashboardSidebarMenu<T>)
136+
const menuProps = toRef(() => defu(props.menu, {}, props.mode === 'modal' ? { fullscreen: true, transition: false } : props.mode === 'slideover' ? { side: 'left' } : {}) as DashboardSidebarMenu<T>)
141137
142138
function toggleOpen() {
143139
open.value = !open.value

src/runtime/components/Header.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,7 @@ const Menu = computed(() => ({
120120
drawer: UDrawer
121121
})[props.mode as HeaderMode])
122122
123-
const menuProps = toRef(() => defu(props.menu, {
124-
content: {
125-
onOpenAutoFocus: (e: Event) => e.preventDefault()
126-
}
127-
}, props.mode === 'modal' ? { fullscreen: true, transition: false } : {}) as HeaderMenu<T>)
123+
const menuProps = toRef(() => defu(props.menu, {}, props.mode === 'modal' ? { fullscreen: true, transition: false } : {}) as HeaderMenu<T>)
128124
129125
function toggleOpen() {
130126
open.value = !open.value

src/runtime/components/Sidebar.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,7 @@ const menuProps = toRef(() => defu(props.menu, {
200200
title: props.title,
201201
description: props.description,
202202
close: props.close,
203-
closeIcon: props.closeIcon,
204-
content: {
205-
onOpenAutoFocus: (e: Event) => e.preventDefault()
206-
}
203+
closeIcon: props.closeIcon
207204
}, props.mode === 'modal' ? { } : props.mode === 'slideover' ? { side: props.side, inset: props.variant === 'inset' } : {}) as SidebarMenu<T>)
208205
</script>
209206

0 commit comments

Comments
 (0)