feat(theme): add focus trap to local search dialog (#2324)

Co-authored-by: Divyansh Singh <40380293+brc-dd@users.noreply.github.com>
pull/2353/head
Joaquín Sánchez 2 years ago committed by GitHub
parent 35f8b89637
commit 2f482afaab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -92,7 +92,9 @@
"@vitejs/plugin-vue": "^4.2.1", "@vitejs/plugin-vue": "^4.2.1",
"@vue/devtools-api": "^6.5.0", "@vue/devtools-api": "^6.5.0",
"@vueuse/core": "^10.1.0", "@vueuse/core": "^10.1.0",
"@vueuse/integrations": "^10.1.0",
"body-scroll-lock": "4.0.0-beta.0", "body-scroll-lock": "4.0.0-beta.0",
"focus-trap": "^7.4.0",
"mark.js": "8.11.1", "mark.js": "8.11.1",
"minisearch": "^6.0.1", "minisearch": "^6.0.1",
"shiki": "^0.14.2", "shiki": "^0.14.2",

@ -19,9 +19,15 @@ importers:
'@vueuse/core': '@vueuse/core':
specifier: ^10.1.0 specifier: ^10.1.0
version: 10.1.0(vue@3.2.47) version: 10.1.0(vue@3.2.47)
'@vueuse/integrations':
specifier: ^10.1.0
version: 10.1.0(focus-trap@7.4.0)(vue@3.2.47)
body-scroll-lock: body-scroll-lock:
specifier: 4.0.0-beta.0 specifier: 4.0.0-beta.0
version: 4.0.0-beta.0 version: 4.0.0-beta.0
focus-trap:
specifier: ^7.4.0
version: 7.4.0
mark.js: mark.js:
specifier: 8.11.1 specifier: 8.11.1
version: 8.11.1 version: 8.11.1
@ -1276,6 +1282,56 @@ packages:
- vue - vue
dev: false dev: false
/@vueuse/integrations@10.1.0(focus-trap@7.4.0)(vue@3.2.47):
resolution: {integrity: sha512-eSGdRYSFIspSYQIC0hzivi95Jv/BEH9Z47BrpNNKZi6k/LcHDAANmiNeiPN1BxlmO2PovG8dN9Et/AZC4WZ2YQ==}
peerDependencies:
async-validator: '*'
axios: '*'
change-case: '*'
drauu: '*'
focus-trap: '*'
fuse.js: '*'
idb-keyval: '*'
jwt-decode: '*'
nprogress: '*'
qrcode: '*'
sortablejs: '*'
universal-cookie: '*'
peerDependenciesMeta:
async-validator:
optional: true
axios:
optional: true
change-case:
optional: true
drauu:
optional: true
focus-trap:
optional: true
fuse.js:
optional: true
idb-keyval:
optional: true
jwt-decode:
optional: true
nprogress:
optional: true
qrcode:
optional: true
sortablejs:
optional: true
universal-cookie:
optional: true
dependencies:
'@vueuse/core': 10.1.0(vue@3.2.47)
'@vueuse/shared': 10.1.0(vue@3.2.47)
focus-trap: 7.4.0
vue-demi: 0.14.0(vue@3.2.47)
transitivePeerDependencies:
- '@vue/composition-api'
- vue
dev: false
/@vueuse/metadata@10.1.0: /@vueuse/metadata@10.1.0:
resolution: {integrity: sha512-cM28HjDEw5FIrPE9rgSPFZvQ0ZYnOLAOr8hl1XM6tFl80U3WAR5ROdnAqiYybniwP5gt9MKKAJAqd/ab2aHkqg==} resolution: {integrity: sha512-cM28HjDEw5FIrPE9rgSPFZvQ0ZYnOLAOr8hl1XM6tFl80U3WAR5ROdnAqiYybniwP5gt9MKKAJAqd/ab2aHkqg==}
dev: false dev: false
@ -2249,6 +2305,12 @@ packages:
path-exists: 5.0.0 path-exists: 5.0.0
dev: true dev: true
/focus-trap@7.4.0:
resolution: {integrity: sha512-yI7FwUqU4TVb+7t6PaQ3spT/42r/KLEi8mtdGoQo2li/kFzmu9URmalTvw7xCCJtSOyhBxscvEAmvjeN9iHARg==}
dependencies:
tabbable: 6.1.1
dev: false
/follow-redirects@1.15.2(debug@4.3.4): /follow-redirects@1.15.2(debug@4.3.4):
resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
engines: {node: '>=4.0'} engines: {node: '>=4.0'}
@ -4156,6 +4218,10 @@ packages:
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
dev: true dev: true
/tabbable@6.1.1:
resolution: {integrity: sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==}
dev: false
/temp-dir@2.0.0: /temp-dir@2.0.0:
resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==} resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
engines: {node: '>=8'} engines: {node: '>=8'}

@ -9,6 +9,7 @@ import {
useScrollLock, useScrollLock,
useSessionStorage useSessionStorage
} from '@vueuse/core' } from '@vueuse/core'
import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
import Mark from 'mark.js/src/vanilla.js' import Mark from 'mark.js/src/vanilla.js'
import MiniSearch, { type SearchResult } from 'minisearch' import MiniSearch, { type SearchResult } from 'minisearch'
import { useRouter } from 'vitepress' import { useRouter } from 'vitepress'
@ -26,11 +27,11 @@ import {
type Ref type Ref
} from 'vue' } from 'vue'
import type { ModalTranslations } from '../../../../types/local-search' import type { ModalTranslations } from '../../../../types/local-search'
import { dataSymbol } from '../../app/data'
import { pathToFile } from '../../app/utils' import { pathToFile } from '../../app/utils'
import { slash } from '../../shared' import { slash } from '../../shared'
import { useData } from '../composables/data' import { useData } from '../composables/data'
import { createTranslate } from '../support/translation' import { createTranslate } from '../support/translation'
import { dataSymbol } from '../../app/data'
defineProps<{ defineProps<{
placeholder: string placeholder: string
@ -64,6 +65,12 @@ interface Result {
} }
const vitePressData = useData() const vitePressData = useData()
const { activate } = useFocusTrap(el, {
immediate: true,
allowOutsideClick: true,
clickOutsideDeactivates: true,
escapeDeactivates: true
})
const { localeIndex, theme } = vitePressData const { localeIndex, theme } = vitePressData
const searchIndex = computedAsync(async () => const searchIndex = computedAsync(async () =>
markRaw( markRaw(
@ -334,6 +341,7 @@ onMounted(() => {
body.value = document.body body.value = document.body
nextTick(() => { nextTick(() => {
isLocked.value = true isLocked.value = true
nextTick().then(() => activate())
}) })
}) })
@ -474,6 +482,7 @@ function formMarkRegex(terms: Set<string>) {
}" }"
:aria-label="[...p.titles, p.title].join(' > ')" :aria-label="[...p.titles, p.title].join(' > ')"
@mouseenter="!disableMouseOver && (selectedIndex = index)" @mouseenter="!disableMouseOver && (selectedIndex = index)"
@focusin="selectedIndex = index"
@click="$emit('close')" @click="$emit('close')"
> >
<div> <div>
@ -498,7 +507,7 @@ function formMarkRegex(terms: Set<string>) {
</div> </div>
<div v-if="showDetailedList" class="excerpt-wrapper"> <div v-if="showDetailedList" class="excerpt-wrapper">
<div v-if="p.text" class="excerpt"> <div v-if="p.text" class="excerpt" inert>
<div class="vp-doc" v-html="p.text" /> <div class="vp-doc" v-html="p.text" />
</div> </div>
<div class="excerpt-gradient-bottom" /> <div class="excerpt-gradient-bottom" />
@ -727,6 +736,7 @@ function formMarkRegex(terms: Set<string>) {
transition: none; transition: none;
line-height: 1rem; line-height: 1rem;
border: solid 2px var(--vp-local-search-result-border); border: solid 2px var(--vp-local-search-result-border);
outline: none;
} }
.result > div { .result > div {

Loading…
Cancel
Save