fix(i18n): keep root links in the active locale and fix switcher a11y
PR Check / Security scan (Snyk) (pull_request) Skipped
PR Check / Lint + typecheck (pull_request) Successful in 1m7s
PR Check / Secret scan (gitleaks) (pull_request) Successful in 6s
PR Check / Dependency audit (pull_request) Successful in 9s
PR Check / Dockerfile lint (droast) (pull_request) Successful in 5s
PR Check / AI code review (opencode) (pull_request) Successful in 55s
PR Check / Security scan (Snyk) (pull_request) Skipped
PR Check / Lint + typecheck (pull_request) Successful in 1m7s
PR Check / Secret scan (gitleaks) (pull_request) Successful in 6s
PR Check / Dependency audit (pull_request) Successful in 9s
PR Check / Dockerfile lint (droast) (pull_request) Successful in 5s
PR Check / AI code review (opencode) (pull_request) Successful in 55s
AppNav, AppLogo and AppBottomNav used NuxtLink to "/", which resolves to the English root under prefix_except_default; they now use NuxtLinkLocale and drop the hardcoded aria-current. Bottom-nav labels go through $t as well. The switcher's accessible name now contains the visible locale code, aria-haspopup is gone in favour of a plain disclosure with aria-controls, and Escape returns focus to the trigger.
This commit is contained in:
1 parent
078a49d14e
commit
e4b30ad944
4 files changed
+22
-15
No files matched your search
@@ -1,8 +1,13 @@
|
||||
<script setup lang="ts">
|
||||
const { locales, locale, setLocale } = useI18n()
|
||||
const { locales, locale, setLocale, t } = useI18n()
|
||||
|
||||
const open = ref(false)
|
||||
const root = ref<HTMLElement | null>(null)
|
||||
const trigger = ref<HTMLButtonElement | null>(null)
|
||||
const menuId = useId()
|
||||
|
||||
// The accessible name has to contain the visible text (WCAG 2.5.3).
|
||||
const triggerLabel = computed(() => `${t('switcher.label')}: ${locale.value.toUpperCase()}`)
|
||||
|
||||
function closeOnOutside(event: MouseEvent) {
|
||||
if (!root.value?.contains(event.target as Node)) {
|
||||
@@ -11,8 +16,10 @@ function closeOnOutside(event: MouseEvent) {
|
||||
}
|
||||
|
||||
function closeOnEscape(event: KeyboardEvent) {
|
||||
if (event.key === 'Escape') {
|
||||
if (event.key === 'Escape' && open.value) {
|
||||
open.value = false
|
||||
// Focus would otherwise stay on a list item that just left the DOM.
|
||||
trigger.value?.focus()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,11 +42,12 @@ async function choose(code: Parameters<typeof setLocale>[0]) {
|
||||
<template>
|
||||
<div ref="root" class="relative flex shrink-0 items-center font-label-mono text-label-mono">
|
||||
<button
|
||||
ref="trigger"
|
||||
type="button"
|
||||
class="flex items-center gap-1.5 uppercase tracking-wider text-on-surface-variant transition-colors hover:text-on-surface"
|
||||
aria-haspopup="true"
|
||||
:aria-expanded="open"
|
||||
:aria-label="$t('switcher.label')"
|
||||
:aria-controls="menuId"
|
||||
:aria-label="triggerLabel"
|
||||
@click="open = !open"
|
||||
>
|
||||
<span class="h-3.5 w-5 overflow-hidden rounded-[2px]">
|
||||
@@ -51,6 +59,7 @@ async function choose(code: Parameters<typeof setLocale>[0]) {
|
||||
|
||||
<ul
|
||||
v-if="open"
|
||||
:id="menuId"
|
||||
class="absolute right-0 top-full z-10 mt-2 min-w-48 rounded-lg border border-outline-variant/30 bg-surface-container-high p-1 shadow-lg"
|
||||
>
|
||||
<li v-for="language in locales" :key="language.code">
|
||||
|
||||
Reference in new issue
Block a user