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,4 +1,5 @@
|
||||
import { RoleEmploymentFields } from "@/components/employees/RoleEmploymentFields";
|
||||
import { SelectField, TextField } from "@/components/ui/Field";
|
||||
import type { PaygradeType } from "@/lib/supabase/types";
|
||||
import type { HireDraftData } from "./types";
|
||||
|
||||
@@ -22,72 +23,53 @@ export function StepVertrag({ draft, update }: { draft: HireDraftData; update: (
|
||||
return (
|
||||
<div className="flex flex-col gap-4">
|
||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Eintrittsdatum*</label>
|
||||
<input type="date" value={draft.entryDate} onChange={(e) => update({ entryDate: e.target.value })} className="w-full rounded border border-border px-3 py-2 text-sm" />
|
||||
</div>
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Vertragsart</label>
|
||||
<select
|
||||
value={draft.contractType}
|
||||
onChange={(e) => update({ contractType: e.target.value as HireDraftData["contractType"] })}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm"
|
||||
>
|
||||
<option value="unbefristet">unbefristet</option>
|
||||
<option value="befristet">befristet</option>
|
||||
</select>
|
||||
</div>
|
||||
<TextField label="Eintrittsdatum" required type="date" value={draft.entryDate} onChange={(entryDate) => update({ entryDate })} />
|
||||
<SelectField
|
||||
label="Vertragsart"
|
||||
value={draft.contractType}
|
||||
onChange={(v) => update({ contractType: v as HireDraftData["contractType"] })}
|
||||
options={[
|
||||
{ value: "unbefristet", label: "unbefristet" },
|
||||
{ value: "befristet", label: "befristet" },
|
||||
]}
|
||||
/>
|
||||
</div>
|
||||
{draft.contractType === "befristet" && (
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Befristet bis*</label>
|
||||
<input
|
||||
type="date"
|
||||
value={draft.contractEndDate}
|
||||
onChange={(e) => update({ contractEndDate: e.target.value })}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm"
|
||||
/>
|
||||
</div>
|
||||
<TextField
|
||||
label="Befristet bis"
|
||||
required
|
||||
type="date"
|
||||
value={draft.contractEndDate}
|
||||
onChange={(contractEndDate) => update({ contractEndDate })}
|
||||
/>
|
||||
)}
|
||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Beschäftigungsausmaß</label>
|
||||
<select
|
||||
value={draft.employmentType}
|
||||
onChange={(e) => handleEmploymentTypeChange(e.target.value as HireDraftData["employmentType"])}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm"
|
||||
>
|
||||
<option value="Vollzeit">Vollzeit</option>
|
||||
<option value="Teilzeit">Teilzeit</option>
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Wochenstunden</label>
|
||||
<input
|
||||
type="number"
|
||||
step="0.5"
|
||||
value={draft.weeklyHours}
|
||||
disabled={draft.employmentType === "Vollzeit"}
|
||||
onChange={(e) => update({ weeklyHours: e.target.value })}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm disabled:bg-surface disabled:text-ink-muted"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Paygrade*</label>
|
||||
<select
|
||||
value={draft.paygrade}
|
||||
onChange={(e) => update({ paygrade: e.target.value as PaygradeType })}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm"
|
||||
>
|
||||
{PAYGRADES.map((p) => (
|
||||
<option key={p.value} value={p.value}>
|
||||
{p.label}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<p className="mt-1 text-xs text-ink-muted">{PAYGRADES.find((p) => p.value === draft.paygrade)?.description}</p>
|
||||
<SelectField
|
||||
label="Beschäftigungsausmaß"
|
||||
value={draft.employmentType}
|
||||
onChange={(v) => handleEmploymentTypeChange(v as HireDraftData["employmentType"])}
|
||||
options={[
|
||||
{ value: "Vollzeit", label: "Vollzeit" },
|
||||
{ value: "Teilzeit", label: "Teilzeit" },
|
||||
]}
|
||||
/>
|
||||
<TextField
|
||||
label="Wochenstunden"
|
||||
type="number"
|
||||
step="0.5"
|
||||
value={draft.weeklyHours}
|
||||
disabled={draft.employmentType === "Vollzeit"}
|
||||
onChange={(weeklyHours) => update({ weeklyHours })}
|
||||
/>
|
||||
</div>
|
||||
<SelectField
|
||||
label="Paygrade"
|
||||
required
|
||||
value={draft.paygrade}
|
||||
onChange={(v) => update({ paygrade: v as PaygradeType })}
|
||||
options={PAYGRADES}
|
||||
hint={PAYGRADES.find((p) => p.value === draft.paygrade)?.description}
|
||||
/>
|
||||
<p className="text-xs text-ink-muted">Es gilt eine Probezeit von 1 Monat gemäß Kollektivvertrag.</p>
|
||||
|
||||
<div>
|
||||
|
||||
Reference in New Issue
Block a user