@eifi1/ui-kit 0.51.6 → 0.52.0

package/src/components/combobox.tsx

@@ -1,5 +1,5 @@
-import { Fragment, useId, useMemo, useRef, useState } from "react";
-import type { ComponentPropsWithoutRef, ReactNode, Ref } from "react";
+import { useId, useMemo, useRef, useState } from "react";
+import type { ComponentPropsWithoutRef, KeyboardEvent, ReactNode, Ref } from "react";
 import { ChevronDown } from "lucide-react";
 import { FIELD_BASE, FIELD_FLOATING_PAD, FIELD_INVALID } from "./field-base";
 import { cn } from "../lib/cn";
@@ -9,9 +9,18 @@ import { isImeEnter } from "../lib/ime";
 import { isQuietFocus } from "../lib/quiet-focus";
 import { usePhoneLayout } from "../hooks/use-breakpoint";
 import { PickerSheet, SHEET_ROW_CLASS } from "./picker-sheet";
-import { ComboboxFieldLabel, endHintRowProps, GROUP_HEADING_STICKY, useActiveOptionScroll } from "./combobox-core";
-import { useKitLocale } from "../i18n/kit-labels";
-import { rankMatch } from "../lib/text-match";
+import {
+  anchoredHeadingClass,
+  ComboboxFieldLabel,
+  endHintRowProps,
+  GroupedOptions,
+  groupRuns,
+  SHEET_HEADING_CLASS,
+  useTypedListStatus,
+  type GroupRun,
+} from "./combobox-core";
+import { DEFAULT_COMBOBOX_LABELS, useKitLabels, useKitLocale } from "../i18n/kit-labels";
+import { sameName, searchRanked } from "../lib/text-match";
 import {
   EndHintRow,
   FieldCaption,
@@ -44,7 +53,7 @@ export interface ComboboxProps
   value: string;
   onChange: (v: string) => void;
   /** Suggestion pool (e.g. existing payee names). */
-  options: string[];
+  options: readonly string[];
   /** The visible label, a `<label for>` above the field: a ReactNode, as on every kit
    *  field (a string until 0.34, refactor audit 2026-10, API-9). Without one, name the
    *  field with `aria-label`. */
@@ -223,6 +232,12 @@ export function Combobox(props: ComboboxProps) {
   const { open, setOpen, wrapperRef, panelRef } = useDropdown({ backCloses: !isPhone, escapeLayer: false });
   const primaryOnly = usePrimaryPressOnly();
   const [active, setActive] = useState(-1);
+  // A closed list has no row the keyboard is on, however it closed — the sheet's X,
+  // Escape or Back, a press outside — adjusted while rendering. The arrows' row outlived
+  // it: the list reopens on the whole pool, so the row the arrows had put on "Migros"
+  // showed "Aldi" highlighted, and Enter took it over the typed value (0.52 code review,
+  // combobox.tsx). An ArrowDown that opens the list sets both at once, and keeps its row.
+  if (!open && active !== -1) setActive(-1);
   // The lock (see `lockedKeyDown`): a lock arriving while the list is up closes it,
   // adjusted while rendering so no frame offers a row that can no longer be taken.
   const lock = useLockReason(commit, disabledReason);
@@ -264,6 +279,9 @@ export function Combobox(props: ComboboxProps) {
   const query = typing ? value.trim() : "";
   // Folded as every kit list folds (DUP-5): "zurich" finds Zürich, by the locale's case.
   const locale = useKitLocale();
+  // The live status's words (INP-6): the result count and "No results", as the panel
+  // pickers say them.
+  const labels = useKitLabels("combobox", DEFAULT_COMBOBOX_LABELS);
   const matches = useMemo(() => {
     const seen = new Set<string>();
     const uniq = options.filter((o) => o && !seen.has(o) && seen.add(o));
@@ -272,13 +290,14 @@ export function Combobox(props: ComboboxProps) {
     if (!query) {
       ranked = uniq.slice(0, cap);
     } else {
-      // The whole name, then prefix matches, then substring matches — most relevant on
-      // top (`rankMatch`; a stable sort keeps the pool's order within a rank).
-      ranked = uniq
-        .map((o) => ({ o, rank: rankMatch(o, query, { locale }) }))
-        .filter((x) => x.rank >= 0)
+      // Every word of the query somewhere in the name (0.51.4's rule, which this list
+      // was said to have and did not: refactor audit 2026-10-30, DUP-4), ranked by the
+      // WHOLE query — the whole name, then prefix matches, then substring matches, then
+      // the names that hold the words apart (`searchRanked`, each name folded once). A
+      // stable sort keeps the pool's order within a rank.
+      ranked = searchRanked(uniq, query, (o) => [o], { locale })
         .sort((a, b) => a.rank - b.rank)
-        .map((x) => x.o)
+        .map((x) => x.row)
         .slice(0, cap);
     }
     if (!groupBy) return ranked;
@@ -296,27 +315,22 @@ export function Combobox(props: ComboboxProps) {
   }, [options, query, groupBy, maxSuggestions, isPhone, locale]);
 
   /**
-   * Which rows OPEN a group, and with what heading — computed once for both lists.
+   * The rows cut into their groups — computed once for both lists, each run a
+   * `role="group"` its heading names (INP-8). Without `groupBy`, one bare run.
    *
-   * The desktop list had this as `matches[i - 1]`, which is free; the sheet had it as
-   * `matches[matches.indexOf(o) - 1]`, which is a scan of the list per row and another
-   * per heading test. That is quadratic in the sheet's own cap of 50, on the branch
-   * that runs on the slowest hardware we ship to — and it answers the wrong question
-   * besides: `indexOf` finds the FIRST row with that string, so a duplicated option
-   * would have compared against a neighbour it is not next to. (`matches` de-duplicates
-   * today; that is a property of the memo above, not of the row being rendered.)
+   * The desktop list had the boundaries as `matches[i - 1]`, which is free; the sheet had
+   * them as `matches[matches.indexOf(o) - 1]`, which is a scan of the list per row and
+   * another per heading test. That is quadratic in the sheet's own cap of 50, on the
+   * branch that runs on the slowest hardware we ship to — and it answers the wrong
+   * question besides: `indexOf` finds the FIRST row with that string, so a duplicated
+   * option would have compared against a neighbour it is not next to. (`matches`
+   * de-duplicates today; that is a property of the memo above, not of the row being
+   * rendered.)
    */
-  const groupHeadings = useMemo(() => {
-    if (!groupBy) return null;
-    const heads = new Map<number, string>();
-    let prev: string | undefined;
-    matches.forEach((o, i) => {
-      const group = groupBy(o);
-      if (group != null && group !== prev) heads.set(i, group);
-      prev = group;
-    });
-    return heads;
-  }, [matches, groupBy]);
+  const runs = useMemo<GroupRun<string>[]>(
+    () => (groupBy ? groupRuns(matches, groupBy) : [{ group: null, start: 0, rows: matches }]),
+    [matches, groupBy],
+  );
 
   const take = (v: string) => {
     if (locked) return;
@@ -328,17 +342,6 @@ export function Combobox(props: ComboboxProps) {
     setTyping(false);
   };
 
-  // Offered only when the typed text is genuinely NOT in the pool: an exact
-  // (case-insensitive) match is an existing entry the list is already showing, and a
-  // second way to pick it would be noise. Compared against `options`, not `matches` —
-  // `matches` is capped, so a pool of 300 payees would otherwise offer to "add" one
-  // that exists but fell off the end of the list.
-  // What the field claims the keyboard is on. Only on a pointer device: the phone
-  // renders its rows in a {@link PickerSheet} whose own search box owns focus, and a
-  // field pointing at an id that is not there is worse than one pointing nowhere.
-  const activeId = !isPhone && active >= 0 && active < matches.length ? optionId(active) : undefined;
-  useActiveOptionScroll(activeId);
-
   // While locked the field sits in the reason's Tooltip — in a fragment with a hidden
   // copy of the reason, Button's anatomy; `block` so a full-width field stays full width.
   const withLock = (box: ReactNode) =>
@@ -350,21 +353,81 @@ export function Combobox(props: ComboboxProps) {
       box
     );
 
+  // Offered only when the typed text is genuinely NOT in the pool: an exact match —
+  // folded as the list matches, so "cafe" is Café ({@link sameName}, DUP-5 in the
+  // 2026-10-30 refactor audit) — is an existing entry the list is already showing, and a
+  // second way to pick it would be noise. Compared against `options`, not `matches` —
+  // `matches` is capped, so a pool of 300 payees would otherwise offer to "add" one
+  // that exists but fell off the end of the list.
   const typed = value.trim();
   const createRow =
-    createLabel && typed.length > 0 && !options.some((o) => o.toLowerCase() === typed.toLowerCase())
-      ? createLabel(typed)
-      : null;
+    createLabel && typed.length > 0 && !options.some((o) => sameName(o, typed, locale)) ? createLabel(typed) : null;
 
+  // Whether a list shows, the row the keyboard is on — named by the field, or on a phone
+  // by the sheet's own search box, which takes the same keys (INP-6, 0.34's BUG-5 for
+  // this field) — and the live status: the family's one rule for a typed list.
+  const { showing, expanded, activeOption, statusRegion } = useTypedListStatus({
+    isPhone,
+    open,
+    inert,
+    rowCount: matches.length,
+    extraRow: Boolean(createRow),
+    query,
+    active: active < matches.length ? active : -1,
+    optionId,
+    labels,
+  });
   // The list is a layer on the Escape stack while it SHOWS (Wave 2, DUP-1): an Escape
   // over an empty "open" list is the dialog's, as it always was. On a phone the sheet
   // is the layer.
-  const showing = !isPhone && open && !inert && (matches.length > 0 || Boolean(createRow));
   useDismissLayer(showing, () => {
     setOpen(false);
     setActive(-1);
   });
 
+  /** The list's keys — in the field and, on a phone, in the sheet's search box. Enter
+   *  with no row highlighted is "I mean what I typed" in both. */
+  const listKeyDown = (e: KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === "ArrowDown") {
+      e.preventDefault();
+      setOpen(true);
+      setActive((i) => Math.min(i + 1, matches.length - 1));
+    } else if (e.key === "ArrowUp") {
+      e.preventDefault();
+      setActive((i) => Math.max(i - 1, 0));
+    } else if (e.key === "Enter") {
+      // The Enter that confirms an IME composition is the IME's: it picks no row and
+      // submits nothing (BUG-9).
+      if (isImeEnter(e)) return;
+      if (open && active >= 0 && active < matches.length) {
+        e.preventDefault();
+        take(matches[active]);
+      } else {
+        // No row highlighted: the typed text is the answer. `preventDefault` only when a
+        // caller is taking Enter, so a plain form submit is otherwise left alone.
+        if (onSubmit) e.preventDefault();
+        setOpen(false);
+        onSubmit?.();
+      }
+    }
+  };
+
+  /** The rows in their runs — each group a `role="group"` its heading names (INP-8) —
+   *  for the sheet or the anchored list; `row` draws one option, `grouped` when it
+   *  stands under a heading. `matches` is group-contiguous, so the boundaries are a
+   *  property of the list rather than of the branch drawing it (see `runs`). */
+  const groupedRows = (sheet: boolean, row: (o: string, i: number, grouped: boolean) => ReactNode) => (
+    <GroupedOptions
+      runs={runs}
+      listboxId={listboxId}
+      rowKey={(o) => o}
+      row={row}
+      // The list's first item sits closer to its top edge; the create row comes first
+      // when there is one.
+      headingClassName={(run) => (sheet ? SHEET_HEADING_CLASS : anchoredHeadingClass(run, !createRow))}
+    />
+  );
+
   return (
     // `rest` dresses the outer box — a `data-tour` anchor, a test id. Not the NAME,
     // description, invalid or required state: those belong on the <input> below,
@@ -401,13 +464,15 @@ export function Combobox(props: ComboboxProps) {
               // field otherwise (dev#477: a field with neither announces only its text).
               aria-label={ariaLabel}
               role="combobox"
-              aria-expanded={open}
+              aria-expanded={expanded}
               // The list this field is the mouth of. Required by the role, and the half
               // that was missing: the field said it was expanded and never said what it
               // had expanded, so a reader had no way from the box to the options
               // (ESLint's `role-has-required-aria-props`, the audit's §a11y).
               aria-controls={listboxId}
-              aria-activedescendant={activeId}
+              // Only on a pointer device: on a phone the sheet's own search box holds
+              // focus and names the row, and the field behind it says nothing.
+              aria-activedescendant={isPhone ? undefined : activeOption}
               aria-autocomplete="list"
               aria-invalid={field.isInvalid || undefined}
               aria-describedby={mergeDescribedBy(field.describedBy, locked && lock.reasonId)}
@@ -431,6 +496,7 @@ export function Combobox(props: ComboboxProps) {
                 if (isQuietFocus(e.currentTarget)) return;
                 setOpen(true);
                 setTyping(false);
+                setActive(-1);
                 // The sheet carries its own input, so the field behind it must not also
                 // pull up the keyboard and scroll the page under the dialog.
                 if (isPhone) sheetInputRef.current?.focus();
@@ -443,7 +509,10 @@ export function Combobox(props: ComboboxProps) {
               onClick={() => {
                 if (locked) return;
                 setOpen(true);
+                // The whole pool again, so no row of the typed list is the keyboard's
+                // (0.52 code review, combobox.tsx — see `active`).
                 setTyping(false);
+                setActive(-1);
               }}
               // `inputMode="none"` rather than readOnly: the field must not look
               // uneditable (FIELD_BASE greys a read-only field since dev#468) and must
@@ -459,29 +528,8 @@ export function Combobox(props: ComboboxProps) {
               }}
               onKeyDown={(e) => {
                 if (locked) return lockedKeyDown(e);
-                if (e.key === "ArrowDown") {
-                  e.preventDefault();
-                  setOpen(true);
-                  setActive((i) => Math.min(i + 1, matches.length - 1));
-                } else if (e.key === "ArrowUp") {
-                  e.preventDefault();
-                  setActive((i) => Math.max(i - 1, 0));
-                } else if (e.key === "Enter") {
-                  // The Enter that confirms an IME composition is the IME's: it picks no
-                  // row and submits nothing (BUG-9).
-                  if (isImeEnter(e)) return;
-                  if (open && active >= 0 && active < matches.length) {
-                    e.preventDefault();
-                    take(matches[active]);
-                  } else {
-                    // No row highlighted: the typed text is the answer. `preventDefault`
-                    // only when a caller is taking Enter, so a plain form submit is
-                    // otherwise left alone.
-                    if (onSubmit) e.preventDefault();
-                    setOpen(false);
-                    onSubmit?.();
-                  }
-                } else if (e.key === "Escape") {
+                listKeyDown(e);
+                if (e.key === "Escape") {
                   // A list that is SHOWING is the top of the Escape stack, and the key
                   // closes it and stops here: a Modal or FullBleedDialog around the field
                   // otherwise closed with it, form and all (round 0.34 BUG-1). With no
@@ -536,6 +584,8 @@ export function Combobox(props: ComboboxProps) {
       )}
       <FieldCaption parts={hintParts} />
       {field.errorEl}
+      {/* The live status — see `useTypedListStatus` for where it goes and why. */}
+      {!isPhone && statusRegion}
       {isPhone && (
         <PickerSheet
           open={open && !inert}
@@ -547,11 +597,17 @@ export function Combobox(props: ComboboxProps) {
           query={value}
           onQueryChange={(v) => {
             onChange(v);
+            setActive(-1);
             setTyping(true);
           }}
           searchPlaceholder={searchPlaceholder ?? placeholder}
           inputRef={sheetInputRef}
           closeLabel={closeLabel}
+          // The field's own keys, in the box focus is in while the sheet is up: arrows
+          // and Enter there did nothing (INP-6, as BUG-5 gave the panel pickers).
+          onSearchKeyDown={listKeyDown}
+          listboxId={listboxId}
+          activeId={activeOption}
         >
           <ul id={listboxId} role="listbox">
             {createRow && (
@@ -570,37 +626,28 @@ export function Combobox(props: ComboboxProps) {
                 </button>
               </li>
             )}
-            {matches.map((o, i) => {
-              const group = groupHeadings?.get(i);
-              return (
-                <Fragment key={o}>
-                  {group !== undefined && (
-                    <li
-                      role="presentation"
-                      className={cn(
-                        GROUP_HEADING_STICKY,
-                        "px-4 pb-0.5 pt-3 text-caption font-semibold uppercase tracking-wide text-muted",
-                      )}
-                    >
-                      {group}
-                    </li>
+            {groupedRows(true, (o, i) => (
+              <li role="presentation">
+                <button
+                  type="button"
+                  id={optionId(i)}
+                  role="option"
+                  aria-selected={o === value}
+                  onClick={() => take(o)}
+                  className={cn(
+                    SHEET_ROW_CLASS,
+                    // The row the sheet's arrows are on.
+                    i === active && "bg-active",
+                    optionAdornment && "flex items-center justify-between gap-2",
                   )}
-                  <li role="presentation">
-                    <button
-                      type="button"
-                      role="option"
-                      aria-selected={o === value}
-                      onClick={() => take(o)}
-                      className={cn(SHEET_ROW_CLASS, optionAdornment && "flex items-center justify-between gap-2")}
-                    >
-                      {optionAdornment ? <span className="truncate-until-large">{o}</span> : o}
-                      {optionAdornment?.(o)}
-                    </button>
-                  </li>
-                </Fragment>
-              );
-            })}
+                >
+                  {optionAdornment ? <span className="truncate-until-large">{o}</span> : o}
+                  {optionAdornment?.(o)}
+                </button>
+              </li>
+            ))}
           </ul>
+          {statusRegion}
         </PickerSheet>
       )}
       {showing && (
@@ -624,62 +671,44 @@ export function Combobox(props: ComboboxProps) {
               </button>
             </li>
           )}
-          {matches.map((o, i) => {
-            // Heading at each group boundary only — `matches` is group-contiguous, so
-            // the boundaries are a property of the list rather than of the branch
-            // drawing it. See `groupHeadings`.
-            const group = groupHeadings?.get(i);
-            return (
-              <Fragment key={o}>
-                {group !== undefined && (
-                  <li
-                    role="presentation"
-                    className={cn(
-                      GROUP_HEADING_STICKY,
-                      "px-3 pb-0.5 pt-2 text-caption font-semibold uppercase tracking-wide text-muted first:pt-1",
-                    )}
-                  >
-                    {group}
-                  </li>
+          {groupedRows(false, (o, i, grouped) => (
+            <li role="presentation">
+              <button
+                type="button"
+                id={optionId(i)}
+                role="option"
+                // CHOSEN, not highlighted. The row the arrows are on is named by the
+                // field's `aria-activedescendant`; saying "selected" for it would tell a
+                // reader that the row they are passing over is already the answer.
+                aria-selected={o === value}
+                // Focus stays in the field — that is what `aria-activedescendant` is
+                // for — so the rows are not tab stops.
+                tabIndex={-1}
+                onMouseDown={(e) => {
+                  // mousedown (not click) so the blur from the input firing first
+                  // doesn't close the list before the selection registers.
+                  e.preventDefault();
+                  take(o);
+                }}
+                onMouseEnter={() => setActive(i)}
+                className={cn(
+                  rowClass(i === active),
+                  // Every row of a group indented under its heading — it was the first
+                  // row of each group only.
+                  grouped && "ps-6",
+                  // A row with a badge is a flex row so the label truncates and the
+                  // badge keeps its width; without one it stays the plain block the
+                  // other lists render, so nothing shifts for callers that pass none.
+                  // From Large up the label wraps instead (`truncate-until-large`,
+                  // text size §10.17, round 0.34 T1), as the badge-less row does.
+                  optionAdornment && "flex items-center justify-between gap-2",
                 )}
-                <li role="presentation">
-                  <button
-                    type="button"
-                    id={optionId(i)}
-                    role="option"
-                    // CHOSEN, not highlighted. The row the arrows are on is named by
-                    // the field's `aria-activedescendant`; saying "selected" for it
-                    // would tell a reader that the row they are passing over is
-                    // already the answer.
-                    aria-selected={o === value}
-                    // Focus stays in the field — that is what
-                    // `aria-activedescendant` is for — so the rows are not tab stops.
-                    tabIndex={-1}
-                    onMouseDown={(e) => {
-                      // mousedown (not click) so the blur from the input firing first
-                      // doesn't close the list before the selection registers.
-                      e.preventDefault();
-                      take(o);
-                    }}
-                    onMouseEnter={() => setActive(i)}
-                    className={cn(
-                      rowClass(i === active),
-                      group != null && "ps-6",
-                      // A row with a badge is a flex row so the label truncates and the
-                      // badge keeps its width; without one it stays the plain block the
-                      // other lists render, so nothing shifts for callers that pass none.
-                      // From Large up the label wraps instead (`truncate-until-large`,
-                      // text size §10.17, round 0.34 T1), as the badge-less row does.
-                      optionAdornment && "flex items-center justify-between gap-2",
-                    )}
-                  >
-                    {optionAdornment ? <span className="truncate-until-large">{o}</span> : o}
-                    {optionAdornment?.(o)}
-                  </button>
-                </li>
-              </Fragment>
-            );
-          })}
+              >
+                {optionAdornment ? <span className="truncate-until-large">{o}</span> : o}
+                {optionAdornment?.(o)}
+              </button>
+            </li>
+          ))}
         </SuggestionList>
       )}
     </div>

package/src/components/copy-button.tsx

@@ -9,7 +9,6 @@ import { Button } from "./button";
 import { IconButton } from "./icon-button";
 import type { ButtonSize, ButtonTone, ButtonVariant } from "./button-look";
 import type { IconButtonSize, IconButtonTone } from "./icon-button";
-import { Tooltip } from "./tooltip";
 import type { TooltipSide } from "./tooltip";
 import { DEFAULT_COPY_BUTTON_LABELS } from "./copy-button-labels";
 
@@ -31,8 +30,9 @@ export interface CopyButtonProps extends Omit<ButtonHTMLAttributes<HTMLButtonEle
   /** What to copy. A function is read at click time — for a value that is expensive
    *  to build (a CSV of the table) or that changes under the button. */
   text: string | (() => string);
-  /** `icon` (default): a square icon button whose tooltip states the result.
-   *  `label`: a text button whose words change to the result. */
+  /** `icon` (default): a square icon button whose glyph and colour show the result — its
+   *  words in a bubble, and from Large up beside the glyph, as every labelled IconButton
+   *  shows them. `label`: a text button whose words change to the result. */
   variant?: "icon" | "label";
   /** The idle accessible name — and, in the `label` variant, the visible text:
    *  "Copy IBAN" says WHAT is copied, which a row of three copy icons needs. Default
@@ -82,9 +82,9 @@ const ICONS: Record<CopyState, typeof Copy> = { idle: Copy, copied: Check, faile
  * failure goes through an ASSERTIVE region and a success through a polite one — the
  * failure is the news that changes what they do next.
  *
- * The icon variant keeps the SAME accessible name in every state. A button renaming
- * itself under the focus is announced inconsistently across readers; the live region
- * is the channel that is actually heard.
+ * The icon variant keeps the SAME accessible name in every state, and the same words on
+ * screen. A button renaming itself under the focus is announced inconsistently across
+ * readers; the live region is the channel that is actually heard.
  */
 export function CopyButton({
   text,
@@ -156,25 +156,36 @@ export function CopyButton({
     );
   }
 
+  // IconButton names itself (0.52, refactor audit 2026-10-30, DSP-21): `label` is the
+  // bubble — and the text beside the glyph at Large, as on every labelled IconButton —
+  // and `aria-label` keeps the name steady. A Tooltip of our own round it cloned
+  // `aria-describedby` onto the button, which then read "Copy, button, Copy".
+  //
+  // The idle words, in every state (0.52 code review, deep, charts, finding 8). As the
+  // state, "Copied" stood at Large beside the glyph of a button named "Copy IBAN": the pill
+  // changed width on every copy, and the words on screen were not in the name a voice
+  // user says to press it (WCAG 2.5.3, label in name). The glyph and its colour show the
+  // result, and the live regions say it.
   return (
     <>
-      <Tooltip label={stateText} side={tooltipSide} portal={tooltipPortal}>
-        <IconButton
-          type="button"
-          {...rest}
-          disabled={disabled}
-          aria-label={idleText}
-          variant={buttonVariant ?? "ghost"}
-          size={(size ?? "sm") as IconButtonSize}
-          tone={tone as IconButtonTone | undefined}
-          stopPropagation={stopPropagation}
-          data-state={state}
-          onClick={() => void onClick()}
-          className={cn(iconTone, className)}
-        >
-          <Icon aria-hidden />
-        </IconButton>
-      </Tooltip>
+      <IconButton
+        type="button"
+        {...rest}
+        disabled={disabled}
+        label={idleText}
+        aria-label={idleText}
+        tooltipSide={tooltipSide}
+        tooltipPortal={tooltipPortal}
+        variant={buttonVariant ?? "ghost"}
+        size={(size ?? "sm") as IconButtonSize}
+        tone={tone as IconButtonTone | undefined}
+        stopPropagation={stopPropagation}
+        data-state={state}
+        onClick={() => void onClick()}
+        className={cn(iconTone, className)}
+      >
+        <Icon aria-hidden />
+      </IconButton>
       {regions}
     </>
   );

package/src/components/country-select.tsx

@@ -3,7 +3,7 @@ import type { ComponentPropsWithoutRef, ReactNode, Ref } from "react";
 import { X } from "lucide-react";
 import { cn } from "../lib/cn";
 import { COUNTRY_CODES, countryName, normalizeCountryCode } from "../lib/countries";
-import { rankMatch } from "../lib/text-match";
+import { searchRanked } from "../lib/text-match";
 import { FieldChevron, FIELD_FLOATING_PAD, FIELD_INVALID, FIELD_TRIGGER, FloatingField } from "./field-base";
 import {
   assignRef,
@@ -178,17 +178,22 @@ interface Entry {
   name: string;
 }
 
-/** Best rank first; a stable sort, so equal ranks keep the collated (or preferred)
- *  order they came in. The rank is the kit's one (`rankMatch`, DUP-5 — written here
- *  first): the code itself (a two-letter query "ch" means Switzerland before it means
- *  Chad), then the start of the name, then anywhere in it, with accents and case folded
- *  — "osterreich" finds Österreich, "cote" Côte d'Ivoire. */
+/** Every word of the query in the name, or the whole code (0.51.4's rule: "kinshasa
+ *  congo" finds Congo - Kinshasa; refactor audit 2026-10-30, DUP-4), best rank first; a
+ *  stable sort, so equal ranks keep the collated (or preferred) order they came in. The
+ *  rank is the kit's one, for the WHOLE query (`rankMatch`, DUP-5 — written here first):
+ *  the code itself (a two-letter query "ch" means Switzerland before it means Chad), then
+ *  the start of the name, then anywhere in it, then the words apart (`searchRanked`, each
+ *  name and code folded once), with accents and case folded — "osterreich" finds
+ *  Österreich, "cote" Côte d'Ivoire.
+ *
+ *  A word is the code or it is not: searched INSIDE the code, as one more text, "w"
+ *  listed Aruba (AW) and Samoa (WS) and "d" Germany (DE), names with nothing of the
+ *  query in them (0.52 code review, country-select.tsx). */
 function search(entries: Entry[], q: string, locale: string): Entry[] {
-  return entries
-    .map((e) => ({ e, r: rankMatch(e.name, q, { code: e.code, locale }) }))
-    .filter((x) => x.r >= 0)
-    .sort((a, b) => a.r - b.r)
-    .map((x) => x.e);
+  return searchRanked(entries, q, (e) => [e.name], { code: (e) => e.code, locale })
+    .sort((a, b) => a.rank - b.rank)
+    .map((x) => x.row);
 }
 
 function toOption(e: Entry, flags: boolean, group?: string): ComboOption<string> {