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 070fc0a56d.
pull/2956/head
Divyansh Singh 1 year ago committed by GitHub
parent a1e1267549
commit 54891df614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -9,16 +9,13 @@ import VPNav from './components/VPNav.vue'
import VPSidebar from './components/VPSidebar.vue' import VPSidebar from './components/VPSidebar.vue'
import VPSkipLink from './components/VPSkipLink.vue' import VPSkipLink from './components/VPSkipLink.vue'
import { useData } from './composables/data' import { useData } from './composables/data'
import { useNav } from './composables/nav'
import { useCloseSidebarOnEscape, useSidebar } from './composables/sidebar' import { useCloseSidebarOnEscape, useSidebar } from './composables/sidebar'
const { const {
isOpen: isSidebarOpen, isOpen: isSidebarOpen,
open: openSidebar, open: openSidebar,
close: closeSidebar, close: closeSidebar
isSidebarEnabled,
} = useSidebar() } = useSidebar()
const { isScreenOpen } = useNav()
const route = useRoute() const route = useRoute()
watch(() => route.path, closeSidebar) watch(() => route.path, closeSidebar)
@ -36,9 +33,9 @@ provide('hero-image-slot-exists', heroImageSlotExists)
<template> <template>
<div v-if="frontmatter.layout !== false" class="Layout" :class="frontmatter.pageClass" > <div v-if="frontmatter.layout !== false" class="Layout" :class="frontmatter.pageClass" >
<slot name="layout-top" /> <slot name="layout-top" />
<VPSkipLink :inert="isSidebarOpen || isScreenOpen" /> <VPSkipLink />
<VPBackdrop class="backdrop" :show="isSidebarOpen" @click="closeSidebar" /> <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-before><slot name="nav-bar-title-before" /></template>
<template #nav-bar-title-after><slot name="nav-bar-title-after" /></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-before><slot name="nav-bar-content-before" /></template>
@ -46,14 +43,14 @@ provide('hero-image-slot-exists', heroImageSlotExists)
<template #nav-screen-content-before><slot name="nav-screen-content-before" /></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> <template #nav-screen-content-after><slot name="nav-screen-content-after" /></template>
</VPNav> </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-before><slot name="sidebar-nav-before" /></template>
<template #sidebar-nav-after><slot name="sidebar-nav-after" /></template> <template #sidebar-nav-after><slot name="sidebar-nav-after" /></template>
</VPSidebar> </VPSidebar>
<VPContent :inert="isSidebarOpen || isScreenOpen"> <VPContent>
<template #page-top><slot name="page-top" /></template> <template #page-top><slot name="page-top" /></template>
<template #page-bottom><slot name="page-bottom" /></template> <template #page-bottom><slot name="page-bottom" /></template>
@ -79,7 +76,7 @@ provide('hero-image-slot-exists', heroImageSlotExists)
<template #aside-ads-after><slot name="aside-ads-after" /></template> <template #aside-ads-after><slot name="aside-ads-after" /></template>
</VPContent> </VPContent>
<VPFooter :inert="isSidebarOpen || isScreenOpen" /> <VPFooter />
<slot name="layout-bottom" /> <slot name="layout-bottom" />
</div> </div>
<Content v-else /> <Content v-else />

@ -27,7 +27,6 @@ function focusOnTargetAnchor({ target }: Event) {
</script> </script>
<template> <template>
<div>
<span ref="backToTop" tabindex="-1" /> <span ref="backToTop" tabindex="-1" />
<a <a
href="#VPContent" href="#VPContent"
@ -36,7 +35,6 @@ function focusOnTargetAnchor({ target }: Event) {
> >
Skip to content Skip to content
</a> </a>
</div>
</template> </template>
<style scoped> <style scoped>

@ -1,9 +1,9 @@
import { ref, watch } from 'vue' import { ref, watch } from 'vue'
import { useRoute } from 'vitepress' import { useRoute } from 'vitepress'
const isScreenOpen = ref(false)
export function useNav() { export function useNav() {
const isScreenOpen = ref(false)
function openScreen() { function openScreen() {
isScreenOpen.value = true isScreenOpen.value = true
window.addEventListener('resize', closeScreenOnTabletWindow) window.addEventListener('resize', closeScreenOnTabletWindow)

Loading…
Cancel
Save