impact-nova 2.2.1 → 2.2.3

package/dist/components/forms/date-picker/multi-month-picker.js

@@ -1,16 +1,16 @@
 import { jsxs as f, jsx as n } from "react/jsx-runtime";
 import * as r from "react";
-import { Cross as B, CalendarMonth as H } from "impact-nova-icons";
-import { cn as q } from "../../../lib/utils.js";
-import { Input as G } from "../input/input.js";
-import { Popover as J, PopoverAnchor as Q, PopoverContent as U } from "../../feedback/popover/popover.js";
-import { Calendar as W } from "../../data-display/calendar/calendar.js";
+import { Cross as w, CalendarMonth as B } from "impact-nova-icons";
+import { cn as H } from "../../../lib/utils.js";
+import { Input as q } from "../input/input.js";
+import { Popover as G, PopoverAnchor as J, PopoverContent as Q } from "../../feedback/popover/popover.js";
+import { Calendar as U } from "../../data-display/calendar/calendar.js";
 import { Tooltip as b, TooltipTrigger as x, TooltipContent as A } from "../../feedback/tooltip/tooltip.js";
-import { useImpactNovaI18n as X } from "../../../i18n/use-impact-nova-i18n.js";
-import { coerceMonthArrayApply as Y, coerceMonthArray as Z } from "./calendar-selection-adapters.js";
-import { usePickerDismissActionsRef as _, usePickerFooterDismissNudge as ee } from "./date-input-behavior.js";
-import { buildDateBoundsMatcher as te } from "../../../lib/date-bounds-matcher.js";
-const ne = r.forwardRef(
+import { useImpactNovaI18n as W } from "../../../i18n/use-impact-nova-i18n.js";
+import { coerceMonthArrayApply as X, coerceMonthArray as Y } from "./calendar-selection-adapters.js";
+import { usePickerDismissActionsRef as Z, usePickerFooterDismissNudge as _ } from "./date-input-behavior.js";
+import { buildDateBoundsMatcher as ee } from "../../../lib/date-bounds-matcher.js";
+const te = r.forwardRef(
   ({
     value: t,
     onChange: h,
@@ -24,15 +24,15 @@ const ne = r.forwardRef(
     className: I,
     ...S
   }, j) => {
-    const { t: s } = X(), v = N ?? s("datePicker.selectMultipleMonths"), [c, i] = r.useState(!1), m = r.useRef(!1), y = r.useRef(null), g = _(), { footerFlashKey: O, footerFlashTarget: E, popoverHandlers: K } = ee(l, c, g, y), [p, d] = r.useState(t);
+    const { t: s } = W(), v = N ?? s("datePicker.selectMultipleMonths"), [c, i] = r.useState(!1), m = r.useRef(!1), y = r.useRef(null), g = Z(), { footerFlashKey: O, footerFlashTarget: E, popoverHandlers: K } = _(l, c, g, y), [p, d] = r.useState(t);
     r.useEffect(() => {
       d(t);
     }, [c, t]);
     const z = (e) => {
-      const a = Z(e);
+      const a = Y(e);
       d(a), l || h?.(a);
     }, F = (e) => {
-      const a = Y(e, p);
+      const a = X(e, p);
       h?.(a), i(!1);
     }, M = () => {
       d(t), i(!1);
@@ -41,19 +41,19 @@ const ne = r.forwardRef(
     }, L = t && t.length > 0 ? t.length === 1 ? `${t[0].month + 1}/${t[0].year}` : s("datePicker.monthsSelected", { count: t.length }) : "", V = (e) => {
       o || !e && l || i(e);
     }, $ = r.useCallback(() => {
-      const e = p?.length ?? 0, a = t?.length ?? 0, w = e === a && (p ?? []).every(
+      const e = p?.length ?? 0, a = t?.length ?? 0;
+      return e === a && (p ?? []).every(
         (P, k) => P.month === t?.[k]?.month && P.year === t?.[k]?.year
-      );
-      return e > 0 && !w ? "apply" : "cancel";
+      ) ? "dismiss" : e > 0 ? "apply" : "cancel";
     }, [p, t]);
     return r.useLayoutEffect(() => {
       g.current = {
         onDismiss: M,
         resolveFlash: $
       };
-    }), /* @__PURE__ */ f(J, { open: o ? !1 : c, onOpenChange: V, children: [
-      /* @__PURE__ */ n(Q, { asChild: !0, children: /* @__PURE__ */ n("div", { ref: y, children: /* @__PURE__ */ n(
-        G,
+    }), /* @__PURE__ */ f(G, { open: o ? !1 : c, onOpenChange: V, children: [
+      /* @__PURE__ */ n(J, { asChild: !0, children: /* @__PURE__ */ n("div", { ref: y, children: /* @__PURE__ */ n(
+        q,
         {
           ref: j,
           value: L,
@@ -63,7 +63,7 @@ const ne = r.forwardRef(
           onClick: () => {
             !o && !c && i(!0);
           },
-          className: q("cursor-pointer", I),
+          className: H("cursor-pointer", I),
           suffix: /* @__PURE__ */ f("div", { className: "flex items-center gap-1", children: [
             t && t.length > 0 && !o && /* @__PURE__ */ f(b, { children: [
               /* @__PURE__ */ n(x, { asChild: !0, children: /* @__PURE__ */ n(
@@ -76,7 +76,7 @@ const ne = r.forwardRef(
                     e.stopPropagation(), C();
                   },
                   className: "inline-flex size-4 items-center justify-center bg-transparent border-none p-0 cursor-pointer",
-                  children: /* @__PURE__ */ n(B, { className: "size-3 hover:text-content" })
+                  children: /* @__PURE__ */ n(w, { className: "size-3 hover:text-content" })
                 }
               ) }),
               /* @__PURE__ */ n(A, { variant: "tertiary", side: "top", children: s("calendar.clear") })
@@ -96,7 +96,7 @@ const ne = r.forwardRef(
                     (e.key === "Enter" || e.key === " ") && (e.preventDefault(), e.stopPropagation(), o || (m.current = !0, i(!c)));
                   },
                   className: "inline-flex items-center justify-center bg-transparent border-none p-0 cursor-pointer",
-                  children: /* @__PURE__ */ n(H, { className: "h-4 w-4 text-secondary-foreground" })
+                  children: /* @__PURE__ */ n(B, { className: "h-4 w-4 text-secondary-foreground" })
                 }
               ) }),
               /* @__PURE__ */ n(A, { variant: "tertiary", side: "top", children: s("datePicker.selectMultipleMonths") })
@@ -106,7 +106,7 @@ const ne = r.forwardRef(
         }
       ) }) }),
       /* @__PURE__ */ n(
-        U,
+        Q,
         {
           className: "w-auto p-0",
           align: "start",
@@ -116,7 +116,7 @@ const ne = r.forwardRef(
           },
           ...K,
           children: /* @__PURE__ */ n(
-            W,
+            U,
             {
               pickerType: "month",
               monthMode: "multiple",
@@ -124,7 +124,7 @@ const ne = r.forwardRef(
               footerFlashKey: O,
               footerFlashTarget: E,
               onMonthSelect: z,
-              disabled: te(u, D),
+              disabled: ee(u, D),
               startMonth: R,
               endMonth: T,
               defaultMonth: u,
@@ -140,7 +140,7 @@ const ne = r.forwardRef(
     ] });
   }
 );
-ne.displayName = "MultiMonthPicker";
+te.displayName = "MultiMonthPicker";
 export {
-  ne as MultiMonthPicker
+  te as MultiMonthPicker
 };

package/dist/components/forms/date-picker/multi-week-picker.js

@@ -1,25 +1,25 @@
 import { jsxs as u, jsx as r } from "react/jsx-runtime";
 import * as n from "react";
-import { Cross as Z, CalendarMonth as _ } from "impact-nova-icons";
+import { Cross as Y, CalendarMonth as Z } from "impact-nova-icons";
 import { format as b } from "date-fns";
-import { cn as ee } from "../../../lib/utils.js";
-import { Input as te } from "../input/input.js";
-import { Popover as re, PopoverAnchor as ne, PopoverContent as oe } from "../../feedback/popover/popover.js";
-import { Calendar as se } from "../../data-display/calendar/calendar.js";
+import { cn as _ } from "../../../lib/utils.js";
+import { Input as ee } from "../input/input.js";
+import { Popover as te, PopoverAnchor as re, PopoverContent as ne } from "../../feedback/popover/popover.js";
+import { Calendar as oe } from "../../data-display/calendar/calendar.js";
 import { Tooltip as x, TooltipTrigger as A, TooltipContent as M } from "../../feedback/tooltip/tooltip.js";
-import { useImpactNovaI18n as ae } from "../../../i18n/use-impact-nova-i18n.js";
-import { getDateFnsLocale as ce } from "../../../i18n/getDateFnsLocale.js";
-import { coerceWeekArrayApply as ie, coerceWeekArray as le } from "./calendar-selection-adapters.js";
-import { usePickerDismissActionsRef as pe, usePickerFooterDismissNudge as de } from "./date-input-behavior.js";
-import { buildDateBoundsMatcher as fe } from "../../../lib/date-bounds-matcher.js";
-const me = (t, a = "MM/dd/yyyy", c) => {
-  const h = b(t.startDate, a, c ? { locale: c } : {}), y = b(t.endDate, a, c ? { locale: c } : {});
+import { useImpactNovaI18n as se } from "../../../i18n/use-impact-nova-i18n.js";
+import { getDateFnsLocale as ae } from "../../../i18n/getDateFnsLocale.js";
+import { coerceWeekArrayApply as ie, coerceWeekArray as ce } from "./calendar-selection-adapters.js";
+import { usePickerDismissActionsRef as le, usePickerFooterDismissNudge as pe } from "./date-input-behavior.js";
+import { buildDateBoundsMatcher as de } from "../../../lib/date-bounds-matcher.js";
+const fe = (t, a = "MM/dd/yyyy", i) => {
+  const h = b(t.startDate, a, i ? { locale: i } : {}), y = b(t.endDate, a, i ? { locale: i } : {});
   return `${h} - ${y}`;
-}, ue = n.forwardRef(
+}, me = n.forwardRef(
   ({
     value: t,
     onChange: a,
-    format: c = "MM/dd/yyyy",
+    format: i = "MM/dd/yyyy",
     placeholder: h,
     minDate: y,
     maxDate: N,
@@ -36,12 +36,12 @@ const me = (t, a = "MM/dd/yyyy", c) => {
     className: O,
     ...E
   }, F) => {
-    const { locale: g, t: i } = ae(), K = n.useMemo(() => ce(g), [g]), $ = h ?? i("datePicker.selectWeeks"), [l, s] = n.useState(!1), k = n.useRef(!1), C = n.useRef(null), P = pe(), { footerFlashKey: z, footerFlashTarget: V, popoverHandlers: B } = de(d, l, P, C), [f, m] = n.useState(t);
+    const { locale: g, t: c } = se(), K = n.useMemo(() => ae(g), [g]), $ = h ?? c("datePicker.selectWeeks"), [l, s] = n.useState(!1), k = n.useRef(!1), C = n.useRef(null), P = le(), { footerFlashKey: z, footerFlashTarget: V, popoverHandlers: B } = pe(d, l, P, C), [f, m] = n.useState(t);
     n.useEffect(() => {
       m(t);
     }, [l, t]);
     const H = (e) => {
-      const p = le(e);
+      const p = ce(e);
       m(p), d || a?.(p);
     }, q = (e) => {
       const p = ie(e, f);
@@ -50,22 +50,22 @@ const me = (t, a = "MM/dd/yyyy", c) => {
       m(t), s(!1);
     }, W = () => {
       m(void 0), a?.(void 0), d || s(!1);
-    }, G = t && t.length > 0 ? t.length === 1 ? me(t[0], c, K) : `${t.length} weeks selected` : "", J = (e) => {
+    }, G = t && t.length > 0 ? t.length === 1 ? fe(t[0], i, K) : `${t.length} weeks selected` : "", J = (e) => {
       o || !e && d || s(e);
     }, Q = n.useCallback(() => {
-      const e = f?.length ?? 0, p = t?.length ?? 0, U = e === p && (f ?? []).every(
-        (X, Y) => X.startDate.getTime() === t?.[Y]?.startDate.getTime()
-      );
-      return e > 0 && !U ? "apply" : "cancel";
+      const e = f?.length ?? 0, p = t?.length ?? 0;
+      return e === p && (f ?? []).every(
+        (U, X) => U.startDate.getTime() === t?.[X]?.startDate.getTime()
+      ) ? "dismiss" : e > 0 ? "apply" : "cancel";
     }, [f, t]);
     return n.useLayoutEffect(() => {
       P.current = {
         onDismiss: D,
         resolveFlash: Q
       };
-    }), /* @__PURE__ */ u(re, { open: o ? !1 : l, onOpenChange: J, children: [
-      /* @__PURE__ */ r(ne, { asChild: !0, children: /* @__PURE__ */ r("div", { ref: C, children: /* @__PURE__ */ r(
-        te,
+    }), /* @__PURE__ */ u(te, { open: o ? !1 : l, onOpenChange: J, children: [
+      /* @__PURE__ */ r(re, { asChild: !0, children: /* @__PURE__ */ r("div", { ref: C, children: /* @__PURE__ */ r(
+        ee,
         {
           ref: F,
           value: G,
@@ -75,7 +75,7 @@ const me = (t, a = "MM/dd/yyyy", c) => {
           onClick: () => {
             !o && !l && s(!0);
           },
-          className: ee("cursor-pointer", O),
+          className: _("cursor-pointer", O),
           suffix: /* @__PURE__ */ u("div", { className: "flex items-center gap-1", children: [
             t && t.length > 0 && !o && /* @__PURE__ */ u(x, { children: [
               /* @__PURE__ */ r(A, { asChild: !0, children: /* @__PURE__ */ r(
@@ -83,15 +83,15 @@ const me = (t, a = "MM/dd/yyyy", c) => {
                 {
                   type: "button",
                   tabIndex: 0,
-                  "aria-label": i("calendar.clear"),
+                  "aria-label": c("calendar.clear"),
                   onClick: (e) => {
                     e.stopPropagation(), W();
                   },
                   className: "inline-flex size-4 items-center justify-center bg-transparent border-none p-0 cursor-pointer",
-                  children: /* @__PURE__ */ r(Z, { className: "size-3 hover:text-content" })
+                  children: /* @__PURE__ */ r(Y, { className: "size-3 hover:text-content" })
                 }
               ) }),
-              /* @__PURE__ */ r(M, { variant: "tertiary", side: "top", children: i("calendar.clear") })
+              /* @__PURE__ */ r(M, { variant: "tertiary", side: "top", children: c("calendar.clear") })
             ] }),
             /* @__PURE__ */ u(x, { children: [
               /* @__PURE__ */ r(A, { asChild: !0, children: /* @__PURE__ */ r(
@@ -100,7 +100,7 @@ const me = (t, a = "MM/dd/yyyy", c) => {
                   type: "button",
                   tabIndex: 0,
                   "data-component": "calendar-trigger",
-                  "aria-label": i("datePicker.selectWeeks"),
+                  "aria-label": c("datePicker.selectWeeks"),
                   onPointerDown: (e) => {
                     e.preventDefault(), e.stopPropagation(), o || s(!l);
                   },
@@ -108,27 +108,27 @@ const me = (t, a = "MM/dd/yyyy", c) => {
                     (e.key === "Enter" || e.key === " ") && (e.preventDefault(), e.stopPropagation(), o || (k.current = !0, s(!l)));
                   },
                   className: "inline-flex items-center justify-center bg-transparent border-none p-0 cursor-pointer",
-                  children: /* @__PURE__ */ r(_, { className: "h-4 w-4 text-secondary-foreground" })
+                  children: /* @__PURE__ */ r(Z, { className: "h-4 w-4 text-secondary-foreground" })
                 }
               ) }),
-              /* @__PURE__ */ r(M, { variant: "tertiary", side: "top", children: i("datePicker.selectWeeks") })
+              /* @__PURE__ */ r(M, { variant: "tertiary", side: "top", children: c("datePicker.selectWeeks") })
             ] })
           ] }),
           ...E
         }
       ) }) }),
       /* @__PURE__ */ r(
-        oe,
+        ne,
         {
           className: "w-auto p-0",
           align: "start",
-          "aria-label": i("datePicker.selectWeeks"),
+          "aria-label": c("datePicker.selectWeeks"),
           onOpenAutoFocus: (e) => {
             k.current || e.preventDefault(), k.current = !1;
           },
           ...B,
           children: /* @__PURE__ */ r(
-            se,
+            oe,
             {
               pickerType: "week",
               weekMode: "multiple",
@@ -136,7 +136,7 @@ const me = (t, a = "MM/dd/yyyy", c) => {
               footerFlashKey: z,
               footerFlashTarget: V,
               onWeekSelect: H,
-              disabled: fe(y, N),
+              disabled: de(y, N),
               startMonth: T,
               endMonth: R,
               showFooter: d,
@@ -157,7 +157,7 @@ const me = (t, a = "MM/dd/yyyy", c) => {
     ] });
   }
 );
-ue.displayName = "MultiWeekPicker";
+me.displayName = "MultiWeekPicker";
 export {
-  ue as MultiWeekPicker
+  me as MultiWeekPicker
 };

package/dist/components/forms/date-picker/week-picker.js

@@ -1,26 +1,26 @@
 import { jsxs as C, jsx as a } from "react/jsx-runtime";
 import * as s from "react";
-import { Cross as ve, CalendarMonth as Ce } from "impact-nova-icons";
+import { Cross as Ie, CalendarMonth as Ce } from "impact-nova-icons";
 import { format as O } from "date-fns";
 import { cn as We } from "../../../lib/utils.js";
-import { usePickerDismissActionsRef as Re, usePickerFooterDismissNudge as Pe, isDateInputInvalid as be, resolveDateInputOnBlur as xe, maskDateInput as Ee, parseDateInput as Ae, resolveDateInputOnEnter as Ne } from "./date-input-behavior.js";
-import { Input as Se } from "../input/input.js";
-import { Popover as Te, PopoverAnchor as we, PopoverContent as Ve } from "../../feedback/popover/popover.js";
-import { Calendar as Le } from "../../data-display/calendar/calendar.js";
+import { usePickerDismissActionsRef as Re, usePickerFooterDismissNudge as Pe, isDateInputInvalid as be, resolveSingleValueDismissFlash as xe, resolveDateInputOnBlur as Ee, maskDateInput as Se, parseDateInput as Ae, resolveDateInputOnEnter as Ne } from "./date-input-behavior.js";
+import { Input as Te } from "../input/input.js";
+import { Popover as Ve, PopoverAnchor as we, PopoverContent as Le } from "../../feedback/popover/popover.js";
+import { Calendar as Oe } from "../../data-display/calendar/calendar.js";
 import { Tooltip as X, TooltipTrigger as Z, TooltipContent as _ } from "../../feedback/tooltip/tooltip.js";
-import { resolveWeekSelection as Oe } from "../../../lib/fiscal-calendar.js";
-import { useImpactNovaI18n as je } from "../../../i18n/use-impact-nova-i18n.js";
-import { getDateFnsLocale as Be } from "../../../i18n/getDateFnsLocale.js";
-import { coerceSingleWeekApply as Ke, coerceSingleWeek as Me } from "./calendar-selection-adapters.js";
-import { buildDateBoundsMatcher as ze } from "../../../lib/date-bounds-matcher.js";
-const Y = (t, c = "MM/dd/yyyy", n) => {
-  const W = O(t.startDate, c, n ? { locale: n } : {}), R = O(t.endDate, c, n ? { locale: n } : {});
+import { resolveWeekSelection as je } from "../../../lib/fiscal-calendar.js";
+import { useImpactNovaI18n as Be } from "../../../i18n/use-impact-nova-i18n.js";
+import { getDateFnsLocale as Ke } from "../../../i18n/getDateFnsLocale.js";
+import { coerceSingleWeekApply as Me, coerceSingleWeek as ze } from "./calendar-selection-adapters.js";
+import { buildDateBoundsMatcher as He } from "../../../lib/date-bounds-matcher.js";
+const Y = (n, c = "MM/dd/yyyy", t) => {
+  const W = O(n.startDate, c, t ? { locale: t } : {}), R = O(n.endDate, c, t ? { locale: t } : {});
   return `${W} - ${R}`;
-}, h = (t, c, n) => t ? O(t.startDate, c, n ? { locale: n } : {}) : "", He = s.forwardRef(
+}, h = (n, c, t) => n ? O(n.startDate, c, t ? { locale: t } : {}) : "", $e = s.forwardRef(
   ({
-    value: t,
+    value: n,
     onChange: c,
-    format: n = "MM/dd/yyyy",
+    format: t = "MM/dd/yyyy",
     placeholder: W,
     minDate: R,
     maxDate: F,
@@ -31,83 +31,83 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
     fiscalMode: b = "basic",
     selectionMode: x = "week",
     fiscalMonthPattern: E,
-    fiscalYearStartMonth: A = 1,
-    weekStartsOn: N = 1,
-    disabled: u,
+    fiscalYearStartMonth: S = 1,
+    weekStartsOn: A = 1,
+    disabled: p,
     className: ne,
     ...re
   }, se) => {
-    const { locale: j, t: k } = je(), o = s.useMemo(() => Be(j), [j]), ie = W ?? k("datePicker.selectWeek"), B = s.useRef(null), K = s.useRef(null), I = s.useRef(!1);
+    const { locale: j, t: k } = Be(), o = s.useMemo(() => Ke(j), [j]), ie = W ?? k("datePicker.selectWeek"), B = s.useRef(null), K = s.useRef(null), v = s.useRef(!1);
     s.useImperativeHandle(se, () => B.current);
-    const [i, M] = s.useState(!1), z = Re(), { footerFlashKey: oe, footerFlashTarget: ce, popoverHandlers: ae } = Pe(l, i, z, K), [le, S] = s.useState(!1), [p, f] = s.useState(t), [y, m] = s.useState(""), [pe, D] = s.useState(t?.startDate || /* @__PURE__ */ new Date()), ue = t ? Y(t, n, o) : "", H = p ? Y(p, n, o) : "", T = i || le, fe = T ? y : H, $ = s.useCallback(() => {
-      f(t), m(h(t, n, o)), D(t?.startDate || /* @__PURE__ */ new Date());
-    }, [t, n, o]), v = s.useCallback(() => {
-      m(h(p ?? t, n, o)), D((p ?? t)?.startDate || /* @__PURE__ */ new Date());
-    }, [p, t, n, o]);
+    const [i, M] = s.useState(!1), z = Re(), { footerFlashKey: oe, footerFlashTarget: ce, popoverHandlers: ae } = Pe(l, i, z, K), [le, N] = s.useState(!1), [u, f] = s.useState(n), [y, m] = s.useState(""), [pe, D] = s.useState(n?.startDate || /* @__PURE__ */ new Date()), ue = n ? Y(n, t, o) : "", H = u ? Y(u, t, o) : "", T = i || le, fe = T ? y : H, $ = s.useCallback(() => {
+      f(n), m(h(n, t, o)), D(n?.startDate || /* @__PURE__ */ new Date());
+    }, [n, t, o]), I = s.useCallback(() => {
+      m(h(u ?? n, t, o)), D((u ?? n)?.startDate || /* @__PURE__ */ new Date());
+    }, [u, n, t, o]);
     s.useEffect(() => {
-      i || f(t);
-    }, [i, t]);
+      i || f(n);
+    }, [i, n]);
     const q = s.useRef(!1);
     s.useEffect(() => {
-      i && !q.current && v(), q.current = i;
-    }, [i, v]);
+      i && !q.current && I(), q.current = i;
+    }, [i, I]);
     const d = () => {
-      S(!1), M(!1);
+      N(!1), M(!1);
     }, g = (e) => {
-      if (!u) {
+      if (!p) {
         if (e) {
-          v(), M(!0);
+          I(), M(!0);
           return;
         }
         l || d();
       }
-    }, w = s.useCallback(
-      (e) => Oe(e, {
+    }, V = s.useCallback(
+      (e) => je(e, {
         calendarType: P,
         fiscalMode: b,
         selectionMode: x,
         fiscalMonthPattern: E,
-        fiscalYearStartMonth: A,
-        weekStartsOn: N
+        fiscalYearStartMonth: S,
+        weekStartsOn: A
       }),
       [
         P,
         b,
         x,
         E,
-        A,
-        N
+        S,
+        A
       ]
     ), de = (e) => {
-      const r = Me(e);
-      f(r), r && (m(h(r, n, o)), D(r.startDate)), l || (c?.(r), d());
+      const r = ze(e);
+      f(r), r && (m(h(r, t, o)), D(r.startDate)), l || (c?.(r), d());
     }, G = (e) => {
-      const r = Ke(e, p);
+      const r = Me(e, u);
       c?.(r), d();
-    }, V = () => {
+    }, w = () => {
       $(), d();
     }, J = () => {
       f(void 0), m(""), c?.(void 0), l || d();
     }, me = (e) => {
-      const r = w(e);
-      f(r), m(h(r, n, o)), D(e), c?.(r), d();
+      const r = V(e);
+      f(r), m(h(r, t, o)), D(e), c?.(r), d();
     }, ke = (e) => {
-      const r = Ee(e.target.value, n, y);
+      const r = Se(e.target.value, t, y);
       if (m(r), r === "") {
         f(void 0), l || c?.(void 0);
         return;
       }
-      const { parsed: L, isValid: Ie } = Ae(r, n, o);
-      if (Ie && L) {
-        const U = w(L);
+      const { parsed: L, isValid: ve } = Ae(r, t, o);
+      if (ve && L) {
+        const U = V(L);
         f(U), D(L), l || c?.(U);
       }
     }, ye = () => {
-      if (S(!1), i) return;
-      const e = xe(
+      if (N(!1), i) return;
+      const e = Ee(
         y,
-        n,
-        h(p ?? t, n, o),
+        t,
+        h(u ?? n, t, o),
         o
       );
       if (e.resetToCommitted) {
@@ -115,8 +115,8 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
         return;
       }
       if (e.parsed) {
-        const r = w(e.parsed);
-        f(r), m(h(r, n, o)), l || c?.(r);
+        const r = V(e.parsed);
+        f(r), m(h(r, t, o)), l || c?.(r);
         return;
       }
       y || (f(void 0), l || c?.(void 0));
@@ -125,19 +125,26 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
         G();
         return;
       }
-      const e = Ne(y, n, o);
+      const e = Ne(y, t, o);
       if (e.parsed) {
         l && me(e.parsed);
         return;
       }
-      i || (I.current = !0, g(!0));
-    }, Q = ue !== H, ge = T && be(y, n, o), he = s.useCallback(() => p && (!t || p.startDate.getTime() !== t.startDate.getTime()) ? "apply" : "cancel", [p, t]);
+      i || (v.current = !0, g(!0));
+    }, Q = ue !== H, ge = T && be(y, t, o), he = s.useCallback(
+      () => xe(
+        u,
+        n,
+        (e, r) => e.startDate.getTime() === r.startDate.getTime()
+      ),
+      [u, n]
+    );
     return s.useLayoutEffect(() => {
       z.current = {
-        onDismiss: V,
+        onDismiss: w,
         resolveFlash: he
       };
-    }), /* @__PURE__ */ C(Te, { open: u ? !1 : i, onOpenChange: g, children: [
+    }), /* @__PURE__ */ C(Ve, { open: p ? !1 : i, onOpenChange: g, children: [
       /* @__PURE__ */ a(we, { asChild: !0, children: /* @__PURE__ */ a(
         "div",
         {
@@ -146,21 +153,21 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
           "data-state": i ? "open" : "closed",
           "data-pending": Q || void 0,
           children: /* @__PURE__ */ a(
-            Se,
+            Te,
             {
               ref: B,
               value: fe,
               onChange: ke,
               onFocus: () => {
-                u || (S(!0), v());
+                p || (N(!0), I());
               },
               onBlur: ye,
-              onClick: () => !u && g(!0),
+              onClick: () => !p && g(!0),
               onKeyDown: (e) => {
-                e.key === "Enter" && !u && (e.preventDefault(), De()), e.key === "ArrowDown" && !i && !u && (e.preventDefault(), I.current = !0, g(!0)), e.key === "Escape" && i && (e.preventDefault(), V());
+                e.key === "Enter" && !p && (e.preventDefault(), De()), e.key === "ArrowDown" && !i && !p && (e.preventDefault(), v.current = !0, g(!0)), e.key === "Escape" && i && (e.preventDefault(), w());
               },
-              placeholder: T ? n : ie,
-              disabled: u,
+              placeholder: T ? t : ie,
+              disabled: p,
               "data-form-control": "input",
               className: We(
                 "cursor-pointer",
@@ -168,7 +175,7 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
                 ne
               ),
               suffix: /* @__PURE__ */ C("div", { className: "flex items-center gap-1", children: [
-                t && !u && /* @__PURE__ */ C(X, { children: [
+                n && !p && /* @__PURE__ */ C(X, { children: [
                   /* @__PURE__ */ a(Z, { asChild: !0, children: /* @__PURE__ */ a(
                     "button",
                     {
@@ -179,7 +186,7 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
                         e.stopPropagation(), J();
                       },
                       className: "inline-flex size-4 items-center justify-center bg-transparent border-none p-0 cursor-pointer",
-                      children: /* @__PURE__ */ a(ve, { className: "size-3 hover:text-content" })
+                      children: /* @__PURE__ */ a(Ie, { className: "size-3 hover:text-content" })
                     }
                   ) }),
                   /* @__PURE__ */ a(_, { variant: "tertiary", side: "top", children: k("calendar.clear") })
@@ -192,10 +199,10 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
                       tabIndex: 0,
                       "aria-label": k("datePicker.selectWeek"),
                       onClick: (e) => {
-                        e.stopPropagation(), u || (i ? d() : g(!0));
+                        e.stopPropagation(), p || (i ? d() : g(!0));
                       },
                       onKeyDown: (e) => {
-                        (e.key === "Enter" || e.key === " ") && (e.preventDefault(), e.stopPropagation(), u || (I.current = !0, i ? d() : g(!0)));
+                        (e.key === "Enter" || e.key === " ") && (e.preventDefault(), e.stopPropagation(), p || (v.current = !0, i ? d() : g(!0)));
                       },
                       className: "inline-flex items-center justify-center bg-transparent border-none p-0 cursor-pointer",
                       children: /* @__PURE__ */ a(Ce, { className: "h-4 w-4 text-secondary-foreground" })
@@ -210,27 +217,27 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
         }
       ) }),
       /* @__PURE__ */ a(
-        Ve,
+        Le,
         {
           className: "w-auto p-0",
           align: "start",
           "aria-label": k("datePicker.selectWeek"),
           onOpenAutoFocus: (e) => {
-            I.current || e.preventDefault(), I.current = !1;
+            v.current || e.preventDefault(), v.current = !1;
           },
           ...ae,
           children: /* @__PURE__ */ a(
-            Le,
+            Oe,
             {
               pickerType: "week",
               weekMode: "single",
-              selectedWeeks: p,
+              selectedWeeks: u,
               footerFlashKey: oe,
               footerFlashTarget: ce,
               onWeekSelect: de,
               month: pe,
               onMonthChange: D,
-              disabled: ze(R, F),
+              disabled: He(R, F),
               startMonth: ee,
               endMonth: te,
               showFooter: l,
@@ -238,10 +245,10 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
               fiscalMode: b,
               selectionMode: x,
               fiscalMonthPattern: E,
-              fiscalYearStartMonth: A,
-              weekStartsOn: N,
+              fiscalYearStartMonth: S,
+              weekStartsOn: A,
               onApply: G,
-              onCancel: V,
+              onCancel: w,
               onClear: J,
               captionLayout: "dropdown"
             }
@@ -251,7 +258,7 @@ const Y = (t, c = "MM/dd/yyyy", n) => {
     ] });
   }
 );
-He.displayName = "WeekPicker";
+$e.displayName = "WeekPicker";
 export {
-  He as WeekPicker
+  $e as WeekPicker
 };