@eifi1/ui-kit 0.34.0 → 0.36.0

package/src/components/amount-input.tsx

@@ -36,6 +36,7 @@ import {
   LockedReason,
   mergeRefs,
   type DisabledReasonDisplay,
+  type FieldHelpProps,
   type LockReason,
 } from "./field-parts";
 import { useEndWidth, useNumericField } from "./numeric-field";
@@ -43,7 +44,7 @@ import type { CommitScope } from "./write-lock";
 
 /** {@link AmountInput}'s props — exported since 0.34 (refactor audit 2026-10, API-9): a
  *  wrapper typed itself off `ComponentProps<typeof AmountInput>` until then. */
-export interface AmountInputProps {
+export interface AmountInputProps extends FieldHelpProps {
   value: string;
   onChange: (value: string) => void;
   currency?: string;
@@ -100,9 +101,6 @@ export interface AmountInputProps {
   id?: string;
   /** Names the field when it has no visible `label` (a table cell, the display shape). */
   "aria-label"?: string;
-  /** @deprecated 0.34 — use `aria-label`; removed in 0.35 (refactor audit 2026-10, API-1).
-   *  Names the field only when `aria-label` is absent. */
-  ariaLabel?: string;
   /**
    * Set on the `<input>`, with `id` above. Declared so `Field`'s render-prop spread —
    * `{(ids) => <AmountInput {...ids} … />}` — is typed and reaches the input: the
@@ -382,7 +380,7 @@ function isResultOf(previous: string, text: string, settle: (text: string) => st
 }
 
 export function AmountInput(props: AmountInputProps) {
-  const { ref, value, onChange, currency, onCurrencyChange, placeholder, label, className, inputClassName, id, "aria-label": ariaLabelAttr, ariaLabel: ariaLabelProp, "aria-required": ariaRequired, autoFocus, tone = "neutral", negative = false, onNegativeChange, align = "start", labels, currencyNames, currencyOptions, digits: digitsProp, min, max, onCommit, disabledReasonDisplay } = props;
+  const { ref, value, onChange, currency, onCurrencyChange, placeholder, label, className, inputClassName, id, "aria-label": ariaLabel, "aria-required": ariaRequired, autoFocus, tone = "neutral", negative = false, onNegativeChange, align = "start", labels, currencyNames, currencyOptions, digits: digitsProp, min, max, onCommit, disabledReasonDisplay } = props;
   const generatedId = useId();
   const fieldId = id ?? generatedId;
   // The sign is DISPLAYED, not stored (live #201 rework). `value` is the
@@ -556,8 +554,7 @@ export function AmountInput(props: AmountInputProps) {
       <input
         ref={setRefs}
         id={fieldId}
-        // The DOM spelling wins; `ariaLabel` is the fallback for call sites not moved yet.
-        aria-label={ariaLabelAttr ?? ariaLabelProp}
+        aria-label={ariaLabel}
         type="text"
         // eslint-disable-next-line jsx-a11y/no-autofocus -- opt-in per call site (feedback #70)
         autoFocus={autoFocus}

package/src/components/autocomplete.tsx

@@ -32,6 +32,7 @@ import {
   useFieldHint,
   useLockReason,
   type DisabledReasonDisplay,
+  type FieldHelpProps,
 } from "./field-parts";
 import type { CommitScope } from "./write-lock";
 
@@ -44,7 +45,8 @@ export interface AutocompleteProps<V extends string | number = string>
   extends Omit<
     ComponentPropsWithoutRef<"input">,
     "value" | "defaultValue" | "onChange" | "onSelect" | "children" | "type" | "size"
-  > {
+  >,
+    FieldHelpProps {
   /** What is in the field. Controlled, and never reset by the component: opening,
    *  closing and a failed lookup all leave it exactly as typed. */
   value: string;
@@ -220,6 +222,7 @@ export function Autocomplete<V extends string | number = string>(props: Autocomp
     invalid,
     error,
     hint,
+    help,
     status,
     emptyLabel,
     loadErrorLabel,
@@ -252,7 +255,7 @@ export function Autocomplete<V extends string | number = string>(props: Autocomp
     noResults: emptyLabel,
     loadError: loadErrorLabel,
   });
-  const hintParts = useFieldHint(hint, ariaDescribedBy);
+  const hintParts = useFieldHint(hint, ariaDescribedBy, { help, name: label ?? ariaLabel });
   // A form library's `aria-invalid` paints as well as announces (DUP-8: it only
   // announced, through the spread below).
   const field = useFieldError(error, invalid, hintParts.describedBy, rest["aria-invalid"]);

package/src/components/button-look.ts

@@ -100,8 +100,13 @@ export const buttonVariantClasses: Record<ButtonVariant, string> = {
   // the base's focus ring stays: those copies had `outline-none` and no ring, so
   // a keyboard user tabbing onto them saw nothing at all. `rounded-sm` keeps that
   // ring hugging the word instead of drawing a pill round it.
+  //
+  // Under More contrast the word reads `--brand-muted`, the brand AS TEXT (0.36,
+  // colour-roles §13.3 decision 8): `--brand` is solved as a mark (3:1), and on More
+  // contrast's darker light well Moss's read 3.68:1; the derived dark brands sit at 3.0
+  // as text too. Both modes, since `contrast:` does not split them.
   link:
-    "rounded-sm p-0 bg-transparent text-brand underline-offset-4 hover:underline focus-visible:ring-brand",
+    "rounded-sm p-0 bg-transparent text-brand underline-offset-4 hover:underline focus-visible:ring-brand contrast:text-brand-muted",
 };
 
 /**
@@ -132,11 +137,14 @@ export const buttonVariantClasses: Record<ButtonVariant, string> = {
  */
 export type ButtonTone = "default" | "muted" | "danger";
 
+// `contrast:text-secondary` restates the tone's own colour under the `contrast:` variant,
+// so tailwind-merge drops the link's `contrast:text-brand-muted` (0.36): a quiet link
+// stays quiet under More contrast. On `ghost` it reads the same either way.
 const BUTTON_TONES: Record<Exclude<ButtonTone, "default">, string> = {
   muted:
-    "text-secondary hover:text-primary disabled:hover:text-secondary",
+    "text-secondary hover:text-primary disabled:hover:text-secondary contrast:text-secondary",
   danger:
-    "text-secondary hover:text-danger focus-visible:ring-danger-strong disabled:hover:text-secondary",
+    "text-secondary hover:text-danger focus-visible:ring-danger-strong disabled:hover:text-secondary contrast:text-secondary",
 };
 
 /** Only the two transparent variants take every tone; see {@link ButtonTone}. */
@@ -158,9 +166,11 @@ const BUTTON_BOXED_DANGER: Partial<Record<ButtonVariant, string>> = {
 
 // `pressed` on a `link`: the brand colour and a heavier weight, which is exactly what
 // lenkbank's "All speeds" toggle paints by hand (gear/hysteresis-charts.tsx:482). After
-// the tone, so a pressed muted link is brand, and an unpressed one is quiet grey.
+// the tone, so a pressed muted link is brand, and an unpressed one is quiet grey. Under
+// More contrast the brand as text, `--brand-muted`, at rest and hovered (0.36, as the
+// `link` variant), whatever the tone.
 export const BUTTON_LINK_PRESSED =
-  "font-medium text-brand hover:text-brand disabled:hover:text-brand";
+  "font-medium text-brand hover:text-brand disabled:hover:text-brand contrast:text-brand-muted contrast:hover:text-brand-muted contrast:disabled:hover:text-brand-muted";
 
 /** The second argument of {@link buttonClasses} in its options form. */
 export interface ButtonClassesOptions {

package/src/components/calculator.tsx

@@ -37,9 +37,6 @@ interface CalculatorButtonProps {
   className?: string;
   /** The trigger's accessible name; wins over `calculator.open` from the provider. */
   "aria-label"?: string;
-  /** @deprecated 0.34 — use `aria-label`; removed in 0.35 (refactor audit 2026-10, API-1).
-   *  Names the trigger only when `aria-label` is absent. */
-  ariaLabel?: string;
   /** Screen-reader names for the panel's own controls. `aria-label` above already
    *  covers the trigger; these three were hardcoded English inside the popover,
    *  which a translating host had no way to reach. */
@@ -229,13 +226,11 @@ export function CalculatorButton({
   value,
   onChange,
   className,
-  "aria-label": ariaLabelAttr,
-  ariaLabel: ariaLabelProp,
+  "aria-label": ariaLabel,
   labels: labelsProp,
 }: CalculatorButtonProps) {
   // prop > provider > English, with the name prop folded in as the `open` key it has
-  // always been. The DOM spelling wins over the deprecated `ariaLabel`.
-  const ariaLabel = ariaLabelAttr ?? ariaLabelProp;
+  // always been.
   const fromProps = useMemo(
     () => (ariaLabel === undefined ? labelsProp : { ...labelsProp, open: ariaLabel }),
     [ariaLabel, labelsProp],

package/src/components/chart-zoom.tsx

@@ -3,12 +3,10 @@
 // axes). `SeriesChart` is how an app zooms; `SharedXZoom` gives a column of charts one x
 // window.
 //
-// 0.34 (refactor audit 2026-10, API-6b = MOD-10): the arithmetic and the HOC leave the
-// public surface in 0.35. They were exported because lenkbank's, later Kurvenschmiede's,
-// own tests used them; no file in any of the three apps names one today. The kit's own
-// modules import them from the core, so their removal is the block below.
-import * as core from "./chart-zoom-core";
-
+// Those two and the zoom's types are all that is public. The arithmetic and the HOC were
+// too until 0.35 (refactor audit 2026-10, API-6b = MOD-10; deprecated in 0.34): exported
+// because lenkbank's, later Kurvenschmiede's, own tests used them, and named by no file in
+// any of the three apps since. The kit's own modules import them from the core.
 export { SharedXZoom } from "./chart-zoom-core";
 export type {
   ZoomAxes,
@@ -22,44 +20,3 @@ export type {
   ZoomState,
   ZoomTarget,
 } from "./chart-zoom-core";
-
-/* ── Deprecated 0.34, removed in 0.35 ─────────────────────────────────────
- * Each is the core's own value under its old public name: SeriesChart draws the zoom
- * these compute, and a chart's `zoomAxes` prop is what an app sets. */
-
-/** @deprecated 0.34 — a series without `axis` is on the chart's single y axis, `"y"`;
- *  removed in 0.35 (API-6b). */
-export const DEFAULT_Y_AXIS = core.DEFAULT_Y_AXIS;
-/** @deprecated 0.34 — SeriesChart's zoom, which reads it; removed in 0.35 (API-6b). */
-export const ZOOM_SQUARE_ENOUGH = core.ZOOM_SQUARE_ENOUGH;
-/** @deprecated 0.34 — SeriesChart's zoom, which reads it; removed in 0.35 (API-6b). */
-export const ZOOM_MIN_DRAG = core.ZOOM_MIN_DRAG;
-/** @deprecated 0.34 — SeriesChart's zoom, which reads a drag this way; removed in 0.35
- *  (API-6b). */
-export const zoomAxesFor = core.zoomAxesFor;
-/** @deprecated 0.34 — SeriesChart's zoom, which reads a drag this way; removed in 0.35
- *  (API-6b). */
-export const selectionFromDrag = core.selectionFromDrag;
-/** @deprecated 0.34 — SeriesChart fits its axes with it; removed in 0.35 (API-6b). */
-export const axisExtent = core.axisExtent;
-/** @deprecated 0.34 — SeriesChart's zoom, which refits the axes a drag did not name;
- *  removed in 0.35 (API-6b). */
-export const fitYToX = core.fitYToX;
-/** @deprecated 0.34 — SeriesChart's zoom, which refits the axes a drag did not name;
- *  removed in 0.35 (API-6b). */
-export const fitXToY = core.fitXToY;
-/** @deprecated 0.34 — SeriesChart's zoom, which keeps its own state; removed in 0.35
- *  (API-6b). */
-export const NO_ZOOM = core.NO_ZOOM;
-/** @deprecated 0.34 — SeriesChart's zoom, which keeps its own state; removed in 0.35
- *  (API-6b). */
-export const zoomAfter = core.zoomAfter;
-/** @deprecated 0.34 — SeriesChart's zoom, which keeps its own state; removed in 0.35
- *  (API-6b). */
-export const zoomDomains = core.zoomDomains;
-/** @deprecated 0.34 — SeriesChart's `zoomAxes` prop, which says what its default is;
- *  removed in 0.35 (API-6b). */
-export const defaultZoomAxes = core.defaultZoomAxes;
-/** @deprecated 0.34 — SeriesChart, which is a chart wrapped in it, and SharedXZoom;
- *  removed in 0.35 (API-6b). */
-export const withChartZoom = core.withChartZoom;

package/src/components/checkbox-group.tsx

@@ -4,7 +4,14 @@ import { cn } from "../lib/cn";
 import { Checkbox } from "./checkbox";
 import { hasContent } from "../lib/presence";
 import { useCommitReason, type CommitScope } from "./write-lock";
-import { FIELD_ERROR_CLASS, mergeDescribedBy, RequiredStarOnLegend, useInlineHint } from "./field-parts";
+import {
+  FIELD_ERROR_CLASS,
+  fieldHelpMark,
+  mergeDescribedBy,
+  RequiredStarOnLegend,
+  useInlineHint,
+  type FieldHelpProps,
+} from "./field-parts";
 
 /** One box of a {@link CheckboxGroup}. */
 export interface CheckboxGroupOption<T extends string = string> {
@@ -22,7 +29,7 @@ export interface CheckboxGroupOption<T extends string = string> {
  *  reader where the dialog's title already says it to the eye. */
 export type CheckboxGroupLegendVisibility = "visible" | "sr-only";
 
-export interface CheckboxGroupProps<T extends string = string> {
+export interface CheckboxGroupProps<T extends string = string> extends FieldHelpProps {
   /** The question the boxes answer — the fieldset's `<legend>`, which names the group.
    *  Without one, pass `aria-label`. */
   legend?: ReactNode;
@@ -64,6 +71,8 @@ export interface CheckboxGroupProps<T extends string = string> {
   /**
    * Standing advice for the group, under the boxes, attached to the fieldset with
    * `aria-describedby` before the error — the field anatomy every kit field keeps.
+   * A `help` beside it (0.36) is a "?" after the legend — with a visible legend only —
+   * and names nothing: the fieldset is then named by the legend's words alone.
    */
   hint?: ReactNode;
   /** What is wrong with the set, in the caller's words. Under the boxes, on the
@@ -128,6 +137,7 @@ export function CheckboxGroup<T extends string = string>({
   disabled,
   required,
   hint,
+  help,
   error,
   invalid,
   commit,
@@ -142,7 +152,11 @@ export function CheckboxGroup<T extends string = string>({
   const errorId = `${generated}-error`;
   // §4: a FieldHint under the group is its words at Large and on a touch screen, not a
   // lone "?" (DUP-2, refactor audit 2026-10). A HelpPopover stays a "?".
-  const shownHint = useInlineHint(hint);
+  // A `help` "?" after a VISIBLE legend (0.36): the label line a group has. Its FieldHint
+  // hint is then its words at every size, as everywhere a help stands beside one.
+  const helpMark = fieldHelpMark(legend !== undefined && legendVisibility === "visible" ? help : undefined, legend);
+  const legendTextId = `${generated}-legend`;
+  const shownHint = useInlineHint(hint, helpMark !== undefined);
   const showHint = hasContent(shownHint);
   const showError = hasContent(error);
   const isInvalid = Boolean(invalid) || showError;
@@ -169,6 +183,9 @@ export function CheckboxGroup<T extends string = string>({
     <fieldset
       id={id}
       aria-label={ariaLabel}
+      // With a help "?" inside the legend, the legend's WORDS name the group: a legend
+      // names its fieldset by its whole content, the "?"'s "About …" included.
+      aria-labelledby={helpMark !== undefined && ariaLabel === undefined ? legendTextId : undefined}
       aria-describedby={mergeDescribedBy(ariaDescribedBy, showHint && hintId, showError && errorId)}
       disabled={disabled && !locked}
       // `relative` holds an `sr-only` legend (sr-only-containment.test); `min-w-0`
@@ -184,12 +201,13 @@ export function CheckboxGroup<T extends string = string>({
               : cn("mb-2 p-0 text-sm font-medium text-primary", (disabled || locked) && "opacity-60")
           }
         >
-          {legend}
+          {helpMark === undefined ? legend : <span id={legendTextId}>{legend}</span>}
           {required && (
             <span aria-hidden className="ms-0.5 text-danger">
               *
             </span>
           )}
+          {helpMark !== undefined && <span className="ms-1 inline-flex align-middle font-normal">{helpMark}</span>}
         </legend>
       )}
       <RequiredStarOnLegend.Provider value={true}>

package/src/components/chip-input.tsx

@@ -32,13 +32,6 @@ export interface ChipInputLabels {
 // Defined in ./chip-labels, which holds no component code (0.34, KS U8).
 export { DEFAULT_CHIP_INPUT_LABELS };
 
-/** @deprecated 0.34 — `useKitLabels("chipInput", DEFAULT_CHIP_INPUT_LABELS, labels)`, which
- *  the provider reaches too, or ChipInput's own `labels`; removed in 0.35 (refactor audit
- *  2026-10, API-6a). A merge from before the provider, which no kit component calls. */
-export function resolveChipInputLabels(labels?: Partial<ChipInputLabels>): ChipInputLabels {
-  return labels ? { ...DEFAULT_CHIP_INPUT_LABELS, ...labels } : DEFAULT_CHIP_INPUT_LABELS;
-}
-
 /**
  * `onChange` is the field's own — the whole LIST, not a DOM event — so the wrapper
  * div's `onChange` is omitted rather than shadowed. `placeholder` is likewise this

package/src/components/column-mapper.tsx

@@ -31,6 +31,7 @@ import {
   TableHeaderCell,
   TableRow,
 } from "./table";
+import type { FieldHelpProps } from "./field-parts";
 import { Select } from "./select";
 import { Textarea } from "./textarea";
 import { DEFAULT_COLUMN_MAPPER_LABELS, markedShort } from "./column-mapper-labels";
@@ -425,7 +426,7 @@ export function ColumnRoleTable<
 
 // ── ColumnMapper ──────────────────────────────────────────────────────────────
 
-export interface ColumnMapperProps<R extends string> {
+export interface ColumnMapperProps<R extends string> extends FieldHelpProps {
   /** The parts the columns play — translated labels, which are required, which must
    *  be numbers. See {@link ColumnRole}. */
   roles: readonly ColumnRole<R>[];
@@ -440,7 +441,8 @@ export interface ColumnMapperProps<R extends string> {
   onChange: (result: ColumnMapperResult<R> | null) => void;
   /** The paste box's label. Default: `labels.paste`. */
   label?: ReactNode;
-  /** The caption under the paste box. Default: `labels.pasteHint`. */
+  /** The caption under the paste box. Default: `labels.pasteHint`. The paste box's
+   *  `help` (0.36) is `help`. */
   hint?: ReactNode;
   /** What the file dialog offers, and what a drop is checked against. Default:
    *  `.csv,.tsv,.txt,.dat,.asc`. */
@@ -503,6 +505,7 @@ export function ColumnMapper<R extends string>({
   onChange,
   label,
   hint,
+  help,
   accept = DEFAULT_ACCEPT,
   maxSize,
   defaultText = "",
@@ -605,6 +608,7 @@ export function ColumnMapper<R extends string>({
       <Textarea
         label={label ?? labels.paste}
         hint={hint ?? labels.pasteHint}
+        help={help}
         rows={5}
         wrap="off"
         spellCheck={false}

package/src/components/combobox.tsx

@@ -22,6 +22,7 @@ import {
   useFieldHint,
   useLockReason,
   type DisabledReasonDisplay,
+  type FieldHelpProps,
 } from "./field-parts";
 import type { CommitScope } from "./write-lock";
 import { lockedKeyDown, rowClass, SuggestionList, usePrimaryPressOnly } from "./combobox-suggestions";
@@ -38,7 +39,8 @@ export type { InlineEntityComboboxProps } from "./inline-entity-combobox";
  * the DOM events of the wrapper. Everything else a wrapper needs reaches the root.
  */
 export interface ComboboxProps
-  extends Omit<ComponentPropsWithoutRef<"div">, "id" | "onChange" | "onBlur" | "onSubmit"> {
+  extends Omit<ComponentPropsWithoutRef<"div">, "id" | "onChange" | "onBlur" | "onSubmit">,
+    FieldHelpProps {
   value: string;
   onChange: (v: string) => void;
   /** Suggestion pool (e.g. existing payee names). */
@@ -125,7 +127,7 @@ export interface ComboboxProps
   closeLabel?: string;
   /**
    * The phone sheet's heading — and, as a string, the dialog's accessible name — for a
-   * field whose label is drawn by someone else: a form's `FormLabel` above it,
+   * field whose label is drawn by someone else: a bound field's label above it,
    * which `RhfTextCombobox` hands over here (0.24). Default: `label`. Without either, the
    * full-screen sheet opened untitled and unnamed, the one screen on a phone that has to
    * say what it is asking for (live #200).
@@ -186,6 +188,7 @@ export function Combobox(props: ComboboxProps) {
     invalid,
     error,
     hint,
+    help,
     disabled,
     disabledReason,
     disabledReasonDisplay,
@@ -204,7 +207,7 @@ export function Combobox(props: ComboboxProps) {
     "aria-required": ariaRequired,
     ...rest
   } = props;
-  const hintParts = useFieldHint(hint, ariaDescribedBy);
+  const hintParts = useFieldHint(hint, ariaDescribedBy, { help, name: label ?? ariaLabel });
   const field = useFieldError(error, invalid, hintParts.describedBy, ariaInvalid);
   const generated = useId();
   const fieldId = id ?? generated;

package/src/components/copy-button.tsx

@@ -1,4 +1,4 @@
-import type { ButtonHTMLAttributes } from "react";
+import type { ButtonHTMLAttributes, Ref } from "react";
 import { Check, Copy, X } from "lucide-react";
 import { cn } from "../lib/cn";
 import { useKitLabels, type LabelOverride } from "../i18n/kit-labels";
@@ -62,6 +62,10 @@ export interface CopyButtonProps
   /** Called with the real outcome once the copy settles. */
   onCopied?: (ok: boolean) => void;
   labels?: LabelOverride<CopyButtonLabels>;
+  /** The `<button>` in either variant — the {@link IconButton}'s or the {@link Button}'s,
+   *  never the tooltip's wrapper round it (0.35, round 0.35 R4, the follow-up to API-2).
+   *  It rides the rest of the props on to that kit button, whose own ref it is. */
+  ref?: Ref<HTMLButtonElement>;
 }
 
 const ICONS: Record<CopyState, typeof Copy> = { idle: Copy, copied: Check, failed: X };

package/src/components/country-select.tsx

@@ -19,6 +19,7 @@ import {
   useFieldMessages,
   useLockReason,
   type DisabledReasonDisplay,
+  type FieldHelpProps,
 } from "./field-parts";
 import { CurrencyFlag } from "./currency-select";
 import { ComboboxPanel, useComboboxCore, type ComboOption } from "./combobox-core";
@@ -66,7 +67,8 @@ export { DEFAULT_COUNTRY_SELECT_LABELS };
  * `null` of a clear cannot reach a handler that was never told about it.
  */
 export interface CountrySelectProps<Clearable extends boolean = false>
-  extends Omit<ComponentPropsWithoutRef<"div">, "onChange" | "defaultValue"> {
+  extends Omit<ComponentPropsWithoutRef<"div">, "onChange" | "defaultValue">,
+    FieldHelpProps {
   /** The chosen country as an ISO 3166-1 alpha-2 code ("CH"), in either case;
    *  `null`, `undefined` or `""` when none is. A code outside the list still shows
    *  its name — the list restricts what can be PICKED, not what can be shown. */
@@ -249,6 +251,7 @@ export function CountrySelect<Clearable extends boolean = false>({
   flags = false,
   label,
   hint,
+  help,
   error,
   invalid,
   placeholder,
@@ -359,6 +362,8 @@ export function CountrySelect<Clearable extends boolean = false>({
   // the error — Select's order. Through useFieldMessages since 0.34 (DUP-2, DUP-8).
   const field = useFieldMessages({
     hint,
+    help,
+    name: label ?? ariaLabel,
     error,
     invalid,
     describedBy: ariaDescribedBy,

package/src/components/currency-option-list.tsx

@@ -3,49 +3,15 @@ import type { ComponentPropsWithRef, ReactNode } from "react";
 import { cn } from "../lib/cn";
 import { foldForSearch } from "../lib/text-match";
 import { ComboboxPanel, type ComboboxCore, type ComboOption } from "./combobox-core";
+import { CURRENCIES, type CurrencyOption } from "../currencies";
 
-// The currency data and the one list both currency pickers render (round 0.34 Wave 2,
-// DUP-4). CurrencySelect re-exports the data under its own name, as it always has; the
-// list is package-private. Its own module, so AmountInput can render the list without a
-// cycle through currency-select.
-
-export interface CurrencyOption {
-  code: string;
-  name: string;
-  symbol: string;
-  /** ISO 3166-1 alpha-2 country code (lowercase) used by flag-icons. */
-  country: string;
-}
-
-export const CURRENCIES: CurrencyOption[] = [
-  { code: "EUR", name: "Euro", symbol: "€", country: "eu" },
-  { code: "USD", name: "US Dollar", symbol: "$", country: "us" },
-  { code: "GBP", name: "British Pound", symbol: "£", country: "gb" },
-  { code: "CHF", name: "Swiss Franc", symbol: "CHF", country: "ch" },
-  { code: "JPY", name: "Japanese Yen", symbol: "¥", country: "jp" },
-  { code: "CAD", name: "Canadian Dollar", symbol: "CA$", country: "ca" },
-  { code: "AUD", name: "Australian Dollar", symbol: "A$", country: "au" },
-  { code: "NZD", name: "New Zealand Dollar", symbol: "NZ$", country: "nz" },
-  { code: "SEK", name: "Swedish Krona", symbol: "kr", country: "se" },
-  { code: "NOK", name: "Norwegian Krone", symbol: "kr", country: "no" },
-  { code: "DKK", name: "Danish Krone", symbol: "kr", country: "dk" },
-  { code: "PLN", name: "Polish Zloty", symbol: "zł", country: "pl" },
-  { code: "CZK", name: "Czech Koruna", symbol: "Kč", country: "cz" },
-  { code: "HUF", name: "Hungarian Forint", symbol: "Ft", country: "hu" },
-  { code: "RON", name: "Romanian Leu", symbol: "lei", country: "ro" },
-  { code: "BGN", name: "Bulgarian Lev", symbol: "лв", country: "bg" },
-  { code: "TRY", name: "Turkish Lira", symbol: "₺", country: "tr" },
-  { code: "RUB", name: "Russian Ruble", symbol: "₽", country: "ru" },
-  { code: "CNY", name: "Chinese Yuan", symbol: "¥", country: "cn" },
-  { code: "HKD", name: "Hong Kong Dollar", symbol: "HK$", country: "hk" },
-  { code: "SGD", name: "Singapore Dollar", symbol: "S$", country: "sg" },
-  { code: "INR", name: "Indian Rupee", symbol: "₹", country: "in" },
-  { code: "BRL", name: "Brazilian Real", symbol: "R$", country: "br" },
-  { code: "MXN", name: "Mexican Peso", symbol: "MX$", country: "mx" },
-  { code: "ZAR", name: "South African Rand", symbol: "R", country: "za" },
-  { code: "ILS", name: "Israeli Shekel", symbol: "₪", country: "il" },
-  { code: "AED", name: "UAE Dirham", symbol: "د.إ", country: "ae" },
-];
+// The one list both currency pickers render (round 0.34 Wave 2, DUP-4). CurrencySelect
+// re-exports the data under its own name, as it always has; the list is package-private.
+// Its own module, so AmountInput can render the list without a cycle through
+// currency-select. The data itself is ../currencies since 0.35: an entry of its own that
+// imports nothing, which an app's build can read in Node (keksdose's flag subset).
+export { CURRENCIES };
+export type { CurrencyOption };
 
 export interface CurrencyFlagProps extends ComponentPropsWithRef<"span"> {
   /** ISO 3166-1 alpha-2, lowercase — the class flag-icons keys its sprite by. */

package/src/components/currency-select.tsx

@@ -2,7 +2,7 @@ import { useCallback, useId } from "react";
 import type { ComponentPropsWithoutRef, ReactNode, Ref } from "react";
 import { FieldChevron, FIELD_TRIGGER, FIELD_INVALID, FIELD_FLOATING_PAD } from "./field-base";
 import { FieldLabel } from "./field-parts";
-import { assignRef, EndHintRow, useFieldMessages } from "./field-parts";
+import { assignRef, EndHintRow, useFieldMessages, type FieldHelpProps } from "./field-parts";
 import { cn } from "../lib/cn";
 import { useComboboxCore } from "./combobox-core";
 import {
@@ -29,7 +29,7 @@ export type { CurrencyFlagProps, CurrencyOption };
 
 /** `onChange` is the kit's — "a currency was picked", carrying the code — rather
  *  than the div's form event. */
-export interface CurrencySelectProps extends Omit<ComponentPropsWithoutRef<"div">, "onChange"> {
+export interface CurrencySelectProps extends Omit<ComponentPropsWithoutRef<"div">, "onChange">, FieldHelpProps {
   value: string;
   onChange: (code: string) => void;
   placeholder?: string;
@@ -106,6 +106,7 @@ export function CurrencySelect({
   invalid,
   error,
   hint,
+  help,
   labels,
   currencyNames,
   "aria-label": ariaLabel,
@@ -143,7 +144,15 @@ export function CurrencySelect({
   // on the wrapper `<div>` through the spread, where nothing reads it. The caller's ids
   // first, then the caption, then the error — Select's order, through useFieldMessages
   // since 0.34 (DUP-2, DUP-8).
-  const field = useFieldMessages({ hint, error, invalid, describedBy: ariaDescribedBy, ariaInvalid });
+  const field = useFieldMessages({
+    hint,
+    help,
+    name: label ?? ariaLabel,
+    error,
+    invalid,
+    describedBy: ariaDescribedBy,
+    ariaInvalid,
+  });
   const { labelHint, describedBy, isInvalid } = field;
 
   // The trigger's NAME. A combobox does not take its name from its content, and the

package/src/components/danger-confirm.tsx

@@ -92,7 +92,7 @@ export interface CurrentPasswordInputProps extends Omit<InputProps, "type" | "au
    * is named another way (`aria-label` / `aria-labelledby`), which then stays the only
    * name. Pass the app's own word on a sign-in form ("Password", "Your password"), or
    * `null` for a field whose `<label htmlFor>` is drawn elsewhere (a form library's
-   * `FormLabel`), which would otherwise be labelled twice.
+   * label), which would otherwise be labelled twice.
    */
   label?: ReactNode;
   /** The value as a string — the `(next) => …` shape, so a caller holding it in
@@ -125,8 +125,8 @@ export interface CurrentPasswordInputProps extends Omit<InputProps, "type" | "au
  *
  * Everything else is {@link Input}: the reveal toggle, `error` (under the field,
  * `aria-describedby`, `aria-invalid`), `invalid`, `name`, `id`, `autoFocus`, `required`.
- * The ref is the `<input>`, so it works with `@eifi1/ui-kit/rhf`'s `FormControl` /
- * a `register()` spread, and controlled or uncontrolled.
+ * The ref is the `<input>`, so it works with `@eifi1/ui-kit/rhf`'s `RhfField` / a
+ * `register()` spread, and controlled or uncontrolled.
  *
  * ```tsx
  * <CurrentPasswordInput name="password" label={t("password")} error={errors.password?.message}

package/src/components/data-table-filter-popover.tsx

@@ -9,7 +9,8 @@ import { dateRangePresets } from "../lib/dates";
 import { resolveFilter } from "./data-table-filters";
 import type { FilterValue } from "./data-table-filters";
 import type { DataTableColumn } from "./data-table";
-import { resolveDataTableLabels, type DataTableLabels } from "./data-table-labels";
+import type { DataTableLabels } from "./data-table-labels";
+import { resolveDataTableLabels } from "./data-table-shared";
 import { useKitLabelOverrides, useKitLocale } from "../i18n/kit-labels";
 
 interface FilterPopoverProps<T> {