feat(web): focus-visible rings on custom controls; honest authority links + lang group (#52)
This commit is contained in:
@@ -13,8 +13,10 @@ import { ListSkeleton } from "@/components/ui/skeletons";
|
|||||||
import { AuthorityRow } from "./authority-row";
|
import { AuthorityRow } from "./authority-row";
|
||||||
import { byLabel } from "../lib/sort";
|
import { byLabel } from "../lib/sort";
|
||||||
import { labelText } from "../lib/labels";
|
import { labelText } from "../lib/labels";
|
||||||
|
import { focusRing } from "../lib/focus-ring";
|
||||||
import { useDocumentTitle } from "../lib/use-document-title";
|
import { useDocumentTitle } from "../lib/use-document-title";
|
||||||
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
import { useBreadcrumb } from "../shell/use-breadcrumb";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
type LabelInput = components["schemas"]["LabelInput"];
|
type LabelInput = components["schemas"]["LabelInput"];
|
||||||
|
|
||||||
@@ -64,21 +66,19 @@ export function AuthoritiesPage() {
|
|||||||
return (
|
return (
|
||||||
<div className="overflow-auto p-4">
|
<div className="overflow-auto p-4">
|
||||||
<PageTitle className="mb-3">{t("nav.authorities")}</PageTitle>
|
<PageTitle className="mb-3">{t("nav.authorities")}</PageTitle>
|
||||||
<div role="tablist" className="mb-3 flex gap-2">
|
<nav aria-label={t("nav.authorities")} className="mb-3 flex gap-2">
|
||||||
{KINDS.map((k) => (
|
{KINDS.map((k) => (
|
||||||
<NavLink
|
<NavLink
|
||||||
key={k}
|
key={k}
|
||||||
to={`/authorities/${k}`}
|
to={`/authorities/${k}`}
|
||||||
role="tab"
|
|
||||||
aria-selected={k === currentKind}
|
|
||||||
className={({ isActive }) =>
|
className={({ isActive }) =>
|
||||||
`rounded-md px-3 py-1 text-sm ${isActive ? "bg-primary text-primary-foreground" : "border"}`
|
cn("rounded-md px-3 py-1 text-sm", focusRing, isActive ? "bg-primary text-primary-foreground" : "border")
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{t(`authorities.${k}`)}
|
{t(`authorities.${k}`)}
|
||||||
</NavLink>
|
</NavLink>
|
||||||
))}
|
))}
|
||||||
</div>
|
</nav>
|
||||||
|
|
||||||
<div className="mb-3">
|
<div className="mb-3">
|
||||||
<Input
|
<Input
|
||||||
|
|||||||
@@ -33,13 +33,13 @@ test("lists authorities for the kind and creates one", async () => {
|
|||||||
|
|
||||||
test("kind tabs link to the other kinds", async () => {
|
test("kind tabs link to the other kinds", async () => {
|
||||||
renderApp(tree(), { route: "/authorities/person" });
|
renderApp(tree(), { route: "/authorities/person" });
|
||||||
expect(await screen.findByRole("tab", { name: /place/i })).toHaveAttribute("href", "/authorities/place");
|
expect(await screen.findByRole("link", { name: /place/i })).toHaveAttribute("href", "/authorities/place");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("aria-selected is on the tab element and reflects the active kind", async () => {
|
test("aria-current marks the active kind link", async () => {
|
||||||
renderApp(tree(), { route: "/authorities/person" });
|
renderApp(tree(), { route: "/authorities/person" });
|
||||||
expect(await screen.findByRole("tab", { name: /^person$/i })).toHaveAttribute("aria-selected", "true");
|
expect(await screen.findByRole("link", { name: /^person$/i })).toHaveAttribute("aria-current", "page");
|
||||||
expect(screen.getByRole("tab", { name: /^place$/i })).toHaveAttribute("aria-selected", "false");
|
expect(screen.getByRole("link", { name: /^place$/i })).not.toHaveAttribute("aria-current");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("create without EN label shows required alert and does not POST", async () => {
|
test("create without EN label shows required alert and does not POST", async () => {
|
||||||
|
|||||||
@@ -5,8 +5,10 @@ import type { components } from "../api/schema";
|
|||||||
import { useFieldDefinitions, useDeleteFieldDefinition } from "../api/queries";
|
import { useFieldDefinitions, useDeleteFieldDefinition } from "../api/queries";
|
||||||
import { labelText } from "../lib/labels";
|
import { labelText } from "../lib/labels";
|
||||||
import { byLabel, compareStrings } from "../lib/sort";
|
import { byLabel, compareStrings } from "../lib/sort";
|
||||||
|
import { focusRing } from "../lib/focus-ring";
|
||||||
import { DeleteConfirmDialog } from "../components/delete-confirm-dialog";
|
import { DeleteConfirmDialog } from "../components/delete-confirm-dialog";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { ListSkeleton } from "@/components/ui/skeletons";
|
import { ListSkeleton } from "@/components/ui/skeletons";
|
||||||
|
|
||||||
@@ -86,7 +88,7 @@ export function FieldList({
|
|||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="flex flex-1 items-center gap-2 text-left"
|
className={cn("flex flex-1 items-center gap-2 rounded-sm text-left", focusRing)}
|
||||||
aria-pressed={def.key === selectedKey}
|
aria-pressed={def.key === selectedKey}
|
||||||
onClick={() => onSelect(def)}
|
onClick={() => onSelect(def)}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"common": { "yes": "Yes", "no": "No", "close": "Close", "loading": "Loading", "filter": "Filter…", "noMatches": "No matches" },
|
"common": { "yes": "Yes", "no": "No", "close": "Close", "loading": "Loading", "filter": "Filter…", "noMatches": "No matches", "language": "Language" },
|
||||||
"nav": { "objects": "Objects", "vocabularies": "Vocabularies", "authorities": "Authorities", "fields": "Fields", "search": "Search", "collapseSidebar": "Collapse sidebar", "expandSidebar": "Expand sidebar" },
|
"nav": { "objects": "Objects", "vocabularies": "Vocabularies", "authorities": "Authorities", "fields": "Fields", "search": "Search", "collapseSidebar": "Collapse sidebar", "expandSidebar": "Expand sidebar" },
|
||||||
"auth": { "email": "Email", "password": "Password", "signIn": "Sign in", "signOut": "Sign out", "invalid": "Invalid email or password", "networkError": "Could not reach the server" },
|
"auth": { "email": "Email", "password": "Password", "signIn": "Sign in", "signOut": "Sign out", "invalid": "Invalid email or password", "networkError": "Could not reach the server" },
|
||||||
"objects": { "title": "Objects", "empty": "No objects yet", "loadError": "Could not load objects", "notFound": "Object not found", "prev": "Previous", "next": "Next", "of": "of", "new": "New object", "filter": "Filter objects…", "pageSize": "Per page", "columns": { "number": "Object №", "name": "Name", "visibility": "Visibility", "location": "Location", "count": "#", "updated": "Updated" }, "unknownRef": "(unknown)" },
|
"objects": { "title": "Objects", "empty": "No objects yet", "loadError": "Could not load objects", "notFound": "Object not found", "prev": "Previous", "next": "Next", "of": "of", "new": "New object", "filter": "Filter objects…", "pageSize": "Per page", "columns": { "number": "Object №", "name": "Name", "visibility": "Visibility", "location": "Location", "count": "#", "updated": "Updated" }, "unknownRef": "(unknown)" },
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"common": { "yes": "Ja", "no": "Nej", "close": "Stäng", "loading": "Laddar", "filter": "Filtrera…", "noMatches": "Inga träffar" },
|
"common": { "yes": "Ja", "no": "Nej", "close": "Stäng", "loading": "Laddar", "filter": "Filtrera…", "noMatches": "Inga träffar", "language": "Språk" },
|
||||||
"nav": { "objects": "Föremål", "vocabularies": "Vokabulär", "authorities": "Auktoriteter", "fields": "Fält", "search": "Sök", "collapseSidebar": "Fäll ihop sidofältet", "expandSidebar": "Fäll ut sidofältet" },
|
"nav": { "objects": "Föremål", "vocabularies": "Vokabulär", "authorities": "Auktoriteter", "fields": "Fält", "search": "Sök", "collapseSidebar": "Fäll ihop sidofältet", "expandSidebar": "Fäll ut sidofältet" },
|
||||||
"auth": { "email": "E-post", "password": "Lösenord", "signIn": "Logga in", "signOut": "Logga ut", "invalid": "Fel e-post eller lösenord", "networkError": "Kunde inte nå servern" },
|
"auth": { "email": "E-post", "password": "Lösenord", "signIn": "Logga in", "signOut": "Logga ut", "invalid": "Fel e-post eller lösenord", "networkError": "Kunde inte nå servern" },
|
||||||
"objects": { "title": "Föremål", "empty": "Inga föremål ännu", "loadError": "Kunde inte ladda föremål", "notFound": "Föremålet hittades inte", "prev": "Föregående", "next": "Nästa", "of": "av", "new": "Nytt föremål", "filter": "Filtrera föremål…", "pageSize": "Per sida", "columns": { "number": "Föremålsnr", "name": "Namn", "visibility": "Synlighet", "location": "Plats", "count": "Antal", "updated": "Uppdaterad" }, "unknownRef": "(okänd)" },
|
"objects": { "title": "Föremål", "empty": "Inga föremål ännu", "loadError": "Kunde inte ladda föremål", "notFound": "Föremålet hittades inte", "prev": "Föregående", "next": "Nästa", "of": "av", "new": "Nytt föremål", "filter": "Filtrera föremål…", "pageSize": "Per sida", "columns": { "number": "Föremålsnr", "name": "Namn", "visibility": "Synlighet", "location": "Plats", "count": "Antal", "updated": "Uppdaterad" }, "unknownRef": "(okänd)" },
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
export const focusRing = "outline-none focus-visible:ring-3 focus-visible:ring-ring/50";
|
||||||
@@ -4,7 +4,9 @@ import { useTranslation } from "react-i18next";
|
|||||||
|
|
||||||
import { useSearch, HttpError } from "../api/queries";
|
import { useSearch, HttpError } from "../api/queries";
|
||||||
import { useDebouncedValue } from "../lib/use-debounced-value";
|
import { useDebouncedValue } from "../lib/use-debounced-value";
|
||||||
|
import { focusRing } from "../lib/focus-ring";
|
||||||
import { SearchResultRow } from "./search-result-row";
|
import { SearchResultRow } from "./search-result-row";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import { ListSkeleton } from "@/components/ui/skeletons";
|
import { ListSkeleton } from "@/components/ui/skeletons";
|
||||||
@@ -71,7 +73,7 @@ export function SearchPanel() {
|
|||||||
type="button"
|
type="button"
|
||||||
aria-pressed={active}
|
aria-pressed={active}
|
||||||
onClick={() => setVisibility(value)}
|
onClick={() => setVisibility(value)}
|
||||||
className={`rounded-md px-2 py-0.5 ${active ? "bg-primary text-primary-foreground" : "border"}`}
|
className={cn("rounded-md px-2 py-0.5", focusRing, active ? "bg-primary text-primary-foreground" : "border")}
|
||||||
>
|
>
|
||||||
{value === "all" ? t("search.all") : t(`visibility.${value}`)}
|
{value === "all" ? t("search.all") : t(`visibility.${value}`)}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -1,17 +1,23 @@
|
|||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
import { useLocale } from "../i18n/use-locale";
|
import { useLocale } from "../i18n/use-locale";
|
||||||
|
import { focusRing } from "../lib/focus-ring";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
export function LangSwitch() {
|
export function LangSwitch() {
|
||||||
|
const { t } = useTranslation();
|
||||||
const { locale, setLocale } = useLocale();
|
const { locale, setLocale } = useLocale();
|
||||||
const base = locale.startsWith("sv") ? "sv" : "en";
|
const base = locale.startsWith("sv") ? "sv" : "en";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex gap-1 text-xs">
|
<div role="group" aria-label={t("common.language")} className="flex gap-1 text-xs">
|
||||||
{(["sv", "en"] as const).map((lng) => (
|
{(["sv", "en"] as const).map((lng) => (
|
||||||
<button
|
<button
|
||||||
key={lng}
|
key={lng}
|
||||||
|
type="button"
|
||||||
onClick={() => setLocale(lng)}
|
onClick={() => setLocale(lng)}
|
||||||
aria-pressed={base === lng}
|
aria-pressed={base === lng}
|
||||||
className={base === lng ? "font-bold" : "text-muted-foreground"}
|
className={cn("rounded-sm px-1", focusRing, base === lng ? "font-bold" : "text-muted-foreground")}
|
||||||
>
|
>
|
||||||
{lng.toUpperCase()}
|
{lng.toUpperCase()}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
|
|||||||
|
|
||||||
import { useTheme } from "../theme/use-theme";
|
import { useTheme } from "../theme/use-theme";
|
||||||
import type { Theme } from "../theme/theme";
|
import type { Theme } from "../theme/theme";
|
||||||
|
import { focusRing } from "../lib/focus-ring";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
const OPTIONS: { value: Theme; Icon: typeof Sun }[] = [
|
const OPTIONS: { value: Theme; Icon: typeof Sun }[] = [
|
||||||
@@ -29,6 +30,7 @@ export function ThemeSwitch() {
|
|||||||
title={t(`theme.${value}`)}
|
title={t(`theme.${value}`)}
|
||||||
className={cn(
|
className={cn(
|
||||||
"rounded-md p-1 transition-colors",
|
"rounded-md p-1 transition-colors",
|
||||||
|
focusRing,
|
||||||
active
|
active
|
||||||
? "bg-accent text-foreground"
|
? "bg-accent text-foreground"
|
||||||
: "text-muted-foreground hover:text-foreground",
|
: "text-muted-foreground hover:text-foreground",
|
||||||
|
|||||||
Reference in New Issue
Block a user