@bigbinary/neeto-atoms 1.1.1 → 1.1.3

package/dist/cjs/{DatePicker-aGLz-3Bz.js → DatePicker-CBxWLALJ.js}

@@ -194,8 +194,8 @@ const getDisplayFormat = (dateFormat, timeFormat, showTime) => {
   const fmt = showTime ? `${dateFormat} ${timeFormat}` : dateFormat;
   return normalizeToDateFnsFormat(fmt);
 };
-const getDatePlaceholder = (dateFormat, timeFormat, showTime, type) => {
-  const single = showTime ? `${dateFormat.toUpperCase()} ${timeFormat}` : dateFormat.toUpperCase();
+const getDatePlaceholder = (dateFormat, type) => {
+  const single = dateFormat.toUpperCase();
   return type === "range" ? `${single} - ${single}` : single;
 };
 const isDatePartComplete = (part, maskEnabled, singleDateLen) => maskEnabled ? part.length >= singleDateLen : part.length > 0;
@@ -208,6 +208,7 @@ const parseRangeText = (text, displayFormat, maskEnabled, singleDateLen) => {
   const to = parseDate(parts[1], displayFormat);
   return from && to ? [from, to] : null;
 };
+const startOfDay = (date) => new Date(date.getFullYear(), date.getMonth(), date.getDate());
 const startOfWeek = (date, weekStartsOn = 0) => {
   const d = new Date(date);
   const diff = (d.getDay() - weekStartsOn + 7) % 7;
@@ -268,10 +269,12 @@ const computeRangePreview = ({
   let from = pendingRange ? pendingRange[0] : committed?.[0] ?? null;
   let to = pendingRange ? pendingRange[1] : committed?.[1] ?? null;
   if (hoveredDate) {
-    if (rangeStep === "from" && !pendingRange?.[0]) {
-      from = hoveredDate;
-      if (to && hoveredDate.getTime() > to.getTime()) to = null;
-    } else if (rangeStep === "to" && !pendingRange?.[1] && !isSameDay(from, hoveredDate)) {
+    if (rangeStep === "from") {
+      if (!(from && to)) {
+        from = hoveredDate;
+        if (to && hoveredDate.getTime() > to.getTime()) to = null;
+      }
+    } else if (!isSameDay(from, hoveredDate)) {
       to = hoveredDate;
       if (from && hoveredDate.getTime() < from.getTime()) from = null;
     }
@@ -317,7 +320,7 @@ const DatePickerFooter = ({
   showNow = true,
   onNow,
   onOk,
-  okLabel = "OK",
+  okDisabled = false,
   className
 }) => {
   const showOkButton = showTime || needConfirm;
@@ -349,7 +352,16 @@ const DatePickerFooter = ({
             className: "me-2"
           }
         ),
-        showOkButton && /* @__PURE__ */ jsxRuntime.jsx(primitives_Button.Button, { size: "sm", onClick: onOk, className: "text-xs", children: okLabel })
+        showOkButton && /* @__PURE__ */ jsxRuntime.jsx(
+          primitives_Button.Button,
+          {
+            size: "sm",
+            disabled: okDisabled,
+            onClick: onOk,
+            className: "text-xs",
+            children: "OK"
+          }
+        )
       ]
     }
   );
@@ -654,149 +666,160 @@ const parsePastedTime = (text, step = 1) => {
 };
 
 const PLACEHOLDERS = ["hh", "mm", "--"];
-const SegmentedTimeInput = ({
-  value,
-  minuteStep,
-  onChange,
-  onErrorChange,
-  invalid = false,
-  disabled = false,
-  autoFocus = false,
-  "aria-describedby": ariaDescribedBy
-}) => {
-  const { t } = reactI18next.useTranslation();
-  const fieldRef = React.useRef(null);
-  const step = minuteStep ?? 1;
-  const [time, setTime] = React.useState(
-    () => segmentedTimeFromValue(value, step)
-  );
-  const lastEmittedRef = React.useRef(value);
-  React.useEffect(() => {
-    if (utils$2.timeValueEquals(value, lastEmittedRef.current)) return;
-    lastEmittedRef.current = value;
-    setTime(segmentedTimeFromValue(value, step));
-  }, [value]);
-  const error = getSegmentedTimeError(time);
-  React.useEffect(() => {
-    onErrorChange(error);
-  }, [error, onErrorChange]);
-  React.useEffect(() => {
-    const snapped = segmentedTimeToValue(time);
-    if (snapped && !utils$2.timeValueEquals(snapped, value)) {
-      lastEmittedRef.current = snapped;
-      onChange(snapped);
-    }
-  }, []);
-  React.useEffect(() => {
-    if (autoFocus) fieldRef.current?.focus();
-  }, [autoFocus]);
-  const update = (next) => {
-    setTime(next);
-    const nextValue = segmentedTimeToValue(next);
-    if (!nextValue || utils$2.timeValueEquals(nextValue, lastEmittedRef.current)) {
-      return;
-    }
-    lastEmittedRef.current = nextValue;
-    onChange(nextValue);
-  };
-  const consume = (event) => {
-    event.preventDefault();
-    event.stopPropagation();
-  };
-  const handleKeyDown = (event) => {
-    const { key } = event;
-    if (key === "Tab") {
-      if (!event.shiftKey || time.active !== 2) return;
-      consume(event);
-      update(togglePeriod(time));
-      return;
-    }
-    if ((event.metaKey || event.ctrlKey) && key === "Backspace") {
-      consume(event);
-      update(emptySegmentedTime());
-      return;
-    }
-    if (event.metaKey || event.ctrlKey || event.altKey) return;
-    let next = null;
-    if (/^[0-9]$/.test(key)) next = typeDigit(time, key, step);
-    else if (/^[ap]$/i.test(key)) {
-      next = typePeriod(time, key.toLowerCase(), step);
-    } else if (/^m$/i.test(key))
-      next = time;
-    else if (key === ":" || key === " " || key === "ArrowRight") {
-      next = nextSegment(time, step);
-    } else if (key === "ArrowLeft") next = previousSegment(time);
-    else if (key === "ArrowUp") next = stepSegment(time, 1, step);
-    else if (key === "ArrowDown") next = stepSegment(time, -1, step);
-    else if (key === "Backspace" || key === "Delete") next = backspace(time);
-    if (!next) return;
-    consume(event);
-    update(next);
-  };
-  const handlePaste = (event) => {
-    event.preventDefault();
-    const pasted = parsePastedTime(event.clipboardData.getData("text"), step);
-    if (pasted) update({ ...segmentedTimeFromValue(pasted, step), active: 2 });
-  };
-  const handleMouseDown = (event) => {
-    if (disabled) return;
-    const segmentEl = event.target.closest(
-      "[data-segment]"
+const SegmentedTimeInput = React.forwardRef(
+  ({
+    value,
+    minuteStep,
+    onChange,
+    onErrorChange,
+    invalid = false,
+    disabled = false,
+    autoFocus = false,
+    "aria-label": ariaLabel,
+    "aria-describedby": ariaDescribedBy,
+    "data-testid": dataTestId = "datepicker-time-input"
+  }, ref) => {
+    const { t } = reactI18next.useTranslation();
+    const fieldRef = React.useRef(null);
+    const step = minuteStep ?? 1;
+    const [time, setTime] = React.useState(
+      () => segmentedTimeFromValue(value, step)
     );
-    if (segmentEl) {
+    const lastEmittedRef = React.useRef(value);
+    React.useEffect(() => {
+      if (utils$2.timeValueEquals(value, lastEmittedRef.current)) return;
+      lastEmittedRef.current = value;
+      setTime(segmentedTimeFromValue(value, step));
+    }, [value]);
+    const error = getSegmentedTimeError(time);
+    React.useEffect(() => {
+      onErrorChange(error);
+    }, [error, onErrorChange]);
+    React.useEffect(() => {
+      const snapped = segmentedTimeToValue(time);
+      if (snapped && !utils$2.timeValueEquals(snapped, value)) {
+        lastEmittedRef.current = snapped;
+        onChange(snapped);
+      }
+    }, []);
+    React.useEffect(() => {
+      if (autoFocus) fieldRef.current?.focus();
+    }, [autoFocus]);
+    React.useImperativeHandle(ref, () => ({
+      focusHour: () => {
+        fieldRef.current?.focus();
+        setTime((current) => ({ ...current, active: 0 }));
+      }
+    }));
+    const update = (next) => {
+      setTime(next);
+      const nextValue = segmentedTimeToValue(next);
+      if (!nextValue || utils$2.timeValueEquals(nextValue, lastEmittedRef.current)) {
+        return;
+      }
+      lastEmittedRef.current = nextValue;
+      onChange(nextValue);
+    };
+    const consume = (event) => {
       event.preventDefault();
-      fieldRef.current?.focus();
-      update(focusSegment(time, Number(segmentEl.dataset.segment), step));
-      return;
-    }
-    update(focusFirstEmptySegment(time));
-  };
-  const segmentText = (index) => {
-    const { text, done } = time[SEGMENT_KEYS[index]];
-    if (!text) return PLACEHOLDERS[index];
-    return index < 2 && !done ? `${text}_` : text;
-  };
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    "div",
-    {
-      ref: fieldRef,
-      role: "group",
-      tabIndex: disabled ? -1 : 0,
-      "aria-label": t("neetoatoms.datePicker.timeField", "Time"),
-      "aria-describedby": ariaDescribedBy,
-      "aria-invalid": invalid || void 0,
-      "aria-disabled": disabled || void 0,
-      "data-testid": "datepicker-time-input",
-      className: utils$1.cn(
-        "group/time flex h-9 w-full cursor-text items-center rounded-md border border-input bg-transparent px-3 text-sm tabular-nums outline-none select-none",
-        "focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50",
-        invalid && "border-destructive",
-        disabled && "pointer-events-none cursor-not-allowed opacity-50"
-      ),
-      onBlur: () => update(finishActiveSegment(time, step)),
-      onKeyDown: handleKeyDown,
-      onMouseDown: handleMouseDown,
-      onPaste: handlePaste,
-      children: SEGMENT_KEYS.map((key, index) => /* @__PURE__ */ jsxRuntime.jsxs(React__default.default.Fragment, { children: [
-        index === 1 && /* @__PURE__ */ jsxRuntime.jsx("span", { "aria-hidden": true, className: "px-0.5 text-muted-foreground", children: ":" }),
-        index === 2 && /* @__PURE__ */ jsxRuntime.jsx("span", { "aria-hidden": true, className: "w-1" }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          "span",
-          {
-            "data-segment": index,
-            "data-testid": `datepicker-time-${key}`,
-            className: utils$1.cn(
-              "min-w-[2ch] px-0.5 text-center whitespace-pre",
-              !time[key].text && "text-muted-foreground",
-              index === time.active && "group-focus/time:shadow-[inset_0_-1.5px_0_var(--color-muted-foreground)]"
-            ),
-            children: segmentText(index)
-          }
-        )
-      ] }, key))
-    }
-  );
-};
+      event.stopPropagation();
+    };
+    const handleKeyDown = (event) => {
+      const { key } = event;
+      if (key === "Tab") {
+        if (!event.shiftKey || time.active !== 2) return;
+        consume(event);
+        update(togglePeriod(time));
+        return;
+      }
+      if ((event.metaKey || event.ctrlKey) && key === "Backspace") {
+        consume(event);
+        update(emptySegmentedTime());
+        return;
+      }
+      if (event.metaKey || event.ctrlKey || event.altKey) return;
+      let next = null;
+      if (/^[0-9]$/.test(key)) next = typeDigit(time, key, step);
+      else if (/^[ap]$/i.test(key)) {
+        next = typePeriod(time, key.toLowerCase(), step);
+      } else if (/^m$/i.test(key))
+        next = time;
+      else if (key === ":" || key === " " || key === "ArrowRight") {
+        next = nextSegment(time, step);
+      } else if (key === "ArrowLeft") next = previousSegment(time);
+      else if (key === "ArrowUp") next = stepSegment(time, 1, step);
+      else if (key === "ArrowDown") next = stepSegment(time, -1, step);
+      else if (key === "Backspace" || key === "Delete") next = backspace(time);
+      if (!next) return;
+      consume(event);
+      update(next);
+    };
+    const handlePaste = (event) => {
+      event.preventDefault();
+      const pasted = parsePastedTime(event.clipboardData.getData("text"), step);
+      if (pasted)
+        update({ ...segmentedTimeFromValue(pasted, step), active: 2 });
+    };
+    const handleMouseDown = (event) => {
+      if (disabled) return;
+      const segmentEl = event.target.closest(
+        "[data-segment]"
+      );
+      if (segmentEl) {
+        event.preventDefault();
+        fieldRef.current?.focus();
+        update(focusSegment(time, Number(segmentEl.dataset.segment), step));
+        return;
+      }
+      update(focusFirstEmptySegment(time));
+    };
+    const segmentText = (index) => {
+      const { text, done } = time[SEGMENT_KEYS[index]];
+      if (!text) return PLACEHOLDERS[index];
+      return index < 2 && !done ? `${text}_` : text;
+    };
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      "div",
+      {
+        ref: fieldRef,
+        role: "group",
+        tabIndex: disabled ? -1 : 0,
+        "aria-label": ariaLabel ?? t("neetoatoms.datePicker.timeField", "Time"),
+        "aria-describedby": ariaDescribedBy,
+        "aria-invalid": invalid || void 0,
+        "aria-disabled": disabled || void 0,
+        "data-testid": dataTestId,
+        className: utils$1.cn(
+          "group/time flex h-9 w-full cursor-text items-center rounded-md border border-input bg-transparent px-3 text-sm tabular-nums outline-none select-none",
+          "focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50",
+          invalid && "border-destructive",
+          disabled && "pointer-events-none cursor-not-allowed opacity-50"
+        ),
+        onBlur: () => update(finishActiveSegment(time, step)),
+        onKeyDown: handleKeyDown,
+        onMouseDown: handleMouseDown,
+        onPaste: handlePaste,
+        children: SEGMENT_KEYS.map((key, index) => /* @__PURE__ */ jsxRuntime.jsxs(React__default.default.Fragment, { children: [
+          index === 1 && /* @__PURE__ */ jsxRuntime.jsx("span", { "aria-hidden": true, className: "px-0.5 text-muted-foreground", children: ":" }),
+          index === 2 && /* @__PURE__ */ jsxRuntime.jsx("span", { "aria-hidden": true, className: "w-1" }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "span",
+            {
+              "data-segment": index,
+              "data-testid": `datepicker-time-${key}`,
+              className: utils$1.cn(
+                "min-w-[2ch] px-0.5 text-center whitespace-pre",
+                !time[key].text && "text-muted-foreground",
+                index === time.active && "group-focus/time:shadow-[inset_0_-1.5px_0_var(--color-muted-foreground)]"
+              ),
+              children: segmentText(index)
+            }
+          )
+        ] }, key))
+      }
+    );
+  }
+);
 SegmentedTimeInput.displayName = "SegmentedTimeInput";
 
 const ERROR_DEFAULTS = {
@@ -998,9 +1021,10 @@ const RangeCalendar = ({
   endMonth,
   onHoverIn,
   onHoverOut,
+  onKeyDown,
   numberOfMonths = 2,
   className
-}) => /* @__PURE__ */ jsxRuntime.jsx("div", { onMouseOver: onHoverIn, onMouseLeave: onHoverOut, children: /* @__PURE__ */ jsxRuntime.jsx(
+}) => /* @__PURE__ */ jsxRuntime.jsx("div", { onKeyDown, onMouseLeave: onHoverOut, onMouseOver: onHoverIn, children: /* @__PURE__ */ jsxRuntime.jsx(
   primitives_Calendar.Calendar,
   {
     mode: "range",
@@ -1022,6 +1046,180 @@ const RangeCalendar = ({
   }
 ) });
 
+const ENDPOINT_LABELS = {
+  from: "Start",
+  to: "End"
+};
+const RangeTimeSection = ({
+  fromDateLabel,
+  toDateLabel,
+  isEndOnStartDay,
+  fromValue,
+  toValue,
+  onFromChange,
+  onToChange,
+  activeEndpoint,
+  onEndpointSelect,
+  minuteStep,
+  onErrorChange,
+  showError,
+  isOrderInvalid,
+  timezoneLabel,
+  fromTimeRef,
+  disabled = false,
+  className
+}) => {
+  const { t } = reactI18next.useTranslation();
+  const id = React.useId();
+  const hintId = `datepicker-time-hint-${id}`;
+  const orderErrorId = `datepicker-time-order-error-${id}`;
+  const [errors, setErrors] = React.useState({ from: null, to: null });
+  const hasError = !!(errors.from || errors.to);
+  React.useEffect(() => {
+    onErrorChange(hasError);
+  }, [hasError, onErrorChange]);
+  const handleErrorChange = React.useCallback(
+    (endpoint, error) => setErrors((previous) => ({ ...previous, [endpoint]: error })),
+    []
+  );
+  const handleFromErrorChange = React.useCallback(
+    (error) => handleErrorChange("from", error),
+    [handleErrorChange]
+  );
+  const handleToErrorChange = React.useCallback(
+    (error) => handleErrorChange("to", error),
+    [handleErrorChange]
+  );
+  const showHint = (minuteStep ?? 1) > 1;
+  const endpoints = [
+    {
+      endpoint: "from",
+      dateLabel: fromDateLabel,
+      value: fromValue,
+      onChange: onFromChange,
+      onFieldErrorChange: handleFromErrorChange
+    },
+    {
+      endpoint: "to",
+      dateLabel: isEndOnStartDay ? t("neetoatoms.datePicker.sameDay", "Same day") : toDateLabel,
+      value: toValue,
+      onChange: onToChange,
+      onFieldErrorChange: handleToErrorChange
+    }
+  ];
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: utils$1.cn("flex flex-col gap-2", className), children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-2 gap-3", children: endpoints.map(
+      ({ endpoint, dateLabel, value, onChange, onFieldErrorChange }) => {
+        const isActive = endpoint === activeEndpoint;
+        const endpointLabel = t(
+          `neetoatoms.datePicker.${endpoint === "from" ? "start" : "end"}`,
+          ENDPOINT_LABELS[endpoint]
+        );
+        const error = errors[endpoint];
+        const errorId = `datepicker-${endpoint}-time-error-${id}`;
+        const errorMessage = showError && error ? t(
+          `neetoatoms.datePicker.errors.${error}`,
+          ERROR_DEFAULTS[error]
+        ) : null;
+        const isInvalid = !!errorMessage || endpoint === "to" && isOrderInvalid;
+        return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex min-w-0 flex-col gap-1.5", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs(
+            "button",
+            {
+              type: "button",
+              "aria-pressed": isActive,
+              tabIndex: -1,
+              "data-testid": `datepicker-${endpoint}-endpoint`,
+              disabled,
+              className: utils$1.cn(
+                "flex min-w-0 items-baseline gap-1.5 rounded-sm text-start text-sm outline-none",
+                "focus-visible:ring-[3px] focus-visible:ring-ring/50",
+                isActive ? "font-medium text-foreground" : "text-muted-foreground hover:text-foreground"
+              ),
+              onClick: () => onEndpointSelect(endpoint),
+              children: [
+                /* @__PURE__ */ jsxRuntime.jsx("span", { children: endpointLabel }),
+                /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate text-xs font-normal text-muted-foreground", children: dateLabel || t("neetoatoms.datePicker.pickADay", "Pick a day") })
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            SegmentedTimeInput,
+            {
+              "aria-describedby": [
+                showHint ? hintId : null,
+                errorMessage ? errorId : null,
+                endpoint === "to" && isOrderInvalid ? orderErrorId : null
+              ].filter(Boolean).join(" ") || void 0,
+              "aria-label": t(
+                `neetoatoms.datePicker.${endpoint === "from" ? "startTime" : "endTime"}`,
+                `${ENDPOINT_LABELS[endpoint]} time`
+              ),
+              "data-testid": `datepicker-${endpoint}-time-input`,
+              disabled,
+              invalid: isInvalid,
+              minuteStep,
+              ref: endpoint === "from" ? fromTimeRef : void 0,
+              value,
+              onChange,
+              onErrorChange: onFieldErrorChange
+            }
+          ),
+          errorMessage && /* @__PURE__ */ jsxRuntime.jsx(
+            "p",
+            {
+              id: errorId,
+              className: "text-xs text-destructive",
+              "data-testid": `datepicker-${endpoint}-time-error`,
+              role: "alert",
+              children: errorMessage
+            }
+          )
+        ] }, endpoint);
+      }
+    ) }),
+    showHint && /* @__PURE__ */ jsxRuntime.jsx(
+      "p",
+      {
+        id: hintId,
+        className: "text-xs text-muted-foreground",
+        "data-testid": "datepicker-time-hint",
+        children: t("neetoatoms.datePicker.timeHint", {
+          step: minuteStep,
+          first: stepExamples(minuteStep)[0],
+          second: stepExamples(minuteStep)[1],
+          defaultValue: "Only {{step}}-minute steps are allowed, like {{first}} or {{second}}."
+        })
+      }
+    ),
+    isOrderInvalid && /* @__PURE__ */ jsxRuntime.jsx(
+      "p",
+      {
+        id: orderErrorId,
+        className: "text-xs text-destructive",
+        "data-testid": "datepicker-time-order-error",
+        role: "alert",
+        children: t(
+          "neetoatoms.datePicker.errors.endBeforeStart",
+          "End time must be after the start time."
+        )
+      }
+    ),
+    timezoneLabel && /* @__PURE__ */ jsxRuntime.jsxs(
+      "p",
+      {
+        className: "mt-1 flex items-center gap-2 text-xs text-muted-foreground",
+        "data-testid": "datepicker-timezone",
+        children: [
+          /* @__PURE__ */ jsxRuntime.jsx(Globe, { "aria-hidden": true, className: "size-3.5 shrink-0" }),
+          timezoneLabel
+        ]
+      }
+    )
+  ] });
+};
+RangeTimeSection.displayName = "RangeTimeSection";
+
 const useRangePicker = ({
   currentValue,
   showTime,
@@ -1030,52 +1228,49 @@ const useRangePicker = ({
   setOpen
 }) => {
   const [pendingRange, setPendingRange] = React.useState(null);
-  const [rangeSelectionStep, setRangeSelectionStep] = React.useState(
-    "from"
-  );
+  const [activeEndpoint, setActiveEndpoint] = React.useState("from");
   const [hoveredDate, setHoveredDate] = React.useState(null);
   const committed = currentValue ?? null;
   const resetTransientState = React.useCallback(() => {
     setPendingRange(null);
-    setRangeSelectionStep("from");
+    setActiveEndpoint("from");
     setHoveredDate(null);
   }, []);
   const handleRangeSelect = React.useCallback(
     (_range, triggerDate) => {
       if (!triggerDate) return;
-      if (showTime || needConfirm) {
-        if (rangeSelectionStep === "from") {
-          const existingTo = pendingRange?.[1] ?? committed?.[1] ?? null;
-          const nextTo = existingTo && triggerDate <= existingTo ? existingTo : null;
-          setPendingRange([triggerDate, nextTo]);
-        } else {
-          const existingFrom = pendingRange?.[0] ?? committed?.[0] ?? null;
-          const nextFrom = existingFrom && triggerDate >= existingFrom ? existingFrom : null;
-          setPendingRange([nextFrom, triggerDate]);
-        }
+      const from = pendingRange ? pendingRange[0] : committed?.[0] ?? null;
+      const to = pendingRange ? pendingRange[1] : committed?.[1] ?? null;
+      const isBeforeFrom = !!from && triggerDate < startOfDay(from);
+      if (activeEndpoint === "from" || !from) {
+        const nextTo = to && triggerDate <= to ? to : null;
+        setPendingRange([triggerDate, nextTo]);
+        setActiveEndpoint("to");
         return;
       }
-      if (rangeSelectionStep === "from" || !pendingRange?.[0]) {
-        const existingTo = pendingRange?.[1] ?? committed?.[1] ?? null;
-        const nextTo = existingTo && triggerDate <= existingTo ? existingTo : null;
-        setPendingRange([triggerDate, nextTo]);
-        setRangeSelectionStep("to");
+      if (showTime || needConfirm) {
+        if (isBeforeFrom) {
+          setPendingRange([triggerDate, null]);
+          return;
+        }
+        setPendingRange([from, triggerDate]);
+        setActiveEndpoint("from");
         return;
       }
-      const [from, to] = orderRange(pendingRange[0], triggerDate);
-      setRangeSelectionStep("from");
-      setPendingRange(null);
-      commitValue([from, to]);
+      const [orderedFrom, orderedTo] = orderRange(from, triggerDate);
+      resetTransientState();
+      commitValue([orderedFrom, orderedTo]);
       setOpen(false);
     },
     [
-      rangeSelectionStep,
+      activeEndpoint,
       pendingRange,
       committed,
       showTime,
       needConfirm,
       commitValue,
-      setOpen
+      setOpen,
+      resetTransientState
     ]
   );
   const handleHoverIn = React.useCallback(
@@ -1088,29 +1283,25 @@ const useRangePicker = ({
     [hoveredDate]
   );
   const handleHoverOut = React.useCallback(() => setHoveredDate(null), []);
-  const memoizedRangeSelected = React.useMemo(() => {
-    const { from, to } = computeRangePreview({
-      pendingRange,
-      committed,
-      hoveredDate,
-      rangeStep: rangeSelectionStep
-    });
-    if (!from && !to) return void 0;
-    return { from: from ?? void 0, to: to ?? void 0 };
-  }, [pendingRange, committed, hoveredDate, rangeSelectionStep]);
   const getPreviewParts = React.useCallback(
     () => computeRangePreview({
       pendingRange,
       committed,
       hoveredDate,
-      rangeStep: rangeSelectionStep
+      rangeStep: activeEndpoint
     }),
-    [pendingRange, committed, hoveredDate, rangeSelectionStep]
+    [pendingRange, committed, hoveredDate, activeEndpoint]
   );
+  const memoizedRangeSelected = React.useMemo(() => {
+    const { from, to } = getPreviewParts();
+    if (!from && !to) return void 0;
+    return { from: from ?? void 0, to: to ?? void 0 };
+  }, [getPreviewParts]);
   return {
     pendingRange,
-    rangeSelectionStep,
-    setRangeSelectionStep,
+    setPendingRange,
+    activeEndpoint,
+    setActiveEndpoint,
     hoveredDate,
     handleRangeSelect,
     handleHoverIn,
@@ -1188,8 +1379,12 @@ const YearPicker = ({
 const TIME_SECTION_CLASS_NAME = "w-0 min-w-full border-t border-border px-3 py-3";
 const SHOW_TIME_CALENDAR_CLASS_NAME = "[--cell-size:--spacing(8.125)]";
 const DEFAULT_ADDED_TIME = { hours: 12, minutes: 0, seconds: 0 };
-const noop = () => {
-};
+const getDefaultEndTime = (minuteStep = 1) => ({
+  hours: 23,
+  minutes: Math.floor(59 / minuteStep) * minuteStep,
+  seconds: 0
+});
+const isSameRange = (a, b) => a?.[0]?.getTime() === b?.[0]?.getTime() && a?.[1]?.getTime() === b?.[1]?.getTime();
 const DatePicker = React.forwardRef(
   ({
     value,
@@ -1238,6 +1433,7 @@ const DatePicker = React.forwardRef(
     const containerRef = React.useRef(null);
     const inputRef = React.useRef(null);
     const cursorPosRef = React.useRef(null);
+    const fromTimeRef = React.useRef(null);
     const popoverContentId = React.useRef(
       `datepicker-popover-${generatedId}`
     ).current;
@@ -1279,12 +1475,7 @@ const DatePicker = React.forwardRef(
     );
     const sizeConfig = SIZE_CONFIG[size];
     const maskEnabled = utils$2.isFixedWidthFormat(displayFormat);
-    const defaultPlaceholder = getDatePlaceholder(
-      dateFormat,
-      timeFormat,
-      showTime,
-      type
-    );
+    const defaultPlaceholder = getDatePlaceholder(dateFormat, type);
     const maskTemplate = React.useMemo(
       () => maskEnabled ? type === "range" ? utils$2.buildRangeMaskTemplate(displayFormat) : utils$2.buildMaskTemplate(displayFormat) : null,
       [displayFormat, type, maskEnabled]
@@ -1359,8 +1550,9 @@ const DatePicker = React.forwardRef(
     };
     const {
       pendingRange,
-      rangeSelectionStep,
-      setRangeSelectionStep,
+      setPendingRange,
+      activeEndpoint,
+      setActiveEndpoint,
       handleRangeSelect,
       handleHoverIn,
       handleHoverOut,
@@ -1374,9 +1566,38 @@ const DatePicker = React.forwardRef(
       commitValue,
       setOpen
     });
+    const isRangeConfirm = type === "range" && (showTime || needConfirm);
+    const committedRange = type === "range" ? currentValue : null;
+    const [draftFrom, draftTo] = orderRange(
+      pendingRange ? pendingRange[0] : committedRange?.[0] ?? null,
+      pendingRange ? pendingRange[1] : committedRange?.[1] ?? null
+    );
+    const draftEnd = draftTo ?? (showTime ? draftFrom : null);
+    const isEndOnStartDay = showTime && !!draftFrom && isSameDay(draftFrom, draftEnd);
+    const draftRange = React.useMemo(() => {
+      if (!draftFrom || !draftEnd) return null;
+      return showTime ? [
+        applyTimeToDate(draftFrom, pendingTime),
+        applyTimeToDate(draftEnd, pendingTimeTo)
+      ] : [draftFrom, draftEnd];
+    }, [draftFrom, draftEnd, showTime, pendingTime, pendingTimeTo]);
+    const isRangeOrderInvalid = showTime && !!draftRange && draftRange[1].getTime() <= draftRange[0].getTime();
+    const applyTypedRange = (range) => {
+      const snapped = range.map(
+        (date) => showTime && minuteStep ? roundToMinuteStep(date, minuteStep) : date
+      );
+      const [from, to] = orderRange(snapped[0], snapped[1]);
+      setPendingRange([startOfDay(from), startOfDay(to)]);
+      setActiveEndpoint("from");
+      if (showTime) {
+        setPendingTime(utils$2.dateToTimeValue(from));
+        setPendingTimeTo(utils$2.dateToTimeValue(to));
+      }
+    };
     React.useEffect(() => {
       if (type !== "range" || !open) return;
-      const { from, to } = getPreviewParts();
+      const { from, to: previewTo } = getPreviewParts();
+      const to = previewTo ?? (showTime ? from : null);
       const fromWithTime = from && showTime ? applyTimeToDate(from, pendingTime) : from;
       const toWithTime = to && showTime ? applyTimeToDate(to, pendingTimeTo) : to;
       const fromText = fromWithTime ? formatDate(fromWithTime, displayFormat) : "";
@@ -1410,7 +1631,9 @@ const DatePicker = React.forwardRef(
         maskEnabled,
         singleDateLen
       );
-      if (range) commitValue(range);
+      if (!range) return;
+      if (isRangeConfirm) applyTypedRange(range);
+      else commitValue(range);
     };
     const commitPendingOnClose = React.useCallback(() => {
       const hasOkButton = showTime || needConfirm;
@@ -1440,14 +1663,9 @@ const DatePicker = React.forwardRef(
       hasTimeError
     ]);
     const closePopover = React.useCallback(() => {
-      if (type === "range" && pendingRange?.[0] && pendingRange?.[1] && !(showTime && hasTimeError)) {
-        const [fromBase, toBase] = orderRange(
-          pendingRange[0],
-          pendingRange[1]
-        );
-        const fromFinal = showTime ? applyTimeToDate(fromBase, pendingTime) : fromBase;
-        const toFinal = showTime ? applyTimeToDate(toBase, pendingTimeTo) : toBase;
-        commitValue([fromFinal, toFinal]);
+      if (type === "range") {
+        const canCommit = draftRange && !(showTime && (hasTimeError || isRangeOrderInvalid)) && !isSameRange(draftRange, committedRange);
+        if (canCommit) commitValue(draftRange);
       } else {
         commitPendingOnClose();
       }
@@ -1457,9 +1675,9 @@ const DatePicker = React.forwardRef(
       commitPendingOnClose,
       setOpen,
       type,
-      pendingRange,
-      pendingTime,
-      pendingTimeTo,
+      draftRange,
+      committedRange,
+      isRangeOrderInvalid,
       showTime,
       resetTransientState,
       hasTimeError
@@ -1482,7 +1700,10 @@ const DatePicker = React.forwardRef(
         setPendingTime(
           fromDate ? utils$2.dateToTimeValue(fromDate) : INITIAL_TIME_VALUE
         );
-        setPendingTimeTo(toDate ? utils$2.dateToTimeValue(toDate) : INITIAL_TIME_VALUE);
+        setPendingTimeTo(
+          toDate ? utils$2.dateToTimeValue(toDate) : getDefaultEndTime(minuteStep)
+        );
+        if (fromDate) setCalendarMonth(fromDate);
         return;
       }
       const dateVal = currentValue;
@@ -1518,11 +1739,6 @@ const DatePicker = React.forwardRef(
       setCalendarMonth(now);
       if (type === "range") {
         handleRangeSelect(void 0, now);
-        if (showTime) {
-          const nowTime = utils$2.dateToTimeValue(now);
-          if (rangeSelectionStep === "from") setPendingTime(nowTime);
-          else setPendingTimeTo(nowTime);
-        }
         return;
       }
       if (showTime || needConfirm) {
@@ -1539,30 +1755,12 @@ const DatePicker = React.forwardRef(
         setIsTimeErrorRequested(true);
         return;
       }
-      if (type === "range" && (showTime || needConfirm)) {
-        const committedRange = currentValue;
-        const fromValue = pendingRange?.[0] ?? committedRange?.[0] ?? null;
-        const toValue = pendingRange?.[1] ?? committedRange?.[1] ?? null;
-        if (rangeSelectionStep === "from" && fromValue) {
-          setRangeSelectionStep("to");
-          setCalendarMonth(
-            new Date(fromValue.getFullYear(), fromValue.getMonth(), 1)
-          );
-          if (showTime && pendingRange?.[0]) {
-            setPendingTimeTo(INITIAL_TIME_VALUE);
-          }
-          return;
-        }
-        if (rangeSelectionStep === "to" && fromValue && toValue) {
-          const [fromBase, toBase] = orderRange(fromValue, toValue);
-          const fromFinal = showTime ? applyTimeToDate(fromBase, pendingTime) : fromBase;
-          const toFinal = showTime ? applyTimeToDate(toBase, pendingTimeTo) : toBase;
-          commitValue([fromFinal, toFinal], showTime);
-          onOk?.([fromFinal, toFinal]);
-          resetTransientState();
-          setOpen(false);
-          return;
-        }
+      if (isRangeConfirm) {
+        if (!draftRange || isRangeOrderInvalid) return;
+        commitValue(draftRange, showTime);
+        onOk?.(draftRange);
+        resetTransientState();
+        setOpen(false);
         return;
       }
       if (pendingDate) {
@@ -1623,12 +1821,8 @@ const DatePicker = React.forwardRef(
           singleDateLen
         );
         if (range) {
-          commitValue(
-            showTime && minuteStep ? [
-              roundToMinuteStep(range[0], minuteStep),
-              roundToMinuteStep(range[1], minuteStep)
-            ] : range
-          );
+          const snapped = showTime && minuteStep ? range.map((date) => roundToMinuteStep(date, minuteStep)) : range;
+          commitValue(orderRange(snapped[0], snapped[1]));
         }
       } else {
         const parsed = parseDate(inputText, displayFormat);
@@ -1682,6 +1876,20 @@ const DatePicker = React.forwardRef(
     );
     const calendarStartMonth = normalizedMinDate ?? (calendarMonth < defaultStartMonth ? calendarMonth : defaultStartMonth);
     const calendarEndMonth = normalizedMaxDate ?? (calendarMonth > defaultEndMonth ? calendarMonth : defaultEndMonth);
+    const handleEndpointSelect = (endpoint) => {
+      setActiveEndpoint(endpoint);
+      const date = endpoint === "from" ? draftFrom : draftEnd;
+      if (!date) return;
+      const monthsAhead = (date.getFullYear() - calendarMonth.getFullYear()) * 12 + date.getMonth() - calendarMonth.getMonth();
+      if (monthsAhead < 0 || monthsAhead > 1) {
+        setCalendarMonth(new Date(date.getFullYear(), date.getMonth(), 1));
+      }
+    };
+    const handleRangeCalendarKeyDown = (e) => {
+      if (e.key !== "Tab" || e.shiftKey || !draftRange) return;
+      e.preventDefault();
+      fromTimeRef.current?.focusHour();
+    };
     const handleGridPickerSelect = (date) => {
       commitValue(date);
       setOpen(false);
@@ -1806,26 +2014,10 @@ const DatePicker = React.forwardRef(
                     startMonth: calendarStartMonth,
                     endMonth: calendarEndMonth
                   }
-                ) : showTime ? /* @__PURE__ */ jsxRuntime.jsx(
-                  RangeCalendar,
-                  {
-                    className: SHOW_TIME_CALENDAR_CLASS_NAME,
-                    todayDate,
-                    weekStartsOn,
-                    month: calendarMonth,
-                    onMonthChange: setCalendarMonth,
-                    selected: memoizedRangeSelected,
-                    onSelect: handleRangeSelect,
-                    disabled: calendarDisabled,
-                    startMonth: calendarStartMonth,
-                    endMonth: calendarEndMonth,
-                    onHoverIn: handleHoverIn,
-                    onHoverOut: handleHoverOut,
-                    numberOfMonths: 1
-                  }
                 ) : /* @__PURE__ */ jsxRuntime.jsx(
                   RangeCalendar,
                   {
+                    className: utils$1.cn(showTime && SHOW_TIME_CALENDAR_CLASS_NAME),
                     todayDate,
                     weekStartsOn,
                     month: calendarMonth,
@@ -1836,25 +2028,31 @@ const DatePicker = React.forwardRef(
                     startMonth: calendarStartMonth,
                     endMonth: calendarEndMonth,
                     onHoverIn: handleHoverIn,
-                    onHoverOut: handleHoverOut
+                    onHoverOut: handleHoverOut,
+                    onKeyDown: showTime ? handleRangeCalendarKeyDown : void 0
                   }
                 ) }),
                 showTime && type === "range" && /* @__PURE__ */ jsxRuntime.jsx(
-                  TimeSection,
+                  RangeTimeSection,
                   {
+                    activeEndpoint,
                     className: TIME_SECTION_CLASS_NAME,
                     disabled,
-                    hasTime: true,
-                    optional: false,
+                    fromDateLabel: formatDate(draftFrom, dateFormat),
+                    fromTimeRef,
+                    fromValue: pendingTime,
+                    isOrderInvalid: isRangeOrderInvalid,
+                    minuteStep,
                     showError: isTimeErrorRequested,
                     timezoneLabel,
-                    value: rangeSelectionStep === "from" ? pendingTime : pendingTimeTo,
-                    onChange: rangeSelectionStep === "from" ? setPendingTime : setPendingTimeTo,
-                    minuteStep,
+                    isEndOnStartDay,
+                    toDateLabel: formatDate(draftTo, dateFormat),
+                    toValue: pendingTimeTo,
+                    onEndpointSelect: handleEndpointSelect,
                     onErrorChange: setHasTimeError,
-                    onHasTimeChange: noop
-                  },
-                  rangeSelectionStep
+                    onFromChange: setPendingTime,
+                    onToChange: setPendingTimeTo
+                  }
                 ),
                 showTime && type !== "range" && /* @__PURE__ */ jsxRuntime.jsx(
                   TimeSection,
@@ -1880,10 +2078,10 @@ const DatePicker = React.forwardRef(
                     timezone,
                     onTimezoneChange,
                     nowDisabled: calendarDisabled(todayDate),
-                    showNow,
+                    showNow: showNow && !(type === "range" && showTime),
                     onNow: handleNow,
-                    onOk: handleOk,
-                    okLabel: type === "range" && (showTime || needConfirm) && rangeSelectionStep === "from" ? "Next" : "OK"
+                    okDisabled: isRangeConfirm && (!draftRange || isRangeOrderInvalid),
+                    onOk: handleOk
                   }
                 )
               ]
@@ -1917,4 +2115,4 @@ const DatePicker = React.forwardRef(
 DatePicker.displayName = "DatePicker";
 
 exports.DatePicker = DatePicker;
-//# sourceMappingURL=DatePicker-aGLz-3Bz.js.map
+//# sourceMappingURL=DatePicker-CBxWLALJ.js.map