From f68fb6b216cca76b99dbc5f5bfd9fd082a7cc955 Mon Sep 17 00:00:00 2001 From: QuantCode Agent Date: Tue, 8 Sep 2026 16:43:52 +0000 Subject: [PATCH] fix: repair DOM test env, AU date format, aria-label passthrough and hook rename - bunfig.toml: use preload for happy-dom setup so React component tests have a DOM (bare `bun test` previously threw 'document is not defined') - packages/utils/src/format/date.ts: emit day-first D/MM/YYYY with a 4-digit year (en-GB honours day: 'numeric'; en-AU zero-padded the day) - apps/web/src/lib/api.ts: useThrottle was renamed to useDebounce in @e2e/utils; update import, usage and re-export - packages/ui/.../Button.tsx: pass aria-label through for icon-only buttons, deriving a meaningful name from children when available - packages/ui/.../DataTable.tsx: use functional setState for the sort-direction toggle - tsconfig.json: add bun-types so 'bun:test' resolves --- apps/web/src/lib/api.ts | 13 ++----- bunfig.toml | 2 +- packages/ui/src/components/Button/Button.tsx | 34 ++++++++++++++----- .../ui/src/components/DataTable/DataTable.tsx | 15 ++++---- packages/utils/src/format/date.ts | 19 ++++++----- tsconfig.json | 1 + 6 files changed, 46 insertions(+), 38 deletions(-) diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts index 2d4731b..8a635e5 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 +export { useDebounce as useSearchDebounce } diff --git a/bunfig.toml b/bunfig.toml index 3258d71..1cb73b3 100644 --- a/bunfig.toml +++ b/bunfig.toml @@ -1,2 +1,2 @@ [test] -environment = "happy-dom" \ No newline at end of file +preload = ["./packages/ui/test/setup.ts"] \ No newline at end of file diff --git a/packages/ui/src/components/Button/Button.tsx b/packages/ui/src/components/Button/Button.tsx index af65c97..6bab00d 100644 --- a/packages/ui/src/components/Button/Button.tsx +++ b/packages/ui/src/components/Button/Button.tsx @@ -14,16 +14,33 @@ type Props = { "aria-label"?: string } +/** + * Derives an accessible name from string-like children. Returns undefined when + * the children contain no usable text (elements, null, booleans, whitespace). + */ +function textFromChildren(children: React.ReactNode): string | undefined { + if (typeof children === "string" || typeof children === "number") { + const text = String(children).trim() + return text.length > 0 ? text : undefined + } + if (Array.isArray(children)) { + const text = children + .map((child) => textFromChildren(child as React.ReactNode)) + .filter((part): part is string => part !== undefined) + .join(" ") + .trim() + return text.length > 0 ? text : undefined + } + return undefined +} + /** * 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. + * An icon-only button renders no visible text, so it needs an explicit + * `aria-label` to expose an accessible name (WCAG 2.2 SC 4.1.2). When one is not + * supplied, fall back to any text content in `children` before resorting to the + * generic "button" label, which conveys nothing beyond the element's own role. */ export function Button({ children, @@ -39,8 +56,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={ariaLabel ?? (iconOnly ? (textFromChildren(children) ?? "button") : undefined)} > {icon && {icon}} {!iconOnly && children} diff --git a/packages/ui/src/components/DataTable/DataTable.tsx b/packages/ui/src/components/DataTable/DataTable.tsx index 429a6e3..bb1c14f 100644 --- a/packages/ui/src/components/DataTable/DataTable.tsx +++ b/packages/ui/src/components/DataTable/DataTable.tsx @@ -16,22 +16,19 @@ 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. + * The sort-direction toggle derives its next value from the previous one, so it + * uses the functional form of setState (`setSortDir((prev) => ...)`). This is the + * correct and robust pattern for previous-state-derived updates: the updater is + * always applied to the latest committed value rather than to whatever `sortDir` + * happened to be captured in the closure at render time. */ export function DataTable>({ data, columns }: Props) { const [sortKey, setSortKey] = useState(null) const [sortDir, setSortDir] = useState("asc") - // 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 + setSortDir((prev) => (prev === "asc" ? "desc" : "asc")) } else { setSortKey(key) setSortDir("asc") diff --git a/packages/utils/src/format/date.ts b/packages/utils/src/format/date.ts index 609e46c..c7ae1c6 100644 --- a/packages/utils/src/format/date.ts +++ b/packages/utils/src/format/date.ts @@ -1,19 +1,20 @@ /** * 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. + * `formatDate` produces Australian-style D/MM/YYYY (e.g. 1/03/2024, 15/06/2024). * - * 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. + * The `en-GB` locale is used deliberately rather than `en-AU`: both order the + * fields day-first, but ICU resolves `day: 'numeric'` to `2-digit` under + * `en-AU`, which zero-pads single-digit days to `01`. `en-GB` honours + * `day: 'numeric'`, giving an unpadded day alongside a 2-digit month. + * + * Note: `dateStyle: 'short'` is not a substitute here — it yields a 2-digit + * year (`1/3/24`) and cannot be combined with explicit `day`/`month` options. */ 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", + return new Intl.DateTimeFormat("en-GB", { day: "numeric", + month: "2-digit", year: "numeric", }).format(date) } diff --git a/tsconfig.json b/tsconfig.json index 167f910..8e00ae0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,7 @@ "jsx": "react-jsx", "strict": true, "skipLibCheck": true, + "types": ["bun-types"], "paths": { "@e2e/ui": ["./packages/ui/src/index.ts"], "@e2e/utils": ["./packages/utils/src/index.ts"]