Maximilian Stubhan
d9367a8ce4
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.
93 lines
3.7 KiB
TypeScript
93 lines
3.7 KiB
TypeScript
"use client";
|
|
|
|
import { SelectField } from "@/components/ui/Field";
|
|
import type { CollectiveAgreement, Weekday, WorkerType } from "@/lib/supabase/types";
|
|
|
|
const WEEKDAYS: Weekday[] = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"];
|
|
|
|
export type RoleEmploymentValue = {
|
|
workerType: WorkerType;
|
|
collectiveAgreement: CollectiveAgreement;
|
|
workDays: Weekday[];
|
|
isBetriebsrat: boolean;
|
|
hasDienstwagen: boolean;
|
|
isLateraleFuehrung: boolean;
|
|
isCLevel: boolean;
|
|
};
|
|
|
|
// Shared by the hire wizard (StepVertrag) and DatenAendernPanel — both edit
|
|
// the same set of employees columns, just against different local state.
|
|
export function RoleEmploymentFields({ value, onChange }: { value: RoleEmploymentValue; onChange: (patch: Partial<RoleEmploymentValue>) => void }) {
|
|
function toggleWorkDay(day: Weekday) {
|
|
onChange({ workDays: value.workDays.includes(day) ? value.workDays.filter((d) => d !== day) : [...value.workDays, day] });
|
|
}
|
|
|
|
return (
|
|
<div className="flex flex-col gap-3">
|
|
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
|
<SelectField
|
|
label="Angestellte:r / Arbeiter:in"
|
|
dense
|
|
value={value.workerType}
|
|
onChange={(v) => onChange({ workerType: v as WorkerType })}
|
|
options={[
|
|
{ value: "Angestellte:r", label: "Angestellte:r" },
|
|
{ value: "Arbeiter:in", label: "Arbeiter:in" },
|
|
]}
|
|
/>
|
|
<SelectField
|
|
label="Kollektivvertrag"
|
|
dense
|
|
value={value.collectiveAgreement}
|
|
onChange={(v) => onChange({ collectiveAgreement: v as CollectiveAgreement })}
|
|
options={[
|
|
{ value: "Handel", label: "Handel" },
|
|
{ value: "Süßwaren", label: "Süßwaren" },
|
|
]}
|
|
/>
|
|
</div>
|
|
|
|
{/* Toggle group, not a set of fields: a fieldset names the group, and
|
|
aria-pressed is what tells a screen reader a day is selected —
|
|
colour alone does not. */}
|
|
<fieldset>
|
|
<legend className="mb-1 block text-xs font-semibold text-ink-muted">Arbeitstage</legend>
|
|
<div className="flex flex-wrap gap-1.5">
|
|
{WEEKDAYS.map((day) => (
|
|
<button
|
|
key={day}
|
|
type="button"
|
|
aria-pressed={value.workDays.includes(day)}
|
|
onClick={() => toggleWorkDay(day)}
|
|
className={`rounded-full px-3 py-1.5 text-xs font-semibold focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand-500 ${
|
|
value.workDays.includes(day) ? "bg-brand-500 text-white" : "border border-border text-ink-muted hover:bg-surface"
|
|
}`}
|
|
>
|
|
{day}
|
|
</button>
|
|
))}
|
|
</div>
|
|
</fieldset>
|
|
|
|
<div className="flex flex-col gap-2">
|
|
<label className="flex items-center gap-2 text-sm text-ink-body">
|
|
<input type="checkbox" checked={value.isBetriebsrat} onChange={(e) => onChange({ isBetriebsrat: e.target.checked })} />
|
|
Betriebsrat
|
|
</label>
|
|
<label className="flex items-center gap-2 text-sm text-ink-body">
|
|
<input type="checkbox" checked={value.hasDienstwagen} onChange={(e) => onChange({ hasDienstwagen: e.target.checked })} />
|
|
Dienstwagen
|
|
</label>
|
|
<label className="flex items-center gap-2 text-sm text-ink-body">
|
|
<input type="checkbox" checked={value.isLateraleFuehrung} onChange={(e) => onChange({ isLateraleFuehrung: e.target.checked })} />
|
|
Laterale Führung
|
|
</label>
|
|
<label className="flex items-center gap-2 text-sm text-ink-body">
|
|
<input type="checkbox" checked={value.isCLevel} onChange={(e) => onChange({ isCLevel: e.target.checked })} />
|
|
C-Level
|
|
</label>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|