@godxjp/ui 19.6.0 → 20.1.0

package/dist/components/data-entry/index.d.ts

@@ -42,7 +42,7 @@ export { ColorPicker } from "./color-picker.js";
 export type { ColorPickerProps } from "./color-picker.js";
 export type { SelectProp, SelectProp as SelectProps } from "./select.js";
 export type { SearchSelectOptionProp as SelectOption, SearchSelectLoadParamsProp as SelectLoadParams, SearchSelectLoadResultProp as SelectLoadResult, } from "./search-select.js";
-export { Upload, collectUploadCommitActions, createUploadItem, useUploadDraft } from "./upload.js";
+export { UPLOAD_LIST_IGNORE, Upload, collectUploadCommitActions, createUploadItem, useUploadDraft, } from "./upload.js";
 export type { UploadProps, UploadFileItem, UploadVariant, UploadCommitAction } from "./upload.js";
 export { Cascader } from "./cascader.js";
 export type { CascaderProps, TreeOption, TreeFieldNames } from "./cascader.js";
@@ -54,11 +54,11 @@ export { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, Command
 export { CommandPalette } from "./command-palette.js";
 export type { CommandPaletteGroup, CommandPaletteItem, CommandPaletteLabels, CommandPaletteProps, } from "./command-palette.js";
 export { PasswordInput } from "./password-input.js";
-export type { PasswordInputProps } from "./password-input.js";
+export type { PasswordInputProps, PasswordVisibilityToggleProp } from "./password-input.js";
 export { PasswordStrength, usePasswordStrength } from "./password-strength.js";
 export type { PasswordRule, PasswordStrengthLabels, PasswordStrengthProps, PasswordStrengthReturn, } from "./password-strength.js";
 export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator } from "./input-otp.js";
-export type { InputOTPGroupAppearanceProp, InputOTPGroupProp, InputOTPGroupProps, } from "./input-otp.js";
+export type { InputOTPAlignProp, InputOTPGroupAppearanceProp, InputOTPGroupProp, InputOTPGroupProps, InputOTPMaskProp, InputOTPProp, InputOTPProps, } from "./input-otp.js";
 export { Rating } from "./rating.js";
 export type { RatingProps } from "./rating.js";
 export { TagInput } from "./tag-input.js";
@@ -67,3 +67,7 @@ export { Segmented } from "./segmented.js";
 export type { SegmentedOption, SegmentedProp, SegmentedProps } from "./segmented.js";
 export { BranchScopePicker } from "./branch-scope-picker.js";
 export type { BranchScopeModeProp, BranchScopeOptionProp, BranchScopePickerProp, BranchScopePickerProps, BranchScopeValueProp, } from "./branch-scope-picker.js";
+export { TimeRangePicker } from "./time-range-picker.js";
+export type { TimeRangePickerProps } from "./time-range-picker.js";
+export type { UploadRequestContext, UploadResult, UploadRejection } from "./upload-types.js";
+export type { UploadItemActions } from "./upload-types.js";

package/dist/components/data-entry/index.js

@@ -33,7 +33,13 @@ import { DatePicker } from "./date-picker.js";
 import { DateRangePicker } from "./date-range-picker.js";
 import { TimePicker } from "./time-picker.js";
 import { ColorPicker } from "./color-picker.js";
-import { Upload, collectUploadCommitActions, createUploadItem, useUploadDraft } from "./upload.js";
+import {
+  UPLOAD_LIST_IGNORE,
+  Upload,
+  collectUploadCommitActions,
+  createUploadItem,
+  useUploadDraft
+} from "./upload.js";
 import { Cascader } from "./cascader.js";
 import { TreeSelect, SHOW_CHILD, SHOW_PARENT, SHOW_ALL } from "./tree-select.js";
 import { Transfer } from "./transfer.js";
@@ -53,6 +59,7 @@ import { Rating } from "./rating.js";
 import { TagInput } from "./tag-input.js";
 import { Segmented } from "./segmented.js";
 import { BranchScopePicker } from "./branch-scope-picker.js";
+import { TimeRangePicker } from "./time-range-picker.js";
 export {
   BranchScopePicker,
   Calendar,
@@ -110,11 +117,13 @@ export {
   TagInput,
   Textarea,
   TimePicker,
+  TimeRangePicker,
   Toggle,
   ToggleGroup,
   ToggleGroupItem,
   Transfer,
   TreeSelect,
+  UPLOAD_LIST_IGNORE,
   Upload,
   collectUploadCommitActions,
   createUploadItem,

package/dist/components/data-entry/input-otp.d.ts

@@ -1,2 +1,2 @@
 export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator } from "../ui/input-otp.js";
-export type { InputOTPAlignProp, InputOTPGroupAppearanceProp, InputOTPGroupProp, InputOTPGroupProps, } from "../ui/input-otp.js";
+export type { InputOTPAlignProp, InputOTPMaskProp, InputOTPGroupAppearanceProp, InputOTPGroupProp, InputOTPGroupProps, InputOTPProp, InputOTPProps, } from "../ui/input-otp.js";

package/dist/components/data-entry/input.d.ts

@@ -1,39 +1,17 @@
 import * as React from "react";
-export type InputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, "size"> & {
-    /** Control height tier: `md` (default) or `sm`, the same tiers as SelectTrigger and NumberInput. */
-    size?: "sm" | "md";
-    /** Show an inline ✕ that clears the field while it holds text (default false). */
-    allowClear?: boolean;
-    /** Called after the field is cleared via the inline ✕. */
+export type { InputProp, InputProp as InputProps } from "../../props/components/data-entry.prop.js";
+export declare const Input: React.ForwardRefExoticComponent<Omit<React.InputHTMLAttributes<HTMLInputElement>, "prefix" | "size"> & {
+    onValueChange?: (value: string) => void;
+    size?: "sm" | "md" | "lg";
+    status?: import("../../props/index.js").ControlStatusProp;
+    variant?: import("../../props/index.js").ControlVariantProp;
+    allowClear?: import("../../props/index.js").AllowClearProp;
     onClear?: () => void;
-    /**
-     * A leading affordance pinned inside the start of the field — e.g. a mail or search icon (the
-     * common auth/search pattern). Decorative by default; the input keeps the keyboard focus.
-     */
     leadingIcon?: React.ReactNode;
-    /**
-     * A trailing affordance pinned inside the field — e.g. a calendar / clock popover trigger
-     * button. ONE trailing icon shows at a time: when `allowClear` and the field holds a value the
-     * clear ✕ REPLACES this icon; otherwise this icon shows.
-     */
-    trailingIcon?: React.ReactNode;
-};
-export declare const Input: React.ForwardRefExoticComponent<Omit<React.InputHTMLAttributes<HTMLInputElement>, "size"> & {
-    /** Control height tier: `md` (default) or `sm`, the same tiers as SelectTrigger and NumberInput. */
-    size?: "sm" | "md";
-    /** Show an inline ✕ that clears the field while it holds text (default false). */
-    allowClear?: boolean;
-    /** Called after the field is cleared via the inline ✕. */
-    onClear?: () => void;
-    /**
-     * A leading affordance pinned inside the start of the field — e.g. a mail or search icon (the
-     * common auth/search pattern). Decorative by default; the input keeps the keyboard focus.
-     */
-    leadingIcon?: React.ReactNode;
-    /**
-     * A trailing affordance pinned inside the field — e.g. a calendar / clock popover trigger
-     * button. ONE trailing icon shows at a time: when `allowClear` and the field holds a value the
-     * clear ✕ REPLACES this icon; otherwise this icon shows.
-     */
     trailingIcon?: React.ReactNode;
+    prefix?: React.ReactNode;
+    suffix?: React.ReactNode;
+    addonBefore?: React.ReactNode;
+    addonAfter?: React.ReactNode;
+    count?: import("../../props/components/data-entry.prop.js").ControlCountProp;
 } & React.RefAttributes<HTMLInputElement>>;

package/dist/components/data-entry/input.js

@@ -5,24 +5,40 @@ import { X } from "lucide-react";
 import { useTranslation } from "../../i18n/use-translation.js";
 import { useFieldIdentity, useFieldNameFallback } from "../../lib/field-a11y.js";
 import { cn } from "../../lib/utils.js";
+import {
+  CONTROL_STATUS_CHROME_CLASS,
+  CONTROL_VARIANT_CHROME_CLASS,
+  controlAppearanceAttributes,
+  resolveControlCount
+} from "./control-appearance.js";
+import { resolveAllowClear } from "./control-surface.js";
 const inputBaseClass = [
-  "ui-control ui-input border-input bg-background w-full rounded-[var(--control-radius)] transition-[color,box-shadow] outline-none",
+  "ui-control ui-input w-full rounded-[var(--control-radius)] transition-[color,box-shadow] outline-none",
   "selection:bg-primary selection:text-primary-foreground",
   "placeholder:text-muted-foreground",
-  "aria-invalid:border-destructive"
+  "aria-invalid:border-destructive",
+  CONTROL_STATUS_CHROME_CLASS
 ];
 const Input = React.forwardRef(
   ({
     size,
+    status,
+    variant = "outlined",
     className,
     type,
-    allowClear = false,
+    allowClear,
     onClear,
     leadingIcon,
     trailingIcon,
+    prefix,
+    suffix,
+    addonBefore,
+    addonAfter,
+    count,
     value,
     defaultValue,
     onChange,
+    onValueChange,
     ...props
   }, ref) => {
     const { t } = useTranslation();
@@ -35,6 +51,11 @@ const Input = React.forwardRef(
       name: props.name,
       "data-field": props["data-field"]
     });
+    const appearance = controlAppearanceAttributes({
+      status,
+      variant,
+      "aria-invalid": props["aria-invalid"]
+    });
     const innerRef = React.useRef(null);
     const setRefs = React.useCallback(
       (node) => {
@@ -44,15 +65,15 @@ const Input = React.forwardRef(
       },
       [ref]
     );
-    const [hasText, setHasText] = React.useState(
-      () => String(value ?? defaultValue ?? "").length > 0
-    );
+    const [text, setText] = React.useState(() => String(value ?? defaultValue ?? ""));
+    const hasText = text.length > 0;
     React.useEffect(() => {
-      if (value !== void 0) setHasText(String(value).length > 0);
+      if (value !== void 0) setText(String(value));
     }, [value]);
     const handleChange = (event) => {
-      if (value === void 0) setHasText(event.target.value.length > 0);
+      if (value === void 0) setText(event.target.value);
       onChange?.(event);
+      if (onChange !== onValueChange) onValueChange?.(event.target.value);
     };
     const clear = () => {
       const el = innerRef.current;
@@ -65,11 +86,17 @@ const Input = React.forwardRef(
         el.dispatchEvent(new Event("input", { bubbles: true }));
         el.focus();
       }
-      setHasText(false);
+      setText("");
       onClear?.();
     };
-    if (!allowClear && trailingIcon == null && leadingIcon == null) {
-      return /* @__PURE__ */ jsx(
+    const clearControl = resolveAllowClear(allowClear, false, t("common.clear") ?? "Clear");
+    const chrome = CONTROL_VARIANT_CHROME_CLASS[variant];
+    const counter = resolveControlCount(count, text);
+    const leading = prefix ?? leadingIcon;
+    const leadingIsDecorative = prefix == null;
+    const hasAddon = addonBefore != null || addonAfter != null;
+    if (!clearControl.enabled && leading == null && trailingIcon == null && suffix == null && !counter) {
+      const bare = /* @__PURE__ */ jsx(
         "input",
         {
           type,
@@ -78,28 +105,38 @@ const Input = React.forwardRef(
           ref: setRefs,
           value,
           defaultValue,
-          onChange,
-          className: cn(inputBaseClass, className),
+          onChange: handleChange,
+          className: cn(inputBaseClass, chrome, className),
           ...props,
           ...nameFallback,
-          ...identity
+          ...identity,
+          ...appearance
         }
       );
+      return hasAddon ? withAddons(bare, addonBefore, addonAfter, size, appearance) : bare;
     }
-    const showClear = allowClear && hasText && !props.disabled && !props.readOnly;
+    const showClear = clearControl.enabled && hasText && !props.disabled && !props.readOnly;
     const trailing = showClear ? /* @__PURE__ */ jsx(
       "button",
       {
         type: "button",
         tabIndex: -1,
-        "aria-label": t("common.clear") ?? "Clear",
+        "aria-label": clearControl.label,
         onClick: clear,
         className: "ui-control-inline-affix-action",
-        children: /* @__PURE__ */ jsx(X, { className: "ui-control-inline-affix-icon", "aria-hidden": "true" })
+        children: clearControl.clearIcon ?? /* @__PURE__ */ jsx(X, { className: "ui-control-inline-affix-icon", "aria-hidden": "true" })
       }
-    ) : trailingIcon;
-    return /* @__PURE__ */ jsxs("span", { "data-slot": "input-affix-wrapper", className: "ui-input-affix-wrapper", children: [
-      leadingIcon != null ? /* @__PURE__ */ jsx("span", { "data-slot": "input-leading", "aria-hidden": "true", className: "ui-input-leading", children: leadingIcon }) : null,
+    ) : suffix ?? trailingIcon;
+    const affixed = /* @__PURE__ */ jsxs("span", { "data-slot": "input-affix-wrapper", className: "ui-input-affix-wrapper", children: [
+      leading != null ? /* @__PURE__ */ jsx(
+        "span",
+        {
+          "data-slot": "input-leading",
+          "aria-hidden": leadingIsDecorative ? "true" : void 0,
+          className: "ui-input-leading",
+          children: leading
+        }
+      ) : null,
       /* @__PURE__ */ jsx(
         "input",
         {
@@ -112,20 +149,51 @@ const Input = React.forwardRef(
           onChange: handleChange,
           className: cn(
             inputBaseClass,
-            leadingIcon != null && "ui-input--leading-affix",
-            (showClear || trailingIcon != null) && "ui-input--trailing-affix",
+            chrome,
+            leading != null && "ui-input--leading-affix",
+            (trailing != null || counter !== null) && "ui-input--trailing-affix",
             className
           ),
           ...props,
           ...nameFallback,
-          ...identity
+          ...identity,
+          ...appearance
         }
       ),
-      trailing != null ? /* @__PURE__ */ jsx("span", { className: "ui-input-trailing", children: trailing }) : null
+      trailing != null || counter !== null ? /* @__PURE__ */ jsxs("span", { className: "ui-input-trailing", children: [
+        counter ? /* @__PURE__ */ jsx(
+          "span",
+          {
+            "data-slot": "input-count",
+            "data-exceeded": counter.exceeded ? "true" : void 0,
+            className: "ui-control-count",
+            "aria-hidden": "true",
+            children: counter.content
+          }
+        ) : null,
+        trailing
+      ] }) : null
     ] });
+    return hasAddon ? withAddons(affixed, addonBefore, addonAfter, size, appearance) : affixed;
   }
 );
 Input.displayName = "Input";
+function withAddons(field, addonBefore, addonAfter, size, appearance) {
+  return /* @__PURE__ */ jsxs(
+    "span",
+    {
+      "data-slot": "input-group",
+      "data-size": size,
+      "data-status": appearance["data-status"],
+      className: "ui-input-group",
+      children: [
+        addonBefore != null ? /* @__PURE__ */ jsx("span", { "data-slot": "input-addon-before", className: "ui-input-addon", children: addonBefore }) : null,
+        field,
+        addonAfter != null ? /* @__PURE__ */ jsx("span", { "data-slot": "input-addon-after", className: "ui-input-addon", children: addonAfter }) : null
+      ]
+    }
+  );
+}
 export {
   Input
 };

package/dist/components/data-entry/label.d.ts

@@ -1,4 +1,5 @@
 import * as React from "react";
-import * as LabelPrimitive from "@radix-ui/react-label";
 import { type VariantProps } from "class-variance-authority";
-export declare const Label: React.ForwardRefExoticComponent<Omit<LabelPrimitive.LabelProps & React.RefAttributes<HTMLLabelElement>, "ref"> & VariantProps<(props?: import("class-variance-authority/types").ClassProp | undefined) => string> & React.RefAttributes<HTMLLabelElement>>;
+export declare const Label: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.LabelHTMLAttributes<HTMLLabelElement>, HTMLLabelElement>, "ref"> & VariantProps<(props?: import("class-variance-authority/types").ClassProp | undefined) => string> & {
+    asChild?: boolean;
+} & React.RefAttributes<HTMLLabelElement>>;

package/dist/components/data-entry/label.js

@@ -1,16 +1,19 @@
-"use client";
 import { jsx } from "react/jsx-runtime";
 import * as React from "react";
-import * as LabelPrimitive from "@radix-ui/react-label";
+import { Label as AriaLabel } from "react-aria-components";
 import { cva } from "class-variance-authority";
 import { cn } from "../../lib/utils.js";
+import { Slot } from "../../lib/slot.js";
 const labelVariants = cva(
   "font-medium leading-[var(--control-label-line-height)] peer-disabled:cursor-not-allowed peer-disabled:opacity-[var(--control-label-disabled-alpha)]"
 );
-const Label = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx(
-  LabelPrimitive.Root,
-  {
-    ref,
+const Label = React.forwardRef(({ className, onMouseDown, asChild = false, ...props }, ref) => {
+  const shared = {
+    // `...props` đứng TRƯỚC, không phải sau: giữ đúng thứ tự thuộc tính mà
+    // @radix-ui/react-label phát ra (`for` → `data-slot` → `class`), nên phép so
+    // `outerHTML` trong __tests__/label-checkbox-rac.test.tsx khớp từng ký tự.
+    // `className` / `onMouseDown` / `asChild` đã được tách ra nên không bị ghi đè.
+    ...props,
     "data-slot": "label",
     className: cn(
       // A label inside a disabled group reads at the SYSTEM disabled alpha (--disabled-opacity),
@@ -19,10 +22,20 @@ const Label = React.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */
       labelVariants(),
       className
     ),
-    ...props
-  }
-));
-Label.displayName = LabelPrimitive.Root.displayName;
+    // Carried over BY HAND from @radix-ui/react-label, which react-aria-components' Label does not
+    // do: without it a double click on the label text selects the surrounding paragraph instead of
+    // just toggling the control twice. A press that started ON the control is left alone — cancelling
+    // that one would swallow the control's own activation.
+    onMouseDown: (event) => {
+      const target = event.target;
+      if (target.closest("button, input, select")) return;
+      onMouseDown?.(event);
+      if (!event.defaultPrevented && event.detail > 1) event.preventDefault();
+    }
+  };
+  return asChild ? /* @__PURE__ */ jsx(Slot, { ref, ...shared }) : /* @__PURE__ */ jsx(AriaLabel, { ref, ...shared });
+});
+Label.displayName = "Label";
 export {
   Label
 };

package/dist/components/data-entry/month-picker.d.ts

@@ -2,9 +2,9 @@ import * as React from "react";
 import type { MonthPickerProp } from "../../props/components/data-entry.prop.js";
 export type { MonthPickerProp, MonthPickerProp as MonthPickerProps, } from "../../props/components/data-entry.prop.js";
 /**
- * MonthPicker — year/month (`yyyy/MM`) input with an Ant-Design-style month grid
+ * MonthPicker — year/month (`yyyy/MM`) input with a 12-cell month grid
  * popover: a year header with chevrons over a 3×4 grid of the twelve months.
  * The field stays a real, typeable input (form-submittable via `name` as
  * `yyyy-MM`); the grid is the visual affordance.
  */
-export declare function MonthPicker({ value: valueProp, defaultValue, onValueChange, placeholder, disabled, className, id, name, fromYear, toYear, allowClear, ...ariaProps }: MonthPickerProp): React.JSX.Element;
+export declare function MonthPicker({ value: valueProp, defaultValue, onValueChange, placeholder, disabled, className, id, name, fromYear, toYear, allowClear, open: openProp, defaultOpen, onOpenChange, status, variant, size, inputReadOnly, preserveInvalidOnBlur, placement, renderExtraFooter, ref, ...ariaProps }: MonthPickerProp): React.JSX.Element;

package/dist/components/data-entry/month-picker.js

@@ -6,6 +6,8 @@ import { usePickerLocales, useTranslation } from "../../i18n/use-translation.js"
 import { useControlledLatch } from "../../lib/hooks.js";
 import { pickFieldA11y, useFieldIdentity } from "../../lib/field-a11y.js";
 import { cn } from "../../lib/utils.js";
+import { resolveAllowClear, resolveAriaInvalid } from "./control-surface.js";
+import { CONTROL_STATUS_CHROME_CLASS, CONTROL_VARIANT_CHROME_CLASS } from "./control-appearance.js";
 import { Button } from "../general/button.js";
 import { Popover, PopoverAnchor, PopoverContent, PopoverTrigger } from "../data-display/popover.js";
 const YM_HINT = "yyyy/mm";
@@ -28,12 +30,33 @@ function MonthPicker({
   name,
   fromYear,
   toYear,
-  allowClear = true,
+  allowClear,
+  open: openProp,
+  defaultOpen = false,
+  onOpenChange,
+  status,
+  variant,
+  size,
+  inputReadOnly,
+  preserveInvalidOnBlur,
+  placement = "bottom-start",
+  renderExtraFooter,
+  ref,
   ...ariaProps
 }) {
   const { t } = useTranslation();
   const { locale } = usePickerLocales();
-  const [open, setOpen] = React.useState(false);
+  const [internalOpen, setInternalOpen] = React.useState(defaultOpen);
+  const isOpenControlled = openProp !== void 0;
+  const open = isOpenControlled ? openProp : internalOpen;
+  const setOpen = React.useCallback(
+    (next) => {
+      if (next && inputReadOnly) return;
+      if (!isOpenControlled) setInternalOpen(next);
+      onOpenChange?.(next);
+    },
+    [isOpenControlled, onOpenChange, inputReadOnly]
+  );
   const autoId = React.useId();
   const inputId = id ?? autoId;
   const dialogId = `${inputId}-dialog`;
@@ -56,7 +79,8 @@ function MonthPicker({
     if (!isControlled) setInternalValue(next);
     onValueChange?.(next);
   };
-  const showClear = allowClear && Boolean(value) && !disabled;
+  const clearControl = resolveAllowClear(allowClear, true, t("common.clear") ?? "Clear");
+  const showClear = clearControl.enabled && Boolean(value) && !disabled && !inputReadOnly;
   const prevDisabled = fromYear !== void 0 && viewYear <= fromYear;
   const nextDisabled = toYear !== void 0 && viewYear >= toYear;
   return /* @__PURE__ */ jsx(Popover, { open, onOpenChange: setOpen, children: /* @__PURE__ */ jsx(PopoverAnchor, { asChild: true, children: /* @__PURE__ */ jsxs(
@@ -64,9 +88,14 @@ function MonthPicker({
     {
       "data-disabled": disabled ? "" : void 0,
       "data-state": open ? "open" : "closed",
+      "data-size": size,
+      "data-status": status,
+      "data-variant": variant,
       className: cn(
         "ui-control ui-control-composite-field",
         "aria-invalid:border-destructive",
+        CONTROL_VARIANT_CHROME_CLASS[variant ?? "outlined"],
+        CONTROL_STATUS_CHROME_CLASS,
         className
       ),
       onClick: () => {
@@ -76,11 +105,13 @@ function MonthPicker({
         /* @__PURE__ */ jsx(
           "input",
           {
+            ref,
             id: inputId,
             name: name ?? identity.name,
             "data-field": fieldA11y["data-field"] ?? identity["data-field"],
             value: text,
             disabled,
+            readOnly: inputReadOnly,
             placeholder: placeholder ?? t("dataEntry.monthPicker.placeholder") ?? YM_HINT,
             inputMode: "numeric",
             autoComplete: "off",
@@ -88,7 +119,9 @@ function MonthPicker({
             "aria-expanded": open,
             "aria-haspopup": "dialog",
             "aria-controls": open ? dialogId : void 0,
+            "aria-readonly": inputReadOnly || void 0,
             ...fieldA11y,
+            "aria-invalid": resolveAriaInvalid(fieldA11y["aria-invalid"], status),
             className: "ui-month-picker-input",
             onKeyDown: (event) => {
               if (event.key === "ArrowDown") {
@@ -104,7 +137,9 @@ function MonthPicker({
               if (parsed) emit(parsed);
               else if (event.target.value.trim() === "") emit(void 0);
             },
-            onBlur: () => setText(toYmText(value))
+            onBlur: () => {
+              if (!preserveInvalidOnBlur) setText(toYmText(value));
+            }
           }
         ),
         showClear ? /* @__PURE__ */ jsx(
@@ -112,17 +147,17 @@ function MonthPicker({
           {
             type: "button",
             tabIndex: -1,
-            "aria-label": t("common.clear") ?? "Clear",
+            "aria-label": clearControl.label,
             className: "text-muted-foreground hover:text-foreground shrink-0",
             onClick: (event) => {
               event.stopPropagation();
+              event.currentTarget.closest("div")?.querySelector("input:not([type=hidden])")?.focus();
               emit(void 0);
               setText("");
             },
-            children: /* @__PURE__ */ jsx(X, { className: "ui-month-picker-icon", "aria-hidden": "true" })
+            children: clearControl.clearIcon ?? /* @__PURE__ */ jsx(X, { className: "ui-month-picker-icon", "aria-hidden": "true" })
           }
-        ) : null,
-        /* @__PURE__ */ jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsx(
+        ) : /* @__PURE__ */ jsx(PopoverTrigger, { asChild: true, children: /* @__PURE__ */ jsx(
           "button",
           {
             type: "button",
@@ -140,7 +175,8 @@ function MonthPicker({
             role: "dialog",
             "aria-label": t("dataEntry.monthPicker.openGrid") ?? "Month grid",
             className: "ui-month-picker-panel",
-            align: "start",
+            side: placement.startsWith("top") ? "top" : "bottom",
+            align: placement.endsWith("end") ? "end" : "start",
             onOpenAutoFocus: (event) => event.preventDefault(),
             onClick: (event) => event.stopPropagation(),
             children: [
@@ -191,7 +227,8 @@ function MonthPicker({
                   },
                   label
                 );
-              }) })
+              }) }),
+              renderExtraFooter?.()
             ]
           }
         )

package/dist/components/data-entry/month-range-picker.d.ts

@@ -2,9 +2,9 @@ import * as React from "react";
 import type { MonthRangePickerProp } from "../../props/components/data-entry.prop.js";
 export type { MonthRangePickerProp, MonthRangePickerProp as MonthRangePickerProps, } from "../../props/components/data-entry.prop.js";
 /**
- * MonthRangePicker — year/month (`yyyy/MM`) RANGE rendered as ONE input-styled control (Ant Design
+ * MonthRangePicker — year/month (`yyyy/MM`) RANGE rendered as ONE input-styled control (the
  * RangePicker convention): `[ from → to ✕ 📅 ]`. The two inner fields stay real, typeable
  * `yyyy/MM` inputs (form-submittable via `${name}_from` / `${name}_to`); the Ant-style month grid
  * is the visual affordance.
  */
-export declare function MonthRangePicker({ value: valueProp, defaultValue, onValueChange, placeholder, disabled, className, id, name, fromYear, toYear, allowClear, ...ariaProps }: MonthRangePickerProp): React.JSX.Element;
+export declare function MonthRangePicker({ value: valueProp, defaultValue, onValueChange, placeholder, disabled, className, id, name, fromYear, toYear, allowClear, open: openProp, defaultOpen, onOpenChange, status, variant, size, inputReadOnly, preserveInvalidOnBlur, placement, renderExtraFooter, ref, ...ariaProps }: MonthRangePickerProp): React.JSX.Element;