Address Gadfly review on #8: modal focus/close, dim validation, dedup

Fixes from the PR #27 adversarial review (considered; not graded).

Correctness / error-handling
- Modal: focus once on mount and attach the keydown listener once (latest
  onClose/busy via refs), so a parent re-render (e.g. a background refetch)
  no longer re-fires focus() and steals it from the input being typed in.
- Modal takes a `busy` prop; while a save/delete is in flight, Escape and
  backdrop clicks don't dismiss it (form/delete modals pass busy=pending),
  so an action can't be interrupted mid-flight and lose its error.
- Form validates the *converted* centimeter values against the server's
  [1cm, 100m] bounds, so sub-cm / over-100m sizes fail client-side with a
  clear message instead of a generic server error.
- displayFromCm rounds imperial to 0.1 ft so an 8 ft garden (244 cm)
  prefills as "8", not "8.01".

Maintainability
- Extracted ui/field.ts (useFieldId + fieldControlClass) shared by
  TextField/TextArea/Select. Added a `danger` Button variant, used by the
  delete modal; card edit/delete buttons gained focus-visible rings.
- useUpdateGarden takes the id in its mutation variables (no dummy 0 during
  create). GardensPage shares a close handler; dropped a redundant zod
  annotation; 409 rebase reuses dimString; renamed `del` -> `deletion`.

Verified in a browser: 8 ft round-trips to a prefilled "8"; a sub-cm value
is rejected client-side with the modal staying open. tsc clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_01JdQpdYYsTgtkJBxbcpAszi

web/src/components/gardens/DeleteGardenModal.tsx

@@ -7,13 +7,13 @@ import { useDeleteGarden, type Garden } from '@/lib/gardens'
 
 /** Confirmation dialog for deleting a garden (and everything in it). */
 export function DeleteGardenModal({ garden, onClose }: { garden: Garden; onClose: () => void }) {
-  const del = useDeleteGarden()
+  const deletion = useDeleteGarden()
   const [error, setError] = useState<string | null>(null)
 
   async function onConfirm() {
     setError(null)
     try {
-      await del.mutateAsync(garden.id)
+      await deletion.mutateAsync(garden.id)
       onClose()
     } catch (err) {
       setError(errorMessage(err, 'Could not delete the garden.'))
@@ -21,7 +21,7 @@ export function DeleteGardenModal({ garden, onClose }: { garden: Garden; onClose
   }
 
   return (
-    <Modal title="Delete garden" onClose={onClose}>
+    <Modal title="Delete garden" onClose={onClose} busy={deletion.isPending}>
       <div className="flex flex-col gap-4">
         <p className="text-sm text-muted">
           Delete <span className="font-medium text-fg">{garden.name}</span> and everything planned in it?
@@ -29,16 +29,11 @@ export function DeleteGardenModal({ garden, onClose }: { garden: Garden; onClose
         </p>
         {error && <Alert>{error}</Alert>}
         <div className="flex justify-end gap-2">
-          <Button type="button" variant="ghost" onClick={onClose} disabled={del.isPending}>
+          <Button type="button" variant="ghost" onClick={onClose} disabled={deletion.isPending}>
             Cancel
           </Button>
-          <Button
+          <Button type="button" variant="danger" onClick={onConfirm} disabled={deletion.isPending}>
-            type="button"
+            {deletion.isPending ? 'Deleting…' : 'Delete'}
-            onClick={onConfirm}
-            disabled={del.isPending}
-            className="bg-red-600 text-white hover:bg-red-700"
-          >
-            {del.isPending ? 'Deleting…' : 'Delete'}
           </Button>
         </div>
       </div>

web/src/components/gardens/GardenCard.tsx

@@ -32,14 +32,14 @@ export function GardenCard({
         <button
           type="button"
           onClick={onEdit}
-          className="rounded-md px-2.5 py-1 text-sm font-medium text-muted transition-colors hover:bg-border/50 hover:text-fg"
+          className="rounded-md px-2.5 py-1 text-sm font-medium text-muted outline-none transition-colors hover:bg-border/50 hover:text-fg focus-visible:ring-2 focus-visible:ring-accent/40"
         >
           Edit
         </button>
         <button
           type="button"
           onClick={onDelete}
-          className="rounded-md px-2.5 py-1 text-sm font-medium text-muted transition-colors hover:bg-red-500/10 hover:text-red-600 dark:hover:text-red-400"
+          className="rounded-md px-2.5 py-1 text-sm font-medium text-muted outline-none transition-colors hover:bg-red-500/10 hover:text-red-600 focus-visible:ring-2 focus-visible:ring-red-500/40 dark:hover:text-red-400"
         >
           Delete
         </button>

web/src/components/gardens/GardenFormModal.tsx

@@ -7,7 +7,13 @@ import { TextArea } from '@/components/ui/TextArea'
 import { TextField } from '@/components/ui/TextField'
 import { errorMessage } from '@/lib/api'
 import { conflictGarden, useCreateGarden, useUpdateGarden, type Garden } from '@/lib/gardens'
-import { cmFromDisplay, dimensionUnitLabel, displayFromCm, type UnitPref } from '@/lib/units'
+import {
+  cmFromDisplay,
+  dimensionUnitLabel,
+  displayFromCm,
+  isValidDimensionCm,
+  type UnitPref,
+} from '@/lib/units'
 
 const DEFAULT_METERS = 10 // matches the server's 10 m default
 
@@ -29,7 +35,7 @@ function dimString(cm: number | undefined, unit: UnitPref): string {
 export function GardenFormModal({ garden, onClose }: { garden?: Garden; onClose: () => void }) {
   const isEdit = !!garden
   const create = useCreateGarden()
-  const update = useUpdateGarden(garden?.id ?? 0)
+  const update = useUpdateGarden()
   const pending = create.isPending || update.isPending
 
   const [name, setName] = useState(garden?.name ?? '')
@@ -56,24 +62,25 @@ export function GardenFormModal({ garden, onClose }: { garden?: Garden; onClose:
     setFormError(null)
     setConflict(null)
 
-    const w = parseFloat(width)
+    if (!name.trim()) {
-    const h = parseFloat(height)
+      setFormError('Enter a name for the garden.')
-    if (!name.trim() || !Number.isFinite(w) || w <= 0 || !Number.isFinite(h) || h <= 0) {
+      return
-      setFormError('Enter a name and a positive width and height.')
+    }
+    // Validate the converted centimeter values against the same bounds the
+    // server enforces, so sub-cm or over-100m sizes fail here with a clear
+    // message instead of a generic server error.
+    const widthCm = cmFromDisplay(parseFloat(width), unit)
+    const heightCm = cmFromDisplay(parseFloat(height), unit)
+    if (!isValidDimensionCm(widthCm) || !isValidDimensionCm(heightCm)) {
+      setFormError('Width and height must be between 1 cm and 100 m.')
       return
     }
 
-    const input = {
+    const input = { name: name.trim(), widthCm, heightCm, unitPref: unit, notes: notes.trim() }
-      name: name.trim(),
-      widthCm: cmFromDisplay(w, unit),
-      heightCm: cmFromDisplay(h, unit),
-      unitPref: unit,
-      notes: notes.trim(),
-    }
 
     try {
       if (isEdit) {
-        await update.mutateAsync({ ...input, version })
+        await update.mutateAsync({ id: garden.id, ...input, version })
       } else {
         await create.mutateAsync(input)
       }
@@ -86,8 +93,8 @@ export function GardenFormModal({ garden, onClose }: { garden?: Garden; onClose:
         setVersion(current.version)
         setName(current.name)
         setUnit(current.unitPref)
-        setWidth(String(displayFromCm(current.widthCm, current.unitPref)))
+        setWidth(dimString(current.widthCm, current.unitPref))
-        setHeight(String(displayFromCm(current.heightCm, current.unitPref)))
+        setHeight(dimString(current.heightCm, current.unitPref))
         setNotes(current.notes)
         setConflict('This garden changed elsewhere. The latest values are shown — review and save again.')
         return
@@ -99,7 +106,7 @@ export function GardenFormModal({ garden, onClose }: { garden?: Garden; onClose:
   const unitLabel = dimensionUnitLabel(unit)
 
   return (
-    <Modal title={isEdit ? 'Edit garden' : 'New garden'} onClose={onClose}>
+    <Modal title={isEdit ? 'Edit garden' : 'New garden'} onClose={onClose} busy={pending}>
       <form onSubmit={onSubmit} className="flex flex-col gap-3">
         {conflict && <Alert tone="info">{conflict}</Alert>}
 

web/src/components/ui/Button.tsx

@@ -1,7 +1,7 @@
 import type { ButtonHTMLAttributes } from 'react'
 import { cn } from '@/lib/cn'
 
-export type ButtonVariant = 'primary' | 'ghost'
+export type ButtonVariant = 'primary' | 'ghost' | 'danger'
 
 /** Shared button styling, exported so anchor "buttons" (e.g. the OIDC link) match. */
 export function buttonClasses(variant: ButtonVariant = 'primary', className?: string) {
@@ -11,6 +11,7 @@ export function buttonClasses(variant: ButtonVariant = 'primary', className?: st
     'disabled:cursor-not-allowed disabled:opacity-60',
     variant === 'primary' && 'bg-accent text-accent-contrast hover:bg-accent-strong',
     variant === 'ghost' && 'border border-border text-fg hover:bg-border/50',
+    variant === 'danger' && 'bg-red-600 text-white hover:bg-red-700 focus-visible:ring-red-500/40',
     className,
   )
 }

web/src/components/ui/Modal.tsx

@@ -1,35 +1,45 @@
 import { useEffect, useRef, type ReactNode } from 'react'
 
 /**
- * A centered modal dialog rendered over a dimmed backdrop. Closes on Escape or a
+ * A centered modal dialog over a dimmed backdrop. Closes on Escape or a backdrop
- * backdrop click. Wraps content in a native <dialog>-like card; the caller owns
+ * click, unless `busy` (a mutation is in flight) — then it stays put so the
- * the open/closed state (render it only when open).
+ * action can finish and report. The caller owns open/closed state (render only
+ * when open).
  */
 export function Modal({
   title,
   onClose,
+  busy = false,
   children,
 }: {
   title: string
   onClose: () => void
+  busy?: boolean
   children: ReactNode
 }) {
   const cardRef = useRef<HTMLDivElement>(null)
+  // Keep the latest onClose/busy in refs so the mount-only effect below never
+  // re-runs (which would re-attach the listener and steal focus on every parent
+  // re-render, e.g. during a background refetch).
+  const onCloseRef = useRef(onClose)
+  onCloseRef.current = onClose
+  const busyRef = useRef(busy)
+  busyRef.current = busy
 
   useEffect(() => {
+    cardRef.current?.focus()
     function onKey(e: KeyboardEvent) {
-      if (e.key === 'Escape') onClose()
+      if (e.key === 'Escape' && !busyRef.current) onCloseRef.current()
     }
     document.addEventListener('keydown', onKey)
-    cardRef.current?.focus()
     return () => document.removeEventListener('keydown', onKey)
-  }, [onClose])
+  }, [])
 
   return (
     <div
       className="fixed inset-0 z-50 flex items-end justify-center bg-black/40 p-4 sm:items-center"
       onMouseDown={(e) => {
-        if (e.target === e.currentTarget) onClose()
+        if (e.target === e.currentTarget && !busy) onClose()
       }}
     >
       <div

web/src/components/ui/Select.tsx

@@ -1,34 +1,23 @@
-import { forwardRef, useId, type SelectHTMLAttributes } from 'react'
+import { forwardRef, type SelectHTMLAttributes } from 'react'
 import { cn } from '@/lib/cn'
+import { fieldControlClass, useFieldId } from './field'
 
 interface SelectProps extends SelectHTMLAttributes<HTMLSelectElement> {
   label: string
   options: { value: string; label: string }[]
 }
 
-// Labelled native <select>, styled to match the text inputs.
 export const Select = forwardRef<HTMLSelectElement, SelectProps>(function Select(
   { label, options, id, name, className, ...props },
   ref,
 ) {
-  const generatedId = useId()
+  const fieldId = useFieldId(id, name)
-  const fieldId = id ?? name ?? generatedId
   return (
     <div className="flex flex-col gap-1.5">
       <label htmlFor={fieldId} className="text-sm font-medium text-fg">
         {label}
       </label>
-      <select
+      <select ref={ref} id={fieldId} name={name} className={cn(fieldControlClass, className)} {...props}>
-        ref={ref}
-        id={fieldId}
-        name={name}
-        className={cn(
-          'w-full rounded-md border border-border bg-surface px-3 py-2 text-base text-fg',
-          'outline-none transition-colors focus:border-accent focus:ring-2 focus:ring-accent/30 disabled:opacity-60',
-          className,
-        )}
-        {...props}
-      >
         {options.map((o) => (
           <option key={o.value} value={o.value}>
             {o.label}

web/src/components/ui/TextArea.tsx

@@ -1,35 +1,22 @@
-import { forwardRef, useId, type TextareaHTMLAttributes } from 'react'
+import { forwardRef, type TextareaHTMLAttributes } from 'react'
 import { cn } from '@/lib/cn'
+import { fieldControlClass, useFieldId } from './field'
 
 interface TextAreaProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {
   label: string
 }
 
-// Labelled multi-line input, matching TextField's styling (16px text avoids iOS
-// zoom). The id falls back to name then a generated id so the label always binds.
 export const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(function TextArea(
   { label, id, name, className, ...props },
   ref,
 ) {
-  const generatedId = useId()
+  const fieldId = useFieldId(id, name)
-  const fieldId = id ?? name ?? generatedId
   return (
     <div className="flex flex-col gap-1.5">
       <label htmlFor={fieldId} className="text-sm font-medium text-fg">
         {label}
       </label>
-      <textarea
+      <textarea ref={ref} id={fieldId} name={name} className={cn(fieldControlClass, className)} {...props} />
-        ref={ref}
-        id={fieldId}
-        name={name}
-        className={cn(
-          'w-full rounded-md border border-border bg-surface px-3 py-2 text-base text-fg',
-          'placeholder:text-muted/70 outline-none transition-colors',
-          'focus:border-accent focus:ring-2 focus:ring-accent/30 disabled:opacity-60',
-          className,
-        )}
-        {...props}
-      />
     </div>
   )
 })

web/src/components/ui/TextField.tsx

@@ -1,20 +1,17 @@
-import { forwardRef, useId, type InputHTMLAttributes } from 'react'
+import { forwardRef, type InputHTMLAttributes } from 'react'
 import { cn } from '@/lib/cn'
+import { fieldControlClass, useFieldId } from './field'
 
 interface TextFieldProps extends InputHTMLAttributes<HTMLInputElement> {
   label: string
   hint?: string
 }
 
-// A labelled text input. text-base (16px) is deliberate: smaller fonts make iOS
-// Safari zoom on focus. The field id falls back to the name, then to a generated
-// id, so the label/hint associations always hold.
 export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(function TextField(
   { label, hint, id, name, className, ...props },
   ref,
 ) {
-  const generatedId = useId()
+  const inputId = useFieldId(id, name)
-  const inputId = id ?? name ?? generatedId
   const hintId = hint ? `${inputId}-hint` : undefined
   return (
     <div className="flex flex-col gap-1.5">
@@ -26,13 +23,7 @@ export const TextField = forwardRef<HTMLInputElement, TextFieldProps>(function T
         id={inputId}
         name={name}
         aria-describedby={hintId}
-        className={cn(
+        className={cn(fieldControlClass, className)}
-          'w-full rounded-md border border-border bg-surface px-3 py-2 text-base text-fg',
-          'placeholder:text-muted/70 outline-none transition-colors',
-          'focus:border-accent focus:ring-2 focus:ring-accent/30',
-          'disabled:opacity-60',
-          className,
-        )}
         {...props}
       />
       {hint && (

web/src/components/ui/field.ts

@@ -0,0 +1,18 @@
+import { useId } from 'react'
+
+// Shared field plumbing for the labelled form controls (TextField, TextArea,
+// Select) so their id-fallback and base styling stay in one place.
+
+/** The field id: an explicit id, else the name, else a generated stable id, so
+ *  the label's htmlFor always binds to something. */
+export function useFieldId(id?: string, name?: string): string {
+  const generated = useId()
+  return id ?? name ?? generated
+}
+
+/** Base classes shared by the text/select/textarea controls. text-base (16px)
+ *  keeps iOS Safari from zooming on focus. */
+export const fieldControlClass =
+  'w-full rounded-md border border-border bg-surface px-3 py-2 text-base text-fg ' +
+  'outline-none transition-colors placeholder:text-muted/70 ' +
+  'focus:border-accent focus:ring-2 focus:ring-accent/30 disabled:opacity-60'

web/src/lib/gardens.ts

@@ -6,7 +6,7 @@ import { z } from 'zod'
 import { ApiError, api } from './api'
 import type { UnitPref } from './units'
 
-const unitPrefSchema: z.ZodType<UnitPref> = z.enum(['metric', 'imperial'])
+const unitPrefSchema = z.enum(['metric', 'imperial'])
 
 export const gardenSchema = z.object({
   id: z.number(),
@@ -51,13 +51,16 @@ export function useCreateGarden() {
 }
 
 export interface GardenUpdate extends GardenInput {
+  id: number
   version: number
 }
 
-export function useUpdateGarden(id: number) {
+export function useUpdateGarden() {
   const qc = useQueryClient()
   return useMutation({
-    mutationFn: async (input: GardenUpdate): Promise<Garden> =>
+    // id travels with the mutation variables (not the hook) so callers don't need
+    // a placeholder id before a garden is chosen.
+    mutationFn: async ({ id, ...input }: GardenUpdate): Promise<Garden> =>
       gardenSchema.parse(await api.patch(`/gardens/${id}`, input)),
     onSuccess: () => qc.invalidateQueries({ queryKey: gardensKey }),
   })

web/src/lib/units.ts

@@ -8,6 +8,15 @@ const CM_PER_INCH = 2.54
 const CM_PER_METER = 100
 const INCHES_PER_FOOT = 12
 
+// Mirrors the server's garden dimension bounds (service/gardens.go): [1cm, 100m].
+export const MIN_DIMENSION_CM = 1
+export const MAX_DIMENSION_CM = 10_000
+
+/** Whether a centimeter dimension is within the server's accepted range. */
+export function isValidDimensionCm(cm: number): boolean {
+  return Number.isFinite(cm) && cm >= MIN_DIMENSION_CM && cm <= MAX_DIMENSION_CM
+}
+
 /** Feet (+ optional inches) → whole centimeters. */
 export function cmFromFtIn(feet: number, inches = 0): number {
   return Math.round((feet * INCHES_PER_FOOT + inches) * CM_PER_INCH)
@@ -23,11 +32,15 @@ export function cmFromDisplay(value: number, unit: UnitPref): number {
   return unit === 'imperial' ? cmFromFtIn(value) : cmFromMeters(value)
 }
 
-/** Centimeters → a number in the given unit, for prefilling an input field. */
+/** Centimeters → a number in the given unit, for prefilling an input field.
+ *  Rounded so cm-quantization doesn't show through (e.g. 244cm shows as 8 ft,
+ *  not 8.01): meters to the cm (2 dp), feet to 0.1 ft. */
 export function displayFromCm(cm: number, unit: UnitPref): number {
-  const value = unit === 'imperial' ? cm / CM_PER_INCH / INCHES_PER_FOOT : cm / CM_PER_METER
+  if (unit === 'imperial') {
-  // Trim floating-point noise (e.g. 122cm → 4.0026ft → 4).
+    const feet = cm / CM_PER_INCH / INCHES_PER_FOOT
-  return Math.round(value * 100) / 100
+    return Math.round(feet * 10) / 10
+  }
+  return Math.round((cm / CM_PER_METER) * 100) / 100
 }
 
 /** Centimeters → a human string in the given unit (e.g. "1.22 m" or "4′ 0″"). */

web/src/pages/GardensPage.tsx

@@ -12,14 +12,14 @@ type Dialog = { kind: 'create' } | { kind: 'edit'; garden: Garden } | { kind: 'd
 export function GardensPage() {
   const gardens = useGardens()
   const [dialog, setDialog] = useState<Dialog>(null)
+  const close = () => setDialog(null)
+  const hasGardens = !!gardens.data && gardens.data.length > 0
 
   return (
     <section>
       <div className="flex items-center justify-between gap-4">
         <h1 className="text-2xl font-semibold tracking-tight">Gardens</h1>
-        {gardens.data && gardens.data.length > 0 && (
+        {hasGardens && <Button onClick={() => setDialog({ kind: 'create' })}>New garden</Button>}
-          <Button onClick={() => setDialog({ kind: 'create' })}>New garden</Button>
-        )}
       </div>
 
       <div className="mt-6">
@@ -50,9 +50,9 @@ export function GardensPage() {
         )}
       </div>
 
-      {dialog?.kind === 'create' && <GardenFormModal onClose={() => setDialog(null)} />}
+      {dialog?.kind === 'create' && <GardenFormModal onClose={close} />}
-      {dialog?.kind === 'edit' && <GardenFormModal garden={dialog.garden} onClose={() => setDialog(null)} />}
+      {dialog?.kind === 'edit' && <GardenFormModal garden={dialog.garden} onClose={close} />}
-      {dialog?.kind === 'delete' && <DeleteGardenModal garden={dialog.garden} onClose={() => setDialog(null)} />}
+      {dialog?.kind === 'delete' && <DeleteGardenModal garden={dialog.garden} onClose={close} />}
     </section>
   )
 }