@eifi1/ui-kit 0.21.0 → 0.23.0

package/dist/components/month-picker.js

@@ -5,10 +5,11 @@ import { Calendar, ChevronDown, ChevronLeft, ChevronRight } from "lucide-react";
 import { cn } from "../lib/cn.js";
 import { dirOf, horizontalStep } from "../lib/direction.js";
 import { monthKey, pad } from "../lib/dates.js";
-import { Button, FieldLabel, FIELD_FLOATING_PAD, FIELD_INVALID, FIELD_TRIGGER, IconButton } from "./ui.js";
+import { Button, FIELD_FLOATING_PAD, FIELD_INVALID, FIELD_TRIGGER, IconButton } from "./ui.js";
 import { Popover } from "./popover.js";
 import { splitTriggerAria } from "./trigger-aria.js";
-import { useKitLabels, useKitLocale } from "../i18n/kit-labels.js";
+import { useKitDateFormatter, useKitLabels, useKitLocale } from "../i18n/kit-labels.js";
+import { FieldBox, FieldLabelLine, hasContent, useFieldMessages } from "./field-parts.js";
 const DEFAULT_MONTH_PICKER_LABELS = {
   previousYear: "Previous year",
   nextYear: "Next year",
@@ -16,7 +17,11 @@ const DEFAULT_MONTH_PICKER_LABELS = {
   month: (monthYear) => monthYear,
   previousMonth: "Previous month",
   nextMonth: "Next month",
-  today: "Today"
+  today: "Today",
+  yearPanel: "Choose a year",
+  earlierYears: "Earlier years",
+  laterYears: "Later years",
+  thisYear: "This year"
 };
 function useMonthPickerLabels(partial) {
   return useKitLabels("monthPicker", DEFAULT_MONTH_PICKER_LABELS, partial);
@@ -44,6 +49,12 @@ function firstOf({ year, month }) {
 }
 const DEFAULT_TRIGGER_FORMAT = { month: "long", year: "numeric" };
 const MONTH_NAME_FORMAT = { month: "long", year: "numeric" };
+const YEAR_FORMAT = { year: "numeric" };
+const YEAR = /^(\d{4})/;
+function parseYear(key) {
+  const m = key ? YEAR.exec(key) : null;
+  return m ? Number(m[1]) : null;
+}
 function useFocusBackOnClose(open, triggerRef) {
   const wasOpen = useRef(false);
   useEffect(() => {
@@ -100,6 +111,7 @@ function MonthFieldTrigger({
   valueId,
   panelId,
   padded,
+  small,
   disabled,
   invalid,
   className,
@@ -119,6 +131,7 @@ function MonthFieldTrigger({
       "aria-expanded": open,
       id: aria.id,
       "aria-invalid": invalid || aria["aria-invalid"] === true || aria["aria-invalid"] === "true" || void 0,
+      "aria-required": aria["aria-required"],
       "aria-labelledby": aria["aria-label"] && !aria["aria-labelledby"] ? void 0 : labelledBy,
       "aria-label": aria["aria-label"],
       "aria-describedby": aria["aria-describedby"],
@@ -126,6 +139,10 @@ function MonthFieldTrigger({
         FIELD_TRIGGER,
         "pe-9",
         padded && FIELD_FLOATING_PAD,
+        // keksdose K13 (live #260): an IconButton's 36px, and only as wide as the
+        // month — `py-0` with a fixed height so the box is 36px whatever the type's
+        // line height. `pe-9` stays: the calendar glyph still sits at the end.
+        small && "h-9 w-auto py-0",
         disabled && "cursor-not-allowed opacity-50",
         invalid && FIELD_INVALID,
         className
@@ -291,50 +308,212 @@ function MonthGrid({
     }) }, row)) })
   ] });
 }
+const YEAR_PAGE = 12;
+function YearGrid({
+  value,
+  onPick,
+  locale,
+  minYear,
+  maxYear,
+  currentYear,
+  labels
+}) {
+  const clamp = (y) => Math.min(maxYear ?? y, Math.max(minYear ?? y, y));
+  const whole = minYear !== null && maxYear !== null && maxYear >= minYear && maxYear - minYear < YEAR_PAGE ? { first: minYear, count: maxYear - minYear + 1 } : null;
+  const [active, setActive] = useState(() => clamp(value ?? currentYear));
+  const anchor = minYear ?? (maxYear !== null ? maxYear - (YEAR_PAGE - 1) : 0);
+  const first = whole ? whole.first : anchor + Math.floor((active - anchor) / YEAR_PAGE) * YEAR_PAGE;
+  const count = whole ? whole.count : YEAR_PAGE;
+  const years = Array.from({ length: count }, (_, i) => first + i);
+  const outOfBounds = (y) => minYear !== null && y < minYear || maxYear !== null && y > maxYear;
+  const gridRef = useRef(null);
+  const captionId = `${useId()}-years`;
+  const yearFormat = useMemo(() => new Intl.DateTimeFormat(locale, YEAR_FORMAT), [locale]);
+  const caption = yearFormat.formatRange(new Date(first, 0, 1), new Date(first + count - 1, 0, 1));
+  const pendingFocus = useRef(null);
+  useEffect(() => {
+    const year = pendingFocus.current;
+    if (year === null) return;
+    pendingFocus.current = null;
+    gridRef.current?.querySelector(`[data-year="${year}"]`)?.focus();
+  });
+  useEffect(() => {
+    gridRef.current?.querySelector('[tabindex="0"]')?.focus();
+  }, []);
+  const moveTo = (next, focus) => {
+    const year = clamp(next);
+    if (focus) pendingFocus.current = year;
+    setActive(year);
+  };
+  const onCellKeyDown = (e) => {
+    const step = horizontalStep(e.key, e.currentTarget);
+    const col = (active - first) % COLUMNS;
+    let delta;
+    switch (step ? "horizontal" : e.key) {
+      case "horizontal":
+        delta = step;
+        break;
+      case "ArrowUp":
+        delta = -COLUMNS;
+        break;
+      case "ArrowDown":
+        delta = COLUMNS;
+        break;
+      case "Home":
+        delta = -col;
+        break;
+      case "End":
+        delta = Math.min(COLUMNS - 1 - col, first + count - 1 - active);
+        break;
+      case "PageUp":
+        delta = -YEAR_PAGE;
+        break;
+      case "PageDown":
+        delta = YEAR_PAGE;
+        break;
+      default:
+        return;
+    }
+    e.preventDefault();
+    if (delta !== 0) moveTo(active + delta, true);
+  };
+  const prevBlocked = minYear !== null && first - 1 < minYear;
+  const nextBlocked = maxYear !== null && first + count > maxYear;
+  const arrow = "flex size-7 items-center justify-center rounded text-[var(--text-muted)] hover:bg-[var(--bg-hover)] disabled:cursor-not-allowed disabled:opacity-30 disabled:hover:bg-transparent";
+  return /* @__PURE__ */ jsxs("div", { className: "select-none", children: [
+    /* @__PURE__ */ jsxs("div", { className: cn("mb-1 flex items-center", whole ? "h-7 justify-center" : "justify-between"), children: [
+      !whole && /* @__PURE__ */ jsx(
+        "button",
+        {
+          type: "button",
+          "aria-label": labels.earlierYears,
+          disabled: prevBlocked,
+          onClick: () => moveTo(active - YEAR_PAGE, false),
+          className: arrow,
+          children: /* @__PURE__ */ jsx(ChevronLeft, { className: "size-4 rtl:-scale-x-100" })
+        }
+      ),
+      /* @__PURE__ */ jsx("div", { id: captionId, "aria-live": "polite", className: "text-sm font-semibold tabular-nums text-[var(--text-primary)]", children: caption }),
+      !whole && /* @__PURE__ */ jsx(
+        "button",
+        {
+          type: "button",
+          "aria-label": labels.laterYears,
+          disabled: nextBlocked,
+          onClick: () => moveTo(active + YEAR_PAGE, false),
+          className: arrow,
+          children: /* @__PURE__ */ jsx(ChevronRight, { className: "size-4 rtl:-scale-x-100" })
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx("div", { ref: gridRef, role: "grid", "aria-labelledby": captionId, className: "grid gap-1", children: Array.from({ length: Math.ceil(count / COLUMNS) }, (_, row) => /* @__PURE__ */ jsx("div", { role: "row", className: "grid grid-cols-3 gap-1", children: years.slice(row * COLUMNS, row * COLUMNS + COLUMNS).map((year) => {
+      const disabled = outOfBounds(year);
+      const selected = year === value;
+      const current = year === currentYear;
+      return /* @__PURE__ */ jsx(
+        "button",
+        {
+          type: "button",
+          role: "gridcell",
+          "data-year": year,
+          tabIndex: year === active ? 0 : -1,
+          "aria-selected": selected,
+          "aria-disabled": disabled || void 0,
+          "aria-current": current ? "date" : void 0,
+          onClick: () => {
+            if (disabled) return;
+            setActive(year);
+            onPick(String(year));
+          },
+          onKeyDown: onCellKeyDown,
+          className: cn(
+            "rounded px-2 py-1.5 text-sm tabular-nums transition-colors",
+            "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset",
+            selected && !disabled ? "focus-visible:ring-[var(--brand-contrast)]" : "focus-visible:ring-[var(--brand)]",
+            disabled ? "cursor-not-allowed text-[var(--text-placeholder)]" : selected ? "bg-[var(--brand)] text-[var(--brand-contrast)] hover:bg-[var(--brand-hover)]" : "text-[var(--text-primary)] hover:bg-[var(--bg-hover)]",
+            current && !selected && !disabled && "ring-1 ring-inset ring-[var(--border-strong)]"
+          ),
+          children: yearFormat.format(new Date(year, 0, 1))
+        },
+        year
+      );
+    }) }, row)) })
+  ] });
+}
 function upperFirst(text, locale) {
   return text.charAt(0).toLocaleUpperCase(locale) + text.slice(1);
 }
-function MonthPicker({
-  value,
-  onChange,
-  locale: localeProp,
-  min,
-  max,
-  label,
-  placeholder,
-  disabled,
-  invalid,
-  formatOptions,
-  currentMonth,
-  labels: labelsProp,
-  className,
-  triggerClassName,
-  variant = "field",
-  headingLevel = 2,
-  showToday = true,
-  ...rest
-}) {
+function MonthPicker(props) {
+  const {
+    value,
+    onChange,
+    locale: localeProp,
+    min,
+    max,
+    label,
+    placeholder,
+    disabled,
+    invalid,
+    error,
+    hint,
+    size = "md",
+    mode = "month",
+    formatOptions,
+    currentMonth,
+    labels: labelsProp,
+    className,
+    triggerClassName,
+    variant = "field",
+    headingLevel = 2,
+    showToday = true,
+    ...rest
+  } = props;
   const labels = useMonthPickerLabels(labelsProp);
   const locale = useKitLocale(localeProp);
-  const selected = parseMonth(value);
+  const fromProvider = useKitDateFormatter();
+  const years = mode === "year";
+  const selected = years ? null : parseMonth(value);
+  const selectedYear = years ? parseYear(value) : null;
   const minKey = boundKey(min);
   const maxKey = boundKey(max);
+  const minYear = parseYear(min);
+  const maxYear = parseYear(max);
   const currentKey = boundKey(currentMonth) ?? monthKey(/* @__PURE__ */ new Date());
-  const triggerText = selected ? upperFirst(
-    new Intl.DateTimeFormat(locale, formatOptions ?? DEFAULT_TRIGGER_FORMAT).format(
-      firstOf(selected)
+  const currentYear = parseYear(currentKey);
+  const shownKey = years ? selectedYear !== null ? String(selectedYear) : null : selected ? toKey(selected) : null;
+  const triggerText = shownKey ? formatOptions === void 0 && fromProvider?.(shownKey, { unit: years ? "year" : "month", source: "monthPicker", locale, weekday: false }) || upperFirst(
+    new Intl.DateTimeFormat(locale, formatOptions ?? (years ? YEAR_FORMAT : DEFAULT_TRIGGER_FORMAT)).format(
+      years ? new Date(selectedYear, 0, 1) : firstOf(selected)
     ),
     locale
   ) : placeholder ?? "";
   const id = useId();
-  const [aria, wrapperRest] = splitTriggerAria(rest);
+  const messages = useFieldMessages({ hint, error, describedBy: rest["aria-describedby"] });
+  const [ownAria, wrapperRest] = splitTriggerAria(rest);
+  const aria = { ...ownAria, "aria-describedby": messages.describedBy };
   const labelId = `${id}-label`;
   const valueId = `${id}-value`;
   const panelId = `${id}-panel`;
   const named = typeof label === "string";
+  const small = size === "sm" && label === void 0;
   const rootRef = useRef(null);
   const [dir, setDir] = useState("ltr");
-  const grid = (close) => /* @__PURE__ */ jsx(
+  const panelLabel = years ? labels.yearPanel : labels.panel;
+  const grid = (close) => years ? /* @__PURE__ */ jsx(
+    YearGrid,
+    {
+      value: selectedYear,
+      locale,
+      minYear,
+      maxYear,
+      currentYear,
+      labels,
+      onPick: (key) => {
+        onChange(key);
+        close();
+      }
+    }
+  ) : /* @__PURE__ */ jsx(
     MonthGrid,
     {
       value: selected,
@@ -350,17 +529,33 @@ function MonthPicker({
     }
   );
   if (variant === "stepper") {
-    const base = selected ?? parseMonth(currentKey);
-    const prevKey = toKey(shiftMonth(base, -1));
-    const nextKey = toKey(shiftMonth(base, 1));
-    const outside = (key) => Boolean(minKey && key < minKey || maxKey && key > maxKey);
+    let prevKey;
+    let nextKey;
+    let nowKey;
+    let outside;
+    if (years) {
+      const base = selectedYear ?? currentYear;
+      prevKey = String(base - 1);
+      nextKey = String(base + 1);
+      nowKey = String(currentYear);
+      outside = (key) => {
+        const y = Number(key);
+        return minYear !== null && y < minYear || maxYear !== null && y > maxYear;
+      };
+    } else {
+      const base = selected ?? parseMonth(currentKey);
+      prevKey = toKey(shiftMonth(base, -1));
+      nextKey = toKey(shiftMonth(base, 1));
+      nowKey = currentKey;
+      outside = (key) => Boolean(minKey && key < minKey || maxKey && key > maxKey);
+    }
     const Heading = headingLevel ? `h${headingLevel}` : null;
     const trigger = /* @__PURE__ */ jsx(
       Popover,
       {
         width: 256,
         panelId,
-        labels: { panel: labels.panel },
+        labels: { panel: panelLabel },
         dir,
         trigger: ({ open, toggle, ref }) => /* @__PURE__ */ jsx(
           MonthHeadingTrigger,
@@ -374,7 +569,7 @@ function MonthPicker({
             text: triggerText,
             panelId,
             disabled,
-            aria
+            aria: ownAria
           }
         ),
         children: grid
@@ -388,17 +583,17 @@ function MonthPicker({
           {
             variant: "secondary",
             size: "sm",
-            disabled: disabled || outside(currentKey),
+            disabled: disabled || outside(nowKey),
             onClick: () => {
-              if (currentKey !== value) onChange(currentKey);
+              if (nowKey !== shownKey) onChange(nowKey);
             },
-            children: labels.today
+            children: years ? labels.thisYear : labels.today
           }
         ),
         /* @__PURE__ */ jsx(
           IconButton,
           {
-            "aria-label": labels.previousMonth,
+            "aria-label": years ? labels.previousYear : labels.previousMonth,
             disabled: disabled || outside(prevKey),
             onClick: () => onChange(prevKey),
             children: /* @__PURE__ */ jsx(ChevronLeft, { className: "rtl:-scale-x-100" })
@@ -407,7 +602,7 @@ function MonthPicker({
         /* @__PURE__ */ jsx(
           IconButton,
           {
-            "aria-label": labels.nextMonth,
+            "aria-label": years ? labels.nextYear : labels.nextMonth,
             disabled: disabled || outside(nextKey),
             onClick: () => onChange(nextKey),
             children: /* @__PURE__ */ jsx(ChevronRight, { className: "rtl:-scale-x-100" })
@@ -416,52 +611,62 @@ function MonthPicker({
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs("div", { ...wrapperRest, ref: rootRef, className: cn("relative", className), children: [
-    label !== void 0 && /* @__PURE__ */ jsx(FieldLabel, { children: label }),
-    named && /* @__PURE__ */ jsx("span", { id: labelId, "aria-hidden": true, className: "sr-only-fixed", children: label }),
-    /* @__PURE__ */ jsx(
-      Popover,
-      {
-        width: 256,
-        panelId,
-        labels: { panel: labels.panel },
-        dir,
-        trigger: ({ open, toggle, ref }) => /* @__PURE__ */ jsx(
-          MonthFieldTrigger,
-          {
-            open,
-            toggle: () => {
-              setDir(dirOf(rootRef.current));
-              toggle();
-            },
-            triggerRef: ref,
-            triggerText,
-            hasValue: selected != null,
-            labelledBy: [
-              aria["aria-labelledby"],
-              named ? labelId : !aria["aria-labelledby"] && aria.id ? aria.id : void 0,
-              valueId
-            ].filter(Boolean).join(" "),
-            aria,
-            valueId,
-            panelId,
-            padded: label !== void 0,
-            disabled,
-            invalid,
-            className: triggerClassName
-          }
-        ),
-        children: grid
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      Calendar,
-      {
-        "aria-hidden": true,
-        className: "pointer-events-none absolute end-2.5 top-1/2 size-4 -translate-y-1/2 text-[var(--text-placeholder)]"
-      }
-    )
-  ] });
+  const field = (
+    // `w-fit` for the toolbar size: the calendar glyph is placed against this box, and a
+    // full-width box would park it at the far end of the row, away from its trigger.
+    /* @__PURE__ */ jsxs("div", { ...wrapperRest, ref: rootRef, className: cn("relative", small && "w-fit max-w-full", className), children: [
+      label !== void 0 && /* @__PURE__ */ jsx(FieldLabelLine, { label, hint: messages.labelHint }),
+      named && /* @__PURE__ */ jsx("span", { id: labelId, "aria-hidden": true, className: "sr-only-fixed", children: label }),
+      /* @__PURE__ */ jsx(
+        Popover,
+        {
+          width: 256,
+          panelId,
+          labels: { panel: panelLabel },
+          dir,
+          trigger: ({ open, toggle, ref }) => /* @__PURE__ */ jsx(
+            MonthFieldTrigger,
+            {
+              open,
+              toggle: () => {
+                setDir(dirOf(rootRef.current));
+                toggle();
+              },
+              triggerRef: ref,
+              triggerText,
+              hasValue: shownKey !== null,
+              labelledBy: [
+                aria["aria-labelledby"],
+                named ? labelId : !aria["aria-labelledby"] && aria.id ? aria.id : void 0,
+                valueId
+              ].filter(Boolean).join(" "),
+              aria,
+              valueId,
+              panelId,
+              padded: label !== void 0,
+              small,
+              disabled,
+              invalid: invalid || hasContent(error),
+              className: triggerClassName
+            }
+          ),
+          children: grid
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        Calendar,
+        {
+          "aria-hidden": true,
+          className: "pointer-events-none absolute end-2.5 top-1/2 size-4 -translate-y-1/2 text-[var(--text-placeholder)]"
+        }
+      )
+    ] })
+  );
+  const endHint = label === void 0 ? messages.labelHint : void 0;
+  return /* @__PURE__ */ jsx(FieldBox, { below: messages.below, reserve: "error" in props || "hint" in props, children: endHint === void 0 ? field : /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-1.5", children: [
+    /* @__PURE__ */ jsx("div", { className: cn("min-w-0", !small && "flex-1"), children: field }),
+    /* @__PURE__ */ jsx("span", { className: "flex shrink-0 items-center", children: endHint })
+  ] }) });
 }
 export {
   DEFAULT_MONTH_PICKER_LABELS,