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.
82 lines
3.4 KiB
TypeScript
82 lines
3.4 KiB
TypeScript
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";
|
||
|
||
const PAYGRADES: { value: PaygradeType; label: string; description: string }[] = [
|
||
{ value: "A", label: "A – Einstieg", description: "Berufseinsteiger:innen ohne einschlägige Erfahrung" },
|
||
{ value: "B", label: "B – Qualifiziert", description: "Fachkräfte mit abgeschlossener Ausbildung" },
|
||
{ value: "C", label: "C – Erfahren", description: "Mehrjährige einschlägige Berufserfahrung" },
|
||
{ value: "D", label: "D – Spezialist:in", description: "Vertiefte Fachexpertise" },
|
||
{ value: "E", label: "E – Teamleitung", description: "Fachliche und disziplinäre Führung eines Teams" },
|
||
{ value: "F", label: "F – Bereichsleitung / GF", description: "Führung eines Bereichs bzw. Geschäftsführung" },
|
||
];
|
||
|
||
export function StepVertrag({ draft, update }: { draft: HireDraftData; update: (patch: Partial<HireDraftData>) => void }) {
|
||
function handleEmploymentTypeChange(value: HireDraftData["employmentType"]) {
|
||
update({
|
||
employmentType: value,
|
||
weeklyHours: value === "Vollzeit" ? "38.5" : draft.weeklyHours === "38.5" ? "20" : draft.weeklyHours,
|
||
});
|
||
}
|
||
|
||
return (
|
||
<div className="flex flex-col gap-4">
|
||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||
<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" && (
|
||
<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">
|
||
<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>
|
||
<h3 className="mb-3 text-sm font-bold text-ink">Rolle & Anstellung</h3>
|
||
<RoleEmploymentFields value={draft} onChange={update} />
|
||
</div>
|
||
</div>
|
||
);
|
||
}
|