Skip to content

Commit

Permalink
Revert "feat(theme): use inert to avoid traverse menus and content wi…
Browse files Browse the repository at this point in the history
…th keyboard" (#2953)

Revert "feat(theme): use inert to avoid traverse menus and content with keyboard (#2932)"

This reverts commit 070fc0a.
  • Loading branch information
brc-dd committed Sep 13, 2023
1 parent a1e1267 commit 54891df
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 22 deletions.
17 changes: 7 additions & 10 deletions src/client/theme-default/Layout.vue
Expand Up @@ -9,16 +9,13 @@ import VPNav from './components/VPNav.vue'
import VPSidebar from './components/VPSidebar.vue'
import VPSkipLink from './components/VPSkipLink.vue'
import { useData } from './composables/data'
import { useNav } from './composables/nav'
import { useCloseSidebarOnEscape, useSidebar } from './composables/sidebar'
const {
isOpen: isSidebarOpen,
open: openSidebar,
close: closeSidebar,
isSidebarEnabled,
close: closeSidebar
} = useSidebar()
const { isScreenOpen } = useNav()
const route = useRoute()
watch(() => route.path, closeSidebar)
Expand All @@ -36,24 +33,24 @@ provide('hero-image-slot-exists', heroImageSlotExists)
<template>
<div v-if="frontmatter.layout !== false" class="Layout" :class="frontmatter.pageClass" >
<slot name="layout-top" />
<VPSkipLink :inert="isSidebarOpen || isScreenOpen" />
<VPSkipLink />
<VPBackdrop class="backdrop" :show="isSidebarOpen" @click="closeSidebar" />
<VPNav v-if="frontmatter.navbar !== false" :inert="isSidebarOpen">
<VPNav v-if="frontmatter.navbar !== false">
<template #nav-bar-title-before><slot name="nav-bar-title-before" /></template>
<template #nav-bar-title-after><slot name="nav-bar-title-after" /></template>
<template #nav-bar-content-before><slot name="nav-bar-content-before" /></template>
<template #nav-bar-content-after><slot name="nav-bar-content-after" /></template>
<template #nav-screen-content-before><slot name="nav-screen-content-before" /></template>
<template #nav-screen-content-after><slot name="nav-screen-content-after" /></template>
</VPNav>
<VPLocalNav :inert="isSidebarOpen || isScreenOpen" :open="isSidebarOpen" @open-menu="openSidebar" />
<VPLocalNav :open="isSidebarOpen" @open-menu="openSidebar" />

<VPSidebar :inert="!isSidebarEnabled && (!isSidebarOpen || isScreenOpen)" :open="isSidebarOpen">
<VPSidebar :open="isSidebarOpen">
<template #sidebar-nav-before><slot name="sidebar-nav-before" /></template>
<template #sidebar-nav-after><slot name="sidebar-nav-after" /></template>
</VPSidebar>

<VPContent :inert="isSidebarOpen || isScreenOpen">
<VPContent>
<template #page-top><slot name="page-top" /></template>
<template #page-bottom><slot name="page-bottom" /></template>

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

<VPFooter :inert="isSidebarOpen || isScreenOpen" />
<VPFooter />
<slot name="layout-bottom" />
</div>
<Content v-else />
Expand Down
18 changes: 8 additions & 10 deletions src/client/theme-default/components/VPSkipLink.vue
Expand Up @@ -27,16 +27,14 @@ function focusOnTargetAnchor({ target }: Event) {
</script>

<template>
<div>
<span ref="backToTop" tabindex="-1" />
<a
href="#VPContent"
class="VPSkipLink visually-hidden"
@click="focusOnTargetAnchor"
>
Skip to content
</a>
</div>
<span ref="backToTop" tabindex="-1" />
<a
href="#VPContent"
class="VPSkipLink visually-hidden"
@click="focusOnTargetAnchor"
>
Skip to content
</a>
</template>

<style scoped>
Expand Down
4 changes: 2 additions & 2 deletions src/client/theme-default/composables/nav.ts
@@ -1,9 +1,9 @@
import { ref, watch } from 'vue'
import { useRoute } from 'vitepress'

const isScreenOpen = ref(false)

export function useNav() {
const isScreenOpen = ref(false)

function openScreen() {
isScreenOpen.value = true
window.addEventListener('resize', closeScreenOnTabletWindow)
Expand Down

0 comments on commit 54891df

Please sign in to comment.