2026-07-22 03:34:08 +00:00 · 2026-07-22 03:28:48 +00:00 · 2026-07-22 03:28:48 +00:00 · 2026-07-22 03:28:48 +00:00
2 changed files with 35 additions and 16 deletions
@@ -1,5 +1,12 @@
 import { useEffect, useRef, type ReactNode } from 'react'

+// Tabbable controls inside the dialog, in DOM order. type="hidden" inputs are
+// excluded — they'd match `input:not([disabled])` and, sitting at a boundary,
+// break the wrap math. Hoisted out of the handler so it isn't rebuilt per Tab.
+const FOCUSABLE_SELECTOR =
+  'a[href], button:not([disabled]), textarea:not([disabled]), ' +
+  'input:not([disabled]):not([type="hidden"]), select:not([disabled]), [tabindex]:not([tabindex="-1"])'
+
 /**
 * A centered modal dialog over a dimmed backdrop. Closes on Escape or a backdrop
 * click, unless `busy` (a mutation is in flight) — then it stays put so the
@@ -33,13 +40,8 @@ export function Modal({
    const opener = document.activeElement as HTMLElement | null
    card?.focus()

-    // The dialog's own focusable controls, in DOM order, skipping disabled ones.
    const focusable = () =>
-      Array.from(
-        card?.querySelectorAll<HTMLElement>(
-          'a[href], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])',
-        ) ?? [],
-      )
+      Array.from(card?.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR) ?? [])

    function onKey(e: KeyboardEvent) {
      if (e.key === 'Escape' && !busyRef.current) {
@@ -47,9 +49,6 @@ export function Modal({
        return
      }
      if (e.key !== 'Tab') return
-      // Trap Tab inside the dialog: wrap at the ends, and pull a stray focus
-      // (e.g. starting from the card itself) back to a real control. Without
-      // this, Tab walks straight out into the page behind the backdrop.
      const items = focusable()
      if (items.length === 0) {
        e.preventDefault()
@@ -59,6 +58,15 @@ export function Modal({
      const first = items[0]
      const last = items[items.length - 1]
      const active = document.activeElement
+      // If focus is NOT inside the dialog, pull it back in rather than let Tab
+      // escape. This is the robust case that covers focus having fallen to
+      // <body> — a control that was removed (ShareGardenModal's remove-share
+      // button) or disabled while busy — as well as any externally-stolen focus.
+      if (!card || !card.contains(active)) {
+        e.preventDefault()
+        ;(e.shiftKey ? last : first).focus()
+        return
+      }
      if (e.shiftKey && (active === first || active === card)) {
        e.preventDefault()
        last.focus()
1
				
			
			
				
			
			
			
				@@ -70,7 +78,12 @@ export function Modal({
    document.addEventListener('keydown', onKey)
    return () => {
      document.removeEventListener('keydown', onKey)
-      opener?.focus?.()
+      // Restore focus to the opener only if it's still in the document — the
+      // delete/clear flows this trap targets often remove the element that
+      // opened the dialog (a garden card, a plop row). A disconnected node's
+      // focus() silently no-ops and leaves focus on <body>, so fall through to
+      // that case explicitly rather than pretend it worked.
+      if (opener && opener.isConnected) opener.focus()
    }
  }, [])

@@ -1,6 +1,6 @@
 import { memo, type KeyboardEvent, type PointerEvent } from 'react'
 import { objectTransform } from './shared'
-import { objectDisplayName } from './kinds'
+import { kindDef, objectDisplayName } from './kinds'
 import type { EditorObject } from './types'

 const DEFAULT_FILL = '#8a8a8a'
@@ -73,10 +73,13 @@ export const ObjectShape = memo(function ObjectShape({
  const stroke = selected ? '#2f7a3e' : '#00000033'
  const strokeWidth = selected ? 2 : 1

-  // A concise accessible name: the object's label plus its kind, e.g.
-  // "North Bed, raised bed". The dimensions aren't included — they need the
-  // garden's unit context this component doesn't hold — so they're a follow-up.
-  const label = `${objectDisplayName(object)}, ${object.kind.replace(/_/g, ' ')}`
+  // A concise accessible name: the object's label plus its kind's canonical
+  // label, e.g. "North Bed, In-ground" — reusing kindDef so it never diverges
+  // from what the UI shows (an ad-hoc kind.replace() gave "in ground"). The
+  // dimensions aren't included; they need the garden's unit context this
+  // component doesn't hold, so they're a follow-up.
+  const kindLabel = kindDef(object.kind)?.label ?? object.kind
+  const label = `${objectDisplayName(object)}, ${kindLabel}`

  // Keyboard focus needs to be VISIBLE — that's the point of making the canvas
  // keyboard-reachable. The `object-shape` class carries a :focus-visible rule
@@ -93,7 +96,10 @@ export const ObjectShape = memo(function ObjectShape({
      role="button"
      tabIndex={0}
      aria-label={label}
-      aria-pressed={selected}
+      // aria-current, not aria-pressed: selecting an object isn't a toggle (a
+      // toggle is what aria-pressed means). aria-current marks it as the active
+      // item among the objects. Omitted, not "false", when unselected.
+      aria-current={selected || undefined}
      style={{ cursor: 'pointer' }}
    >
      {object.shape === 'circle' ? (