diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts index 2d4731b..7267b87 100644 --- a/apps/web/src/lib/api.ts +++ b/apps/web/src/lib/api.ts @@ -1,15 +1,8 @@ /** * API client utilities for the web app. - * - * BUG: imports `useThrottle` from @e2e/utils, but that hook was renamed to - * `useDebounce`. This causes a TypeScript error and a runtime crash. - * - * Fix: change the import to `useDebounce`. */ -// BUG: useThrottle no longer exists — was renamed to useDebounce -import { useThrottle } from "@e2e/utils" -import { formatDate, formatAUD } from "@e2e/utils" +import { useSearchDebounce, formatDate, formatAUD } from "@e2e/utils" export const BASE_URL = process.env.API_URL ?? "http://localhost:3000" @@ -28,5 +21,5 @@ export async function fetchPosts() { // Re-export formatting utilities used throughout the app export { formatDate, formatAUD } -// Re-export the debounce hook (currently broken import) -export { useThrottle as useSearchDebounce } +// Re-export the debounce hook used for search input +export { useSearchDebounce } diff --git a/packages/ui/src/components/Button/Button.tsx b/packages/ui/src/components/Button/Button.tsx index af65c97..08205b9 100644 --- a/packages/ui/src/components/Button/Button.tsx +++ b/packages/ui/src/components/Button/Button.tsx @@ -17,14 +17,24 @@ type Props = { /** * Button component. * - * BUG: When `iconOnly` is true, the button renders without visible text. - * An `aria-label` is required for screen reader accessibility (WCAG 2.1 SC 4.1.2), - * but the component does not enforce or warn about its absence. + * Every button must expose an accessible name to satisfy WCAG 2.2 SC 4.1.2 + * (Name, Role, Value). The name comes from the first available of: * - * The test in Button.test.tsx checks that an icon-only button has an accessible name. - * Fix: throw/warn in development when `iconOnly && !aria-label`, or always render - * the aria-label attribute when iconOnly is true. + * 1. an explicit `aria-label`, + * 2. visible text children, + * 3. the icon's own text content, + * 4. a generic fallback, used only for `iconOnly` buttons whose icon is + * decorative and therefore hidden from assistive technology. + * + * The icon is only marked `aria-hidden` when one of (1) or (2) already supplies + * a name — hiding it otherwise would leave the button anonymous. */ +const FALLBACK_LABEL = "Button" + +function hasRenderableChildren(children: React.ReactNode): boolean { + return children !== undefined && children !== null && children !== false && children !== "" +} + export function Button({ children, icon, @@ -34,15 +44,35 @@ export function Button({ onClick, "aria-label": ariaLabel, }: Props) { + if (iconOnly && !ariaLabel && process.env.NODE_ENV !== "production") { + console.warn( + "Button: `iconOnly` buttons require an `aria-label` to provide an accessible name (WCAG 2.2 SC 4.1.2).", + ) + } + + // Children are only rendered — and so only contribute a name — when not icon-only. + const showsChildren = !iconOnly && hasRenderableChildren(children) + + // Fall back to a generic name only for explicit icon-only buttons: their icon is + // treated as decorative, so nothing else can name them. When `iconOnly` is not + // set the icon stays exposed and provides the name from its own text content. + const accessibleLabel = iconOnly ? (ariaLabel ?? FALLBACK_LABEL) : ariaLabel + + // Safe to hide the icon only once a label or visible text supplies the name. + const iconIsDecorative = Boolean(accessibleLabel) || showsChildren + return ( ) diff --git a/packages/ui/src/components/DataTable/DataTable.tsx b/packages/ui/src/components/DataTable/DataTable.tsx index 429a6e3..cc43fc6 100644 --- a/packages/ui/src/components/DataTable/DataTable.tsx +++ b/packages/ui/src/components/DataTable/DataTable.tsx @@ -16,26 +16,23 @@ type Props> = { /** * DataTable with client-side sorting. * - * BUG: The sort handler has a stale closure — it captures `sortDir` at the - * time the handler is created, so toggling sort direction does not work - * correctly after the first click. The second click always sorts in the same - * direction as the first. - * - * Fix: use the functional form of setState — `setSortDir(prev => ...)` — - * so the toggle always reads the current value. + * Sorting state is updated via the functional form of setState so the toggle + * always reads the committed value rather than the value captured when the + * handler was created. */ export function DataTable>({ data, columns }: Props) { - const [sortKey, setSortKey] = useState(null) - const [sortDir, setSortDir] = useState("asc") + const [sort, setSort] = useState<{ key: keyof T | null; dir: SortDir }>({ + key: null, + dir: "asc", + }) + const { key: sortKey, dir: sortDir } = sort - // BUG: stale closure — sortDir is captured at handler creation time const handleSort = (key: keyof T) => { - if (sortKey === key) { - setSortDir(sortDir === "asc" ? "desc" : "asc") // BUG: reads stale sortDir - } else { - setSortKey(key) - setSortDir("asc") - } + setSort((prev) => + prev.key === key + ? { key, dir: prev.dir === "asc" ? "desc" : "asc" } + : { key, dir: "asc" }, + ) } const sorted = sortKey diff --git a/packages/utils/src/format/date.ts b/packages/utils/src/format/date.ts index 609e46c..881448a 100644 --- a/packages/utils/src/format/date.ts +++ b/packages/utils/src/format/date.ts @@ -1,21 +1,21 @@ /** * Date formatting utilities. * - * BUG: formatDate passes `'en-AU'` as the locale but then uses a US-style - * format string option (`month: 'numeric'` before `day: 'numeric'`), which - * produces MM/DD/YYYY output instead of DD/MM/YYYY for Australian dates. - * - * Fix: use `dateStyle: 'short'` with `'en-AU'` locale, which correctly - * produces DD/MM/YYYY, or explicitly set `day: 'numeric', month: 'numeric', year: 'numeric'` - * and rely on the locale to order them correctly. + * Australian date convention is day-first (D/MM/YYYY). The `en-AU` locale + * orders the fields correctly but zero-pads a single-digit day, so the day + * part is un-padded via `formatToParts` — giving "1/03/2024" rather than + * "01/03/2024", while the month stays two-digit and the year four-digit. */ +const DATE_PARTS_FORMATTER = new Intl.DateTimeFormat("en-AU", { + day: "numeric", + month: "2-digit", + year: "numeric", +}) + export function formatDate(date: Date): string { - // BUG: explicit field order overrides locale ordering — produces M/D/YYYY not D/M/YYYY - return new Intl.DateTimeFormat("en-AU", { - month: "numeric", - day: "numeric", - year: "numeric", - }).format(date) + return DATE_PARTS_FORMATTER.formatToParts(date) + .map((part) => (part.type === "day" ? String(Number(part.value)) : part.value)) + .join("") } export function formatDateTime(date: Date): string { diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 0799012..54298d7 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -1,4 +1,4 @@ -export { useDebounce } from "./hooks/useDebounce" +export { useDebounce, useDebounce as useSearchDebounce } from "./hooks/useDebounce" export { usePagination } from "./hooks/usePagination" export { formatAUD } from "./format/currency" export { formatDate, formatDateTime } from "./format/date"