Skip to content

Commit 54891df

Browse files
authoredSep 13, 2023
Revert "feat(theme): use inert to avoid traverse menus and content with keyboard" (#2953)
Revert "feat(theme): use inert to avoid traverse menus and content with keyboard (#2932)" This reverts commit 070fc0a.
1 parent a1e1267 commit 54891df

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed
 

‎src/client/theme-default/Layout.vue

+7-10
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,13 @@ import VPNav from './components/VPNav.vue'
99
import VPSidebar from './components/VPSidebar.vue'
1010
import VPSkipLink from './components/VPSkipLink.vue'
1111
import { useData } from './composables/data'
12-
import { useNav } from './composables/nav'
1312
import { useCloseSidebarOnEscape, useSidebar } from './composables/sidebar'
1413
1514
const {
1615
isOpen: isSidebarOpen,
1716
open: openSidebar,
18-
close: closeSidebar,
19-
isSidebarEnabled,
17+
close: closeSidebar
2018
} = useSidebar()
21-
const { isScreenOpen } = useNav()
2219
2320
const route = useRoute()
2421
watch(() => route.path, closeSidebar)
@@ -36,24 +33,24 @@ provide('hero-image-slot-exists', heroImageSlotExists)
3633
<template>
3734
<div v-if="frontmatter.layout !== false" class="Layout" :class="frontmatter.pageClass" >
3835
<slot name="layout-top" />
39-
<VPSkipLink :inert="isSidebarOpen || isScreenOpen" />
36+
<VPSkipLink />
4037
<VPBackdrop class="backdrop" :show="isSidebarOpen" @click="closeSidebar" />
41-
<VPNav v-if="frontmatter.navbar !== false" :inert="isSidebarOpen">
38+
<VPNav v-if="frontmatter.navbar !== false">
4239
<template #nav-bar-title-before><slot name="nav-bar-title-before" /></template>
4340
<template #nav-bar-title-after><slot name="nav-bar-title-after" /></template>
4441
<template #nav-bar-content-before><slot name="nav-bar-content-before" /></template>
4542
<template #nav-bar-content-after><slot name="nav-bar-content-after" /></template>
4643
<template #nav-screen-content-before><slot name="nav-screen-content-before" /></template>
4744
<template #nav-screen-content-after><slot name="nav-screen-content-after" /></template>
4845
</VPNav>
49-
<VPLocalNav :inert="isSidebarOpen || isScreenOpen" :open="isSidebarOpen" @open-menu="openSidebar" />
46+
<VPLocalNav :open="isSidebarOpen" @open-menu="openSidebar" />
5047

51-
<VPSidebar :inert="!isSidebarEnabled && (!isSidebarOpen || isScreenOpen)" :open="isSidebarOpen">
48+
<VPSidebar :open="isSidebarOpen">
5249
<template #sidebar-nav-before><slot name="sidebar-nav-before" /></template>
5350
<template #sidebar-nav-after><slot name="sidebar-nav-after" /></template>
5451
</VPSidebar>
5552

56-
<VPContent :inert="isSidebarOpen || isScreenOpen">
53+
<VPContent>
5754
<template #page-top><slot name="page-top" /></template>
5855
<template #page-bottom><slot name="page-bottom" /></template>
5956

@@ -79,7 +76,7 @@ provide('hero-image-slot-exists', heroImageSlotExists)
7976
<template #aside-ads-after><slot name="aside-ads-after" /></template>
8077
</VPContent>
8178

82-
<VPFooter :inert="isSidebarOpen || isScreenOpen" />
79+
<VPFooter />
8380
<slot name="layout-bottom" />
8481
</div>
8582
<Content v-else />

‎src/client/theme-default/components/VPSkipLink.vue

+8-10
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@ function focusOnTargetAnchor({ target }: Event) {
2727
</script>
2828

2929
<template>
30-
<div>
31-
<span ref="backToTop" tabindex="-1" />
32-
<a
33-
href="#VPContent"
34-
class="VPSkipLink visually-hidden"
35-
@click="focusOnTargetAnchor"
36-
>
37-
Skip to content
38-
</a>
39-
</div>
30+
<span ref="backToTop" tabindex="-1" />
31+
<a
32+
href="#VPContent"
33+
class="VPSkipLink visually-hidden"
34+
@click="focusOnTargetAnchor"
35+
>
36+
Skip to content
37+
</a>
4038
</template>
4139

4240
<style scoped>

‎src/client/theme-default/composables/nav.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { ref, watch } from 'vue'
22
import { useRoute } from 'vitepress'
33

4-
const isScreenOpen = ref(false)
5-
64
export function useNav() {
5+
const isScreenOpen = ref(false)
6+
77
function openScreen() {
88
isScreenOpen.value = true
99
window.addEventListener('resize', closeScreenOnTabletWindow)

0 commit comments

Comments
 (0)
Please sign in to comment.