From c27229a2d09e55a966555913aa9aef70699d761b Mon Sep 17 00:00:00 2001 From: QuantCode Agent Date: Wed, 12 Aug 2026 16:33:55 +0000 Subject: [PATCH] fix: resolve cross-package test failures - utils: rename hook export to useSearchDebounce and align api.ts import - ui/Button: forward aria-label and default an accessible name for icon-only buttons (WCAG 4.1.2) - ui/DataTable: fix stale-closure sort toggle using merged functional state update - utils/date: use en-AU day-first format without leading-zero day --- apps/web/src/lib/api.ts | 13 ++----- packages/ui/src/components/Button/Button.tsx | 39 ++++++++++++++----- .../ui/src/components/DataTable/DataTable.tsx | 33 ++++++++-------- packages/utils/src/format/date.ts | 27 ++++++------- 4 files changed, 64 insertions(+), 48 deletions(-) diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts index 2d4731b..56c1c04 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 { useDebounce, 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 under the app-facing name +export { useDebounce as useSearchDebounce } diff --git a/packages/ui/src/components/Button/Button.tsx b/packages/ui/src/components/Button/Button.tsx index af65c97..d760a73 100644 --- a/packages/ui/src/components/Button/Button.tsx +++ b/packages/ui/src/components/Button/Button.tsx @@ -17,14 +17,36 @@ 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. - * - * 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. + * Icon-only buttons render no visible text, so they must expose an accessible + * name via `aria-label` (WCAG 2.2 SC 4.1.2 Name, Role, Value). A caller-supplied + * `aria-label` always wins. When one is omitted for an icon-only button we fall + * back to string children, then to a generic label, and warn outside production + * so the missing label is caught in development rather than by end users. */ +const DEFAULT_ICON_ONLY_LABEL = "Button" + +function resolveAriaLabel( + ariaLabel: string | undefined, + iconOnly: boolean, + children: React.ReactNode, +): string | undefined { + if (ariaLabel) return ariaLabel + if (!iconOnly) return undefined + + if (typeof children === "string" && children.trim() !== "") { + return children.trim() + } + + if (process.env.NODE_ENV !== "production") { + console.warn( + "Button: icon-only buttons require an explicit `aria-label` for screen " + + `readers (WCAG 2.2 SC 4.1.2). Falling back to "${DEFAULT_ICON_ONLY_LABEL}".`, + ) + } + + return DEFAULT_ICON_ONLY_LABEL +} + export function Button({ children, icon, @@ -39,8 +61,7 @@ export function Button({ className={`btn btn-${variant}`} disabled={disabled} onClick={onClick} - // BUG: aria-label is not applied when iconOnly is true and no ariaLabel is passed - // The component should enforce aria-label for icon-only buttons + aria-label={resolveAriaLabel(ariaLabel, iconOnly, children)} > {icon && {icon}} {!iconOnly && children} diff --git a/packages/ui/src/components/DataTable/DataTable.tsx b/packages/ui/src/components/DataTable/DataTable.tsx index 429a6e3..91e6368 100644 --- a/packages/ui/src/components/DataTable/DataTable.tsx +++ b/packages/ui/src/components/DataTable/DataTable.tsx @@ -13,29 +13,30 @@ type Props> = { columns: Column[] } +type SortState = { + key: keyof T | null + dir: SortDir +} + /** * 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. + * Sort key and direction are held in a single piece of state and updated with + * the functional form of setState, so the toggle always derives the next + * direction from the current one rather than from a value captured when the + * handler was created. This keeps repeated clicks correct even when React + * batches several updates into one tick. */ export function DataTable>({ data, columns }: Props) { - const [sortKey, setSortKey] = useState(null) - const [sortDir, setSortDir] = useState("asc") + const [sort, setSort] = useState>({ 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..47a21f2 100644 --- a/packages/utils/src/format/date.ts +++ b/packages/utils/src/format/date.ts @@ -1,21 +1,22 @@ /** * 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 dates are day-first (D/MM/YYYY). Field ordering and separators are + * taken from the `en-AU` locale rather than hard-coded, so the output stays + * correct if the locale's pattern changes. The `en-AU` CLDR pattern zero-pads + * the day (`dd/MM/y`), so the day part is emitted without a leading zero while + * the month keeps its two-digit form and the year stays four digits. */ +const DATE_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_FORMATTER.formatToParts(date) + .map((part) => (part.type === "day" ? String(Number(part.value)) : part.value)) + .join("") } export function formatDateTime(date: Date): string {