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,22 +1,43 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { CONTROL_CLASS } from "./Field";
|
||||
|
||||
type CountryPickerProps = {
|
||||
value: string;
|
||||
onChange: (value: string) => void;
|
||||
countries: string[];
|
||||
placeholder?: string;
|
||||
id?: string;
|
||||
"aria-describedby"?: string;
|
||||
"aria-invalid"?: true;
|
||||
};
|
||||
|
||||
const MAX_VISIBLE = 50;
|
||||
|
||||
// Searchable text combobox constrained to a fixed list (UN member states)
|
||||
// rather than a Lookup-style "selected card" — a country is a single text
|
||||
// value, not an object with its own detail fields.
|
||||
export function CountryPicker({ value, onChange, countries, placeholder = "Land suchen…" }: CountryPickerProps) {
|
||||
//
|
||||
// Carries the full combobox contract: without role/aria-expanded/
|
||||
// aria-activedescendant a screen reader announces a plain text box and never
|
||||
// mentions that a list appeared, and without the key handling the list is
|
||||
// reachable by mouse only.
|
||||
export function CountryPicker({
|
||||
value,
|
||||
onChange,
|
||||
countries,
|
||||
placeholder = "Land suchen…",
|
||||
id,
|
||||
"aria-describedby": describedBy,
|
||||
"aria-invalid": invalid,
|
||||
}: CountryPickerProps) {
|
||||
const [query, setQuery] = useState(value);
|
||||
const [prevValue, setPrevValue] = useState(value);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [activeIndex, setActiveIndex] = useState(0);
|
||||
const containerRef = useRef<HTMLDivElement>(null);
|
||||
const listRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
// Re-sync the local draft text when `value` changes externally (e.g. the
|
||||
// surrounding form loads a different employee). Adjusting state directly
|
||||
@@ -38,33 +59,96 @@ export function CountryPicker({ value, onChange, countries, placeholder = "Land
|
||||
return () => document.removeEventListener("mousedown", onClickOutside);
|
||||
}, [value]);
|
||||
|
||||
const filtered = query.trim() ? countries.filter((c) => c.toLowerCase().includes(query.trim().toLowerCase())) : countries;
|
||||
const filtered = (query.trim() ? countries.filter((c) => c.toLowerCase().includes(query.trim().toLowerCase())) : countries).slice(
|
||||
0,
|
||||
MAX_VISIBLE
|
||||
);
|
||||
const listId = id ? `${id}-listbox` : undefined;
|
||||
const activeId = id && filtered[activeIndex] ? `${id}-option-${activeIndex}` : undefined;
|
||||
|
||||
function commit(country: string) {
|
||||
onChange(country);
|
||||
setQuery(country);
|
||||
setOpen(false);
|
||||
}
|
||||
|
||||
// Keeps the highlighted row inside the scroll container as it moves.
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
listRef.current?.querySelector('[data-active="true"]')?.scrollIntoView({ block: "nearest" });
|
||||
}, [activeIndex, open]);
|
||||
|
||||
function onKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
|
||||
if (e.key === "ArrowDown" || e.key === "ArrowUp") {
|
||||
e.preventDefault();
|
||||
if (!open) {
|
||||
setOpen(true);
|
||||
setActiveIndex(0);
|
||||
return;
|
||||
}
|
||||
const delta = e.key === "ArrowDown" ? 1 : -1;
|
||||
setActiveIndex((i) => (filtered.length === 0 ? 0 : (i + delta + filtered.length) % filtered.length));
|
||||
} else if (e.key === "Enter") {
|
||||
if (open && filtered[activeIndex]) {
|
||||
e.preventDefault();
|
||||
commit(filtered[activeIndex]);
|
||||
}
|
||||
} else if (e.key === "Escape") {
|
||||
if (open) {
|
||||
// Stop here rather than letting it bubble — otherwise the dialog
|
||||
// containing this field closes along with the dropdown.
|
||||
e.stopPropagation();
|
||||
setOpen(false);
|
||||
setQuery(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div ref={containerRef} className="relative">
|
||||
<input
|
||||
id={id}
|
||||
role="combobox"
|
||||
aria-expanded={open}
|
||||
aria-controls={listId}
|
||||
aria-activedescendant={open ? activeId : undefined}
|
||||
aria-autocomplete="list"
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
autoComplete="off"
|
||||
value={query}
|
||||
onChange={(e) => {
|
||||
setQuery(e.target.value);
|
||||
setActiveIndex(0);
|
||||
setOpen(true);
|
||||
}}
|
||||
onFocus={() => setOpen(true)}
|
||||
onKeyDown={onKeyDown}
|
||||
placeholder={placeholder}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm"
|
||||
className={CONTROL_CLASS}
|
||||
/>
|
||||
{open && (
|
||||
<div className="absolute z-20 mt-1 max-h-56 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-56 w-full overflow-y-auto rounded border border-border bg-white shadow-lg"
|
||||
>
|
||||
{filtered.length === 0 && <div className="px-3 py-2 text-sm text-ink-muted">Keine Treffer</div>}
|
||||
{filtered.slice(0, 50).map((c) => (
|
||||
{filtered.map((c, i) => (
|
||||
<button
|
||||
key={c}
|
||||
id={id ? `${id}-option-${i}` : undefined}
|
||||
role="option"
|
||||
aria-selected={i === activeIndex}
|
||||
data-active={i === activeIndex}
|
||||
type="button"
|
||||
onClick={() => {
|
||||
onChange(c);
|
||||
setQuery(c);
|
||||
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={() => commit(c)}
|
||||
className={`block w-full px-3 py-2 text-left text-sm ${i === activeIndex ? "bg-brand-100 text-brand-700" : "hover:bg-surface"}`}
|
||||
>
|
||||
{c}
|
||||
</button>
|
||||
|
||||
Reference in New Issue
Block a user