Form primitives, keyboard-operable comboboxes, dialog focus, route states
Accessibility work on the UI layer, all of it rooted in one structural gap: there were no form primitives, so every field was hand-assembled and every field got the same details wrong. Form primitives - components/ui/Field.tsx (Field/TextField/SelectField/TextareaField) and Button.tsx. Field generates the control id with useId and derives htmlFor from it, which is what makes the association impossible to omit rather than merely conventional. - 92 labels existed, 4 used htmlFor, and no input carried an id at all: a screen reader announced an unnamed edit box and clicking a label focused nothing. Now every label resolves to its control (0 unassociated), and the input class chain that appeared verbatim 85 times appears zero times. - Field also takes a render prop, so Lookup, CountryPicker and Picklist get the same wiring instead of a second, partial solution. - SearchInput replaces three hand-rolled copies of the icon-in-a-box search whose input had only a placeholder — not a label — and killed its own focus ring with outline-none and nothing in its place. - Toggle groups (workdays, reorg change type) became fieldsets with aria-pressed; colour alone was carrying the selected state. Comboboxes - Lookup and CountryPicker were text inputs with a div of clickable buttons underneath: typeable, but no keyboard path to a result and nothing telling a screen reader a list had appeared. Both now carry role=combobox, aria-expanded/controls/activedescendant and listbox semantics, with arrow keys, Enter and Escape. Escape stops propagation, or it would close the surrounding dialog along with the dropdown. Dialogs - useDialogFocus centralises what Modal and SlideOver each owed the keyboard and neither provided beyond Escape: focus into the dialog on open, Tab and Shift+Tab cycling within it, focus restored to the trigger on close. - SlideOver stays mounted for its transition, and aria-hidden does not remove anything from the tab order — so every closed panel was leaving invisible tab stops at the end of the page. `inert` fixes that. Route states - loading.tsx, error.tsx, not-found.tsx and global-error.tsx. Every page in the (app) group is server-rendered per request, so without loading.tsx a navigation showed nothing at all until the server answered, and a render error dropped the user on Next's own screen with no way back. Tests - 22 component tests (vitest jsdom project). Two of them found limits of the environment rather than of the code: jsdom implements neither `inert` nor scrollIntoView, so the inert test asserts the attribute and the missing scrollIntoView — which was taking the whole render down from inside an effect — is stubbed in the setup file.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import { Search, X } from "lucide-react";
|
||||
import { useEffect, useRef, useState, type ReactNode } from "react";
|
||||
import { useEffect, useId, useRef, useState, type KeyboardEvent, type ReactNode } from "react";
|
||||
|
||||
type LookupProps<T> = {
|
||||
placeholder?: string;
|
||||
@@ -9,21 +9,42 @@ type LookupProps<T> = {
|
||||
renderResult: (item: T) => ReactNode;
|
||||
onSelect: (item: T) => void;
|
||||
minChars?: number;
|
||||
id?: string;
|
||||
"aria-describedby"?: string;
|
||||
"aria-invalid"?: true;
|
||||
};
|
||||
|
||||
// Generic async search-select used by the position lookup (hire wizard),
|
||||
// manager/superior lookup (create position), and employee multi-select
|
||||
// (reorg workbench) in later phases.
|
||||
export function Lookup<T>({ placeholder = "Suchen…", onSearch, renderResult, onSelect, minChars = 2 }: LookupProps<T>) {
|
||||
// manager/superior lookup (create position), and the reorg workbench.
|
||||
//
|
||||
// Implements the combobox contract rather than just looking like one: it was
|
||||
// a plain text input with a div of clickable buttons underneath, so a
|
||||
// keyboard user could type but never reach a result, and a screen reader was
|
||||
// never told a list had appeared. Arrow keys move the selection, Enter takes
|
||||
// it, Escape closes without also closing the surrounding dialog.
|
||||
export function Lookup<T>({
|
||||
placeholder = "Suchen…",
|
||||
onSearch,
|
||||
renderResult,
|
||||
onSelect,
|
||||
minChars = 2,
|
||||
id: idProp,
|
||||
"aria-describedby": describedBy,
|
||||
"aria-invalid": invalid,
|
||||
}: LookupProps<T>) {
|
||||
const generatedId = useId();
|
||||
const id = idProp ?? generatedId;
|
||||
const [query, setQuery] = useState("");
|
||||
const [results, setResults] = useState<T[]>([]);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [activeIndex, setActiveIndex] = useState(0);
|
||||
// Derived from "have we finished searching for the current query yet",
|
||||
// rather than a separate state flag flipped synchronously at the top of
|
||||
// the effect below — the effect only ever sets state from the async
|
||||
// search's own completion callback now.
|
||||
const [lastSearchedQuery, setLastSearchedQuery] = useState<string | null>(null);
|
||||
const containerRef = useRef<HTMLDivElement>(null);
|
||||
const listRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
const tooShort = query.trim().length < minChars;
|
||||
const loading = !tooShort && lastSearchedQuery !== query.trim();
|
||||
@@ -35,6 +56,7 @@ export function Lookup<T>({ placeholder = "Suchen…", onSearch, renderResult, o
|
||||
onSearch(query.trim()).then((res) => {
|
||||
if (cancelled) return;
|
||||
setResults(res);
|
||||
setActiveIndex(0);
|
||||
setOpen(true);
|
||||
setLastSearchedQuery(query.trim());
|
||||
});
|
||||
@@ -50,6 +72,7 @@ export function Lookup<T>({ placeholder = "Suchen…", onSearch, renderResult, o
|
||||
// needing a synchronous setState inside the effect above.
|
||||
const showDropdown = open && !tooShort;
|
||||
const visibleResults = tooShort ? [] : results;
|
||||
const selectable = loading ? [] : visibleResults;
|
||||
|
||||
useEffect(() => {
|
||||
function onClickOutside(e: MouseEvent) {
|
||||
@@ -61,46 +84,100 @@ export function Lookup<T>({ placeholder = "Suchen…", onSearch, renderResult, o
|
||||
return () => document.removeEventListener("mousedown", onClickOutside);
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!showDropdown) return;
|
||||
listRef.current?.querySelector('[data-active="true"]')?.scrollIntoView({ block: "nearest" });
|
||||
}, [activeIndex, showDropdown]);
|
||||
|
||||
function reset() {
|
||||
setQuery("");
|
||||
setResults([]);
|
||||
setOpen(false);
|
||||
setActiveIndex(0);
|
||||
}
|
||||
|
||||
function choose(item: T) {
|
||||
onSelect(item);
|
||||
reset();
|
||||
}
|
||||
|
||||
function onKeyDown(e: KeyboardEvent<HTMLInputElement>) {
|
||||
if (e.key === "ArrowDown" || e.key === "ArrowUp") {
|
||||
if (selectable.length === 0) return;
|
||||
e.preventDefault();
|
||||
const delta = e.key === "ArrowDown" ? 1 : -1;
|
||||
setActiveIndex((i) => (i + delta + selectable.length) % selectable.length);
|
||||
} else if (e.key === "Enter") {
|
||||
if (showDropdown && selectable[activeIndex]) {
|
||||
e.preventDefault();
|
||||
choose(selectable[activeIndex]);
|
||||
}
|
||||
} else if (e.key === "Escape") {
|
||||
if (showDropdown) {
|
||||
// Without this the Escape also reaches Modal/SlideOver and closes
|
||||
// the whole dialog behind the dropdown.
|
||||
e.stopPropagation();
|
||||
setOpen(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const listId = `${id}-listbox`;
|
||||
|
||||
return (
|
||||
<div ref={containerRef} className="relative">
|
||||
<div className="flex items-center gap-2 rounded border border-border bg-white px-3 py-2">
|
||||
<Search className="h-4 w-4 shrink-0 text-ink-muted" />
|
||||
<div className="flex items-center gap-2 rounded border border-border bg-white px-3 py-2 focus-within:outline-2 focus-within:outline-offset-1 focus-within:outline-brand-500">
|
||||
<Search className="h-4 w-4 shrink-0 text-ink-muted" aria-hidden />
|
||||
<input
|
||||
id={id}
|
||||
role="combobox"
|
||||
aria-expanded={showDropdown}
|
||||
aria-controls={listId}
|
||||
aria-activedescendant={showDropdown && selectable[activeIndex] ? `${id}-option-${activeIndex}` : undefined}
|
||||
aria-autocomplete="list"
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
autoComplete="off"
|
||||
value={query}
|
||||
onChange={(e) => setQuery(e.target.value)}
|
||||
onKeyDown={onKeyDown}
|
||||
placeholder={placeholder}
|
||||
className="w-full text-sm outline-none placeholder:text-ink-muted"
|
||||
/>
|
||||
{query && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setQuery("");
|
||||
setResults([]);
|
||||
setOpen(false);
|
||||
}}
|
||||
aria-label="Zurücksetzen"
|
||||
>
|
||||
<button type="button" onClick={reset} aria-label="Zurücksetzen" className="rounded p-0.5 hover:bg-surface">
|
||||
<X className="h-4 w-4 text-ink-muted" />
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
{/* Announces "Suche…" / result count without stealing focus. */}
|
||||
<span aria-live="polite" className="sr-only">
|
||||
{showDropdown ? (loading ? "Suche läuft" : `${visibleResults.length} Treffer`) : ""}
|
||||
</span>
|
||||
{showDropdown && (
|
||||
<div className="absolute z-20 mt-1 max-h-64 w-full overflow-y-auto rounded border border-border bg-white shadow-lg">
|
||||
<div
|
||||
ref={listRef}
|
||||
id={listId}
|
||||
role="listbox"
|
||||
className="absolute z-20 mt-1 max-h-64 w-full overflow-y-auto rounded border border-border bg-white shadow-lg"
|
||||
>
|
||||
{loading && <div className="px-3 py-2 text-sm text-ink-muted">Suche…</div>}
|
||||
{!loading && visibleResults.length === 0 && <div className="px-3 py-2 text-sm text-ink-muted">Keine Treffer</div>}
|
||||
{!loading &&
|
||||
visibleResults.map((item, i) => (
|
||||
<button
|
||||
key={i}
|
||||
id={`${id}-option-${i}`}
|
||||
role="option"
|
||||
aria-selected={i === activeIndex}
|
||||
data-active={i === activeIndex}
|
||||
type="button"
|
||||
onClick={() => {
|
||||
onSelect(item);
|
||||
setQuery("");
|
||||
setResults([]);
|
||||
setOpen(false);
|
||||
}}
|
||||
className="block w-full px-3 py-2 text-left text-sm hover:bg-surface"
|
||||
// Mouse down would blur the input and close the list before
|
||||
// the click landed.
|
||||
onMouseDown={(e) => e.preventDefault()}
|
||||
onMouseEnter={() => setActiveIndex(i)}
|
||||
onClick={() => choose(item)}
|
||||
className={`block w-full px-3 py-2 text-left text-sm ${i === activeIndex ? "bg-brand-100" : "hover:bg-surface"}`}
|
||||
>
|
||||
{renderResult(item)}
|
||||
</button>
|
||||
|
||||
Reference in New Issue
Block a user