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:
@@ -4,6 +4,7 @@ import { useMemo, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { hireEmployee } from "@/actions/employees";
|
||||
import { deleteHireDraft, saveHireDraft } from "@/actions/hireDrafts";
|
||||
import { Button } from "@/components/ui/Button";
|
||||
import { Modal } from "@/components/ui/Modal";
|
||||
import { useToast } from "@/components/ui/Toast";
|
||||
import type { OpenPositionResolved } from "@/lib/positions";
|
||||
@@ -123,51 +124,45 @@ export function HireWizard({ open, onClose, openPositions, locations, resumeDraf
|
||||
footer={
|
||||
<div className="flex w-full items-center justify-between">
|
||||
<div className="flex gap-2">
|
||||
<button onClick={onClose} className="rounded px-4 py-2 text-sm font-semibold text-ink-body hover:bg-surface">
|
||||
<Button variant="ghost" onClick={onClose}>
|
||||
Abbrechen
|
||||
</button>
|
||||
<button onClick={handleSaveDraft} className="rounded px-4 py-2 text-sm font-semibold text-ink-body hover:bg-surface">
|
||||
</Button>
|
||||
<Button variant="ghost" onClick={handleSaveDraft}>
|
||||
Als Entwurf speichern
|
||||
</button>
|
||||
</Button>
|
||||
</div>
|
||||
<div className="flex gap-2">
|
||||
{step > 0 && (
|
||||
<button
|
||||
onClick={() => setStep((s) => s - 1)}
|
||||
className="rounded border border-border px-4 py-2 text-sm font-semibold text-ink-body hover:bg-surface"
|
||||
>
|
||||
<Button variant="secondary" onClick={() => setStep((s) => s - 1)}>
|
||||
Zurück
|
||||
</button>
|
||||
</Button>
|
||||
)}
|
||||
{step < 3 && (
|
||||
<button
|
||||
onClick={() => setStep((s) => s + 1)}
|
||||
disabled={!stepValid}
|
||||
className="rounded bg-brand-500 px-4 py-2 text-sm font-semibold text-white disabled:opacity-40"
|
||||
>
|
||||
<Button onClick={() => setStep((s) => s + 1)} disabled={!stepValid}>
|
||||
Weiter
|
||||
</button>
|
||||
</Button>
|
||||
)}
|
||||
{step === 3 && (
|
||||
<button
|
||||
onClick={handleSubmit}
|
||||
disabled={submitting}
|
||||
className="rounded bg-brand-500 px-4 py-2 text-sm font-semibold text-white disabled:opacity-50"
|
||||
>
|
||||
<Button onClick={handleSubmit} pending={submitting}>
|
||||
Anlegen
|
||||
</button>
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
{/* A progress trail, not navigation: only completed steps are
|
||||
reachable, so the rest are genuinely disabled rather than inert
|
||||
buttons that silently swallow a click. */}
|
||||
<div className="mb-6 flex items-center justify-center gap-3">
|
||||
{STEP_LABELS.map((label, i) => (
|
||||
<button
|
||||
key={label}
|
||||
type="button"
|
||||
disabled={i >= step}
|
||||
aria-current={i === step ? "step" : undefined}
|
||||
onClick={() => i < step && setStep(i)}
|
||||
className={`flex items-center gap-2 text-xs font-semibold ${
|
||||
className={`flex items-center gap-2 rounded text-xs font-semibold focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-brand-500 disabled:cursor-default ${
|
||||
i === step ? "text-brand-700" : i < step ? "text-ink-body" : "text-ink-muted"
|
||||
}`}
|
||||
>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { SvNummerField } from "@/components/employees/SvNummerField";
|
||||
import { TitleFields } from "@/components/employees/TitleFields";
|
||||
import { SelectField, TextField } from "@/components/ui/Field";
|
||||
import type { HireDraftData } from "./types";
|
||||
|
||||
type StepPersonProps = {
|
||||
@@ -12,32 +13,22 @@ export function StepPerson({ draft, update, locations }: StepPersonProps) {
|
||||
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">Vorname*</label>
|
||||
<input value={draft.firstName} onChange={(e) => update({ firstName: 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">Nachname*</label>
|
||||
<input value={draft.lastName} onChange={(e) => update({ lastName: e.target.value })} className="w-full rounded border border-border px-3 py-2 text-sm" />
|
||||
</div>
|
||||
<TextField label="Vorname" required value={draft.firstName} onChange={(firstName) => update({ firstName })} />
|
||||
<TextField label="Nachname" required value={draft.lastName} onChange={(lastName) => update({ lastName })} />
|
||||
</div>
|
||||
<TitleFields value={draft} onChange={update} />
|
||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Geschlecht*</label>
|
||||
<select
|
||||
value={draft.gender}
|
||||
onChange={(e) => update({ gender: e.target.value as HireDraftData["gender"] })}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm"
|
||||
>
|
||||
<option value="m">männlich</option>
|
||||
<option value="w">weiblich</option>
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Geburtsdatum*</label>
|
||||
<input type="date" value={draft.birthDate} onChange={(e) => update({ birthDate: e.target.value })} className="w-full rounded border border-border px-3 py-2 text-sm" />
|
||||
</div>
|
||||
<SelectField
|
||||
label="Geschlecht"
|
||||
required
|
||||
value={draft.gender}
|
||||
onChange={(gender) => update({ gender: gender as HireDraftData["gender"] })}
|
||||
options={[
|
||||
{ value: "m", label: "männlich" },
|
||||
{ value: "w", label: "weiblich" },
|
||||
]}
|
||||
/>
|
||||
<TextField label="Geburtsdatum" required type="date" value={draft.birthDate} onChange={(birthDate) => update({ birthDate })} />
|
||||
</div>
|
||||
<SvNummerField
|
||||
value={draft.svNummer}
|
||||
@@ -46,26 +37,17 @@ export function StepPerson({ draft, update, locations }: StepPersonProps) {
|
||||
birthDate={draft.birthDate || null}
|
||||
/>
|
||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">E-Mail (privat)</label>
|
||||
<input type="email" value={draft.email} onChange={(e) => update({ email: 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">Telefon</label>
|
||||
<input value={draft.phone} onChange={(e) => update({ phone: e.target.value })} className="w-full rounded border border-border px-3 py-2 text-sm" />
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Standort*</label>
|
||||
<select value={draft.locationId} onChange={(e) => update({ locationId: e.target.value })} className="w-full rounded border border-border px-3 py-2 text-sm">
|
||||
<option value="">Bitte wählen…</option>
|
||||
{locations.map((l) => (
|
||||
<option key={l.id} value={l.id}>
|
||||
{l.name} ({l.country})
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<TextField label="E-Mail (privat)" type="email" value={draft.email} onChange={(email) => update({ email })} />
|
||||
<TextField label="Telefon" type="tel" value={draft.phone} onChange={(phone) => update({ phone })} />
|
||||
</div>
|
||||
<SelectField
|
||||
label="Standort"
|
||||
required
|
||||
value={draft.locationId}
|
||||
onChange={(locationId) => update({ locationId })}
|
||||
placeholder="Bitte wählen…"
|
||||
options={locations.map((l) => ({ value: l.id, label: `${l.name} (${l.country})` }))}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import { X } from "lucide-react";
|
||||
import { Button } from "@/components/ui/Button";
|
||||
import { Field, SelectField, TextField } from "@/components/ui/Field";
|
||||
import { Lookup } from "@/components/ui/Lookup";
|
||||
import { fmtDate } from "@/lib/format";
|
||||
import type { OpenPositionResolved } from "@/lib/positions";
|
||||
@@ -20,23 +22,32 @@ export function StepPosition({ draft, update, openPositions }: StepPositionProps
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-4">
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Position*</label>
|
||||
{!selected ? (
|
||||
<Lookup<OpenPositionResolved>
|
||||
placeholder="Positionsname oder -nummer…"
|
||||
onSearch={search}
|
||||
onSelect={(p) => update({ positionId: p.id })}
|
||||
renderResult={(p) => (
|
||||
<div>
|
||||
<div className="font-semibold text-ink">{p.title}</div>
|
||||
<div className="text-xs text-ink-muted">
|
||||
{p.position_number} · {p.orgLabel}
|
||||
{!selected ? (
|
||||
<Field
|
||||
label="Position"
|
||||
required
|
||||
hint={openPositions.length === 0 ? "Derzeit sind keine offenen Positionen vorhanden." : undefined}
|
||||
>
|
||||
{(p) => (
|
||||
<Lookup<OpenPositionResolved>
|
||||
{...p}
|
||||
placeholder="Positionsname oder -nummer…"
|
||||
onSearch={search}
|
||||
onSelect={(pos) => update({ positionId: pos.id })}
|
||||
renderResult={(pos) => (
|
||||
<div>
|
||||
<div className="font-semibold text-ink">{pos.title}</div>
|
||||
<div className="text-xs text-ink-muted">
|
||||
{pos.position_number} · {pos.orgLabel}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
/>
|
||||
) : (
|
||||
)}
|
||||
/>
|
||||
)}
|
||||
</Field>
|
||||
) : (
|
||||
<div>
|
||||
<p className="mb-1 block text-sm font-semibold text-ink">Position</p>
|
||||
<div className="flex items-center justify-between rounded border border-border bg-surface p-3">
|
||||
<div>
|
||||
<div className="text-sm font-semibold text-ink">{selected.title}</div>
|
||||
@@ -45,31 +56,32 @@ export function StepPosition({ draft, update, openPositions }: StepPositionProps
|
||||
</div>
|
||||
<div className="text-xs text-ink-muted">Gültig ab {fmtDate(selected.valid_from)}</div>
|
||||
</div>
|
||||
<button type="button" onClick={() => update({ positionId: "" })} aria-label="Auswahl aufheben">
|
||||
<X className="h-4 w-4 text-ink-muted" />
|
||||
</button>
|
||||
<Button variant="icon" onClick={() => update({ positionId: "" })} aria-label="Auswahl aufheben">
|
||||
<X className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
{openPositions.length === 0 && <p className="mt-1 text-xs text-ink-muted">Derzeit sind keine offenen Positionen vorhanden.</p>}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Besetzung*</label>
|
||||
<select
|
||||
value={draft.besetzung}
|
||||
onChange={(e) => update({ besetzung: e.target.value as HireDraftData["besetzung"] })}
|
||||
className="w-full rounded border border-border px-3 py-2 text-sm"
|
||||
>
|
||||
<option value="">Bitte wählen…</option>
|
||||
<option value="Extern">Extern</option>
|
||||
<option value="Intern">Intern</option>
|
||||
</select>
|
||||
</div>
|
||||
<SelectField
|
||||
label="Besetzung"
|
||||
required
|
||||
value={draft.besetzung}
|
||||
onChange={(v) => update({ besetzung: v as HireDraftData["besetzung"] })}
|
||||
placeholder="Bitte wählen…"
|
||||
options={[
|
||||
{ value: "Extern", label: "Extern" },
|
||||
{ value: "Intern", label: "Intern" },
|
||||
]}
|
||||
/>
|
||||
|
||||
<div>
|
||||
<label className="mb-1 block text-sm font-semibold text-ink">Führungskraft</label>
|
||||
<input value={selected?.managerName ?? "–"} disabled className="w-full rounded border border-border bg-surface px-3 py-2 text-sm text-ink-muted" />
|
||||
</div>
|
||||
<TextField
|
||||
label="Führungskraft"
|
||||
value={selected?.managerName ?? "–"}
|
||||
onChange={() => {}}
|
||||
disabled
|
||||
hint="Ergibt sich aus der gewählten Position."
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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