@sia.soul/sia-react-ui 0.1.40 → 0.1.42

package/dist/{chunk-ZTJUFVJO.js → chunk-3Q3S6CDZ.js}

@@ -167,38 +167,66 @@ var activeTooltipClose;
 function clampFloating(value, min, max) {
   return Math.min(Math.max(value, min), Math.max(min, max));
 }
-function resolveFloatingPosition(trigger, overlay, placement) {
+function normalizeFloatingPlacement(placement) {
+  const aliases = {
+    topLeft: "top-start",
+    topRight: "top-end",
+    bottomLeft: "bottom-start",
+    bottomRight: "bottom-end",
+    leftTop: "left-start",
+    leftBottom: "left-end",
+    rightTop: "right-start",
+    rightBottom: "right-end"
+  };
+  return aliases[placement] ?? placement;
+}
+function resolveFloatingPosition(trigger, overlay, placement, pointAtCenter, adjust) {
   const viewportWidth = document.documentElement.clientWidth;
   const viewportHeight = document.documentElement.clientHeight;
-  let resolvedPlacement = placement;
-  if (placement.startsWith("top") && trigger.top - overlay.height - FLOATING_GAP < FLOATING_VIEWPORT_PADDING && trigger.bottom + overlay.height + FLOATING_GAP <= viewportHeight - FLOATING_VIEWPORT_PADDING) {
-    resolvedPlacement = placement.replace("top", "bottom");
-  } else if (placement.startsWith("bottom") && trigger.bottom + overlay.height + FLOATING_GAP > viewportHeight - FLOATING_VIEWPORT_PADDING && trigger.top - overlay.height - FLOATING_GAP >= FLOATING_VIEWPORT_PADDING) {
-    resolvedPlacement = placement.replace("bottom", "top");
-  } else if (placement === "left" && trigger.left - overlay.width - FLOATING_GAP < FLOATING_VIEWPORT_PADDING && trigger.right + overlay.width + FLOATING_GAP <= viewportWidth - FLOATING_VIEWPORT_PADDING) {
-    resolvedPlacement = "right";
-  } else if (placement === "right" && trigger.right + overlay.width + FLOATING_GAP > viewportWidth - FLOATING_VIEWPORT_PADDING && trigger.left - overlay.width - FLOATING_GAP >= FLOATING_VIEWPORT_PADDING) {
-    resolvedPlacement = "left";
+  let resolvedPlacement = normalizeFloatingPlacement(placement);
+  const side = resolvedPlacement.split("-")[0];
+  const available = { top: trigger.top, bottom: viewportHeight - trigger.bottom, left: trigger.left, right: viewportWidth - trigger.right };
+  const opposite = { top: "bottom", bottom: "top", left: "right", right: "left" };
+  const preferred = side;
+  const other = opposite[preferred];
+  const needed = (side === "top" || side === "bottom" ? overlay.height : overlay.width) + FLOATING_GAP + FLOATING_VIEWPORT_PADDING;
+  if (adjust && available[preferred] < needed && available[other] > available[preferred]) {
+    resolvedPlacement = resolvedPlacement.replace(preferred, other);
   }
-  let top = trigger.top;
-  let left = trigger.left;
-  if (resolvedPlacement.startsWith("top") || resolvedPlacement.startsWith("bottom")) {
-    top = resolvedPlacement.startsWith("top") ? trigger.top - overlay.height - FLOATING_GAP : trigger.bottom + FLOATING_GAP;
-    left = resolvedPlacement.endsWith("-start") ? trigger.left : resolvedPlacement.endsWith("-end") ? trigger.right - overlay.width : trigger.left + (trigger.width - overlay.width) / 2;
-  } else {
-    top = trigger.top + (trigger.height - overlay.height) / 2;
-    left = resolvedPlacement === "left" ? trigger.left - overlay.width - FLOATING_GAP : trigger.right + FLOATING_GAP;
+  const vertical = resolvedPlacement.startsWith("top") || resolvedPlacement.startsWith("bottom");
+  const start = resolvedPlacement.endsWith("-start");
+  const end = resolvedPlacement.endsWith("-end");
+  let top = vertical ? resolvedPlacement.startsWith("top") ? trigger.top - overlay.height - FLOATING_GAP : trigger.bottom + FLOATING_GAP : start ? trigger.top : end ? trigger.bottom - overlay.height : trigger.top + (trigger.height - overlay.height) / 2;
+  let left = vertical ? start ? trigger.left : end ? trigger.right - overlay.width : trigger.left + (trigger.width - overlay.width) / 2 : resolvedPlacement.startsWith("left") ? trigger.left - overlay.width - FLOATING_GAP : trigger.right + FLOATING_GAP;
+  if (adjust) {
+    if (vertical) left = clampFloating(left, FLOATING_VIEWPORT_PADDING, viewportWidth - overlay.width - FLOATING_VIEWPORT_PADDING);
+    else top = clampFloating(top, FLOATING_VIEWPORT_PADDING, viewportHeight - overlay.height - FLOATING_VIEWPORT_PADDING);
   }
-  top = clampFloating(top, FLOATING_VIEWPORT_PADDING, viewportHeight - overlay.height - FLOATING_VIEWPORT_PADDING);
-  left = clampFloating(left, FLOATING_VIEWPORT_PADDING, viewportWidth - overlay.width - FLOATING_VIEWPORT_PADDING);
   const result = { top, left, placement: resolvedPlacement };
-  if (resolvedPlacement.startsWith("top") || resolvedPlacement.startsWith("bottom")) {
-    result.arrowX = resolvedPlacement.endsWith("-start") ? clampFloating(FLOATING_ARROW_EDGE_OFFSET, 8, overlay.width - 16) : resolvedPlacement.endsWith("-end") ? clampFloating(overlay.width - FLOATING_ARROW_EDGE_OFFSET - 8, 8, overlay.width - 16) : clampFloating(trigger.left + trigger.width / 2 - left - 4, 8, overlay.width - 16);
-  } else {
-    result.arrowY = clampFloating(trigger.top + trigger.height / 2 - top - 4, 8, overlay.height - 16);
-  }
+  const size = vertical ? trigger.width : trigger.height;
+  const anchorStart = vertical ? trigger.left : trigger.top;
+  const edge = Math.min(size / 2, FLOATING_ARROW_EDGE_OFFSET + 4);
+  const target = anchorStart + (pointAtCenter || !start && !end ? size / 2 : start ? edge : size - edge);
+  if (vertical) result.arrowX = clampFloating(target - left - 4, 8, overlay.width - 16);
+  else result.arrowY = clampFloating(target - top - 4, 8, overlay.height - 16);
   return result;
 }
+function isFloatingAnchorHidden(anchor, rect) {
+  let left = 0, top = 0, right = document.documentElement.clientWidth, bottom = document.documentElement.clientHeight;
+  for (let parent = anchor.parentElement; parent; parent = parent.parentElement) {
+    const css = getComputedStyle(parent);
+    const bounds = parent.getBoundingClientRect();
+    if (/(auto|scroll|hidden|clip)/.test(css.overflowX)) {
+      left = Math.max(left, bounds.left);
+      right = Math.min(right, bounds.right);
+    }
+    if (/(auto|scroll|hidden|clip)/.test(css.overflowY)) {
+      top = Math.max(top, bounds.top);
+      bottom = Math.min(bottom, bounds.bottom);
+    }
+  }
+  return rect.right <= left || rect.left >= right || rect.bottom <= top || rect.top >= bottom;
+}
 function Floating({
   children,
   content,
@@ -209,6 +237,7 @@ function Floating({
   mouseEnterDelay = 0.1,
   mouseLeaveDelay = 0.1,
   arrow = true,
+  autoAdjustOverflow = true,
   color,
   className = "",
   overlayClassName = "",
@@ -216,6 +245,7 @@ function Floating({
   onOpenChange
 }) {
   const rootRef = useRef2(null);
+  const triggerElementRef = useRef2(null);
   const overlayRef = useRef2(null);
   const enterTimer = useRef2();
   const leaveTimer = useRef2();
@@ -267,28 +297,42 @@ function Floating({
       setPosition(void 0);
       return;
     }
+    const getAnchor = () => {
+      const root = rootRef.current;
+      const target = triggerElementRef.current;
+      return target && root?.contains(target) ? target : root?.firstElementChild ?? root;
+    };
     const update = () => {
       if (!rootRef.current || !overlayRef.current) return;
-      setPosition(resolveFloatingPosition(rootRef.current.getBoundingClientRect(), overlayRef.current.getBoundingClientRect(), placement));
+      const anchor2 = getAnchor();
+      if (anchor2) {
+        const rect = anchor2.getBoundingClientRect();
+        const next = resolveFloatingPosition(rect, overlayRef.current.getBoundingClientRect(), placement, typeof arrow === "object" && !!arrow.pointAtCenter, autoAdjustOverflow);
+        next.hidden = isFloatingAnchorHidden(anchor2, rect);
+        setPosition(next);
+      }
     };
     update();
     window.addEventListener("resize", update);
     window.addEventListener("scroll", update, true);
     const observer = new ResizeObserver(update);
     if (rootRef.current) observer.observe(rootRef.current);
+    const anchor = getAnchor();
+    if (anchor) observer.observe(anchor);
     if (overlayRef.current) observer.observe(overlayRef.current);
     return () => {
       window.removeEventListener("resize", update);
       window.removeEventListener("scroll", update, true);
       observer.disconnect();
     };
-  }, [children, content, placement, visible]);
+  }, [children, content, placement, visible, autoAdjustOverflow, typeof arrow === "object" && arrow.pointAtCenter]);
   useEffect2(() => () => {
     clearTimers();
     if (activeTooltipClose === closeSelfRef.current) activeTooltipClose = void 0;
   }, []);
   const child = cloneElement(children, {
     ...triggers.includes("hover") ? { onMouseEnter: (event) => {
+      triggerElementRef.current = event.currentTarget;
       children.props.onMouseEnter?.(event);
       show(mouseEnterDelay);
     }, onMouseLeave: (event) => {
@@ -296,6 +340,7 @@ function Floating({
       hide(mouseLeaveDelay);
     } } : {},
     ...triggers.includes("focus") ? { onFocus: (event) => {
+      triggerElementRef.current = event.currentTarget;
       children.props.onFocus?.(event);
       show();
     }, onBlur: (event) => {
@@ -303,6 +348,7 @@ function Floating({
       hide();
     } } : {},
     ...triggers.includes("click") ? { onClick: (event) => {
+      triggerElementRef.current = event.currentTarget;
       children.props.onClick?.(event);
       if (visible) closeNow();
       else openNow();
@@ -317,14 +363,14 @@ function Floating({
         id: contentId,
         role,
         "data-custom-color": color ? "" : void 0,
-        className: `sia-floating__overlay sia-floating__overlay--${position?.placement ?? placement} ${overlayClassName}`.trim(),
+        className: `sia-floating__overlay sia-floating__overlay--${position?.placement ?? normalizeFloatingPlacement(placement)} ${overlayClassName}`.trim(),
         style: {
           "--sia-floating-color": color,
           "--sia-floating-arrow-x": position?.arrowX == null ? void 0 : `${position.arrowX}px`,
           "--sia-floating-arrow-y": position?.arrowY == null ? void 0 : `${position.arrowY}px`,
           top: position?.top ?? 0,
           left: position?.left ?? 0,
-          visibility: position ? "visible" : "hidden"
+          visibility: position && !position.hidden ? "visible" : "hidden"
         },
         onMouseEnter: triggers.includes("hover") ? () => show() : void 0,
         onMouseLeave: triggers.includes("hover") ? () => hide(mouseLeaveDelay) : void 0,

package/dist/{chunk-CEZ4GW3X.js → chunk-IPDCEXQO.js}

@@ -5,7 +5,7 @@ import {
   Popover,
   Tooltip,
   useOverlayLifecycle
-} from "./chunk-ZTJUFVJO.js";
+} from "./chunk-3Q3S6CDZ.js";
 import {
   Dropdown,
   Icon
@@ -458,7 +458,7 @@ function Tabs({
 }
 
 // src/components/Feedback.tsx
-import { useEffect as useEffect2, useMemo as useMemo2, useState as useState4 } from "react";
+import { cloneElement, useEffect as useEffect2, useMemo as useMemo2, useRef as useRef3, useState as useState4 } from "react";
 import { createPortal } from "react-dom";
 import { createRoot } from "react-dom/client";
 import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
@@ -478,11 +478,53 @@ function Popconfirm({
   showCancel = true,
   icon = /* @__PURE__ */ jsx5(Icon, { name: "question", variant: "filled" }),
   onConfirm,
+  onConfirmError,
   onCancel,
-  onOpenChange
+  onOpenChange,
+  arrow = true,
+  autoAdjustOverflow = true,
+  skipConfirm = false
 }) {
   const [visible, setVisible] = useControllableState({ value: open, defaultValue: defaultOpen, onChange: onOpenChange });
   const [loading, setLoading] = useState4(false);
+  const pendingRef = useRef3(false);
+  const requestRef = useRef3(0);
+  function changeVisible(next) {
+    if (!next) {
+      requestRef.current++;
+      pendingRef.current = false;
+      setLoading(false);
+    }
+    setVisible(next);
+  }
+  useEffect2(() => {
+    if (!visible) {
+      requestRef.current++;
+      pendingRef.current = false;
+      setLoading(false);
+    }
+    return () => {
+      requestRef.current++;
+    };
+  }, [visible]);
+  async function confirm(event) {
+    if (disabled || pendingRef.current || okButtonProps?.loading || okButtonProps?.disabled) return;
+    pendingRef.current = true;
+    const request = ++requestRef.current;
+    try {
+      const result = onConfirm?.(event);
+      if (result && typeof result === "object" && typeof result.then === "function") setLoading(true);
+      const resolved = await result;
+      if (request === requestRef.current && resolved !== false && visible) changeVisible(false);
+    } catch (error) {
+      if (request === requestRef.current) onConfirmError?.(error);
+    } finally {
+      if (request === requestRef.current) {
+        pendingRef.current = false;
+        setLoading(false);
+      }
+    }
+  }
   const content = /* @__PURE__ */ jsxs5("div", { className: "sia-popconfirm", children: [
     /* @__PURE__ */ jsxs5("div", { className: "sia-popconfirm__message", children: [
       /* @__PURE__ */ jsx5("span", { children: icon }),
@@ -494,24 +536,21 @@ function Popconfirm({
     /* @__PURE__ */ jsxs5("div", { className: "sia-popconfirm__actions", children: [
       showCancel ? /* @__PURE__ */ jsx5(Button, { size: "small", ...cancelButtonProps, onClick: (event) => {
         cancelButtonProps?.onClick?.(event);
+        if (event.defaultPrevented) return;
         onCancel?.(event);
-        setVisible(false);
+        changeVisible(false);
       }, children: cancelText }) : null,
-      /* @__PURE__ */ jsx5(Button, { size: "small", variant: "primary", ...okButtonProps, loading: loading || okButtonProps?.loading, onClick: async (event) => {
+      /* @__PURE__ */ jsx5(Button, { size: "small", variant: "primary", ...okButtonProps, loading: loading || okButtonProps?.loading, onClick: (event) => {
         okButtonProps?.onClick?.(event);
-        const result = onConfirm?.(event);
-        if (result instanceof Promise) {
-          setLoading(true);
-          try {
-            if (await result !== false) setVisible(false);
-          } finally {
-            setLoading(false);
-          }
-        } else if (result !== false) setVisible(false);
+        if (!event.defaultPrevented) void confirm(event);
       }, children: okText })
     ] })
   ] });
-  return /* @__PURE__ */ jsx5(Popover, { content, placement, trigger: disabled ? [] : trigger, open: visible, onOpenChange: setVisible, children });
+  const target = skipConfirm ? cloneElement(children, { onClick: (event) => {
+    children.props.onClick?.(event);
+    if (!event.defaultPrevented) void confirm(event);
+  } }) : children;
+  return /* @__PURE__ */ jsx5(Popover, { content, placement, arrow, autoAdjustOverflow, trigger: disabled || skipConfirm ? [] : trigger, open: visible && !skipConfirm && !disabled, onOpenChange: changeVisible, children: target });
 }
 function Progress({
   percent = 0,

package/dist/{chunk-6TLANQVX.js → chunk-LWVZEUGJ.js}

@@ -1,7 +1,7 @@
 import {
   FloatingScrollbarProvider,
   Select
-} from "./chunk-ZTJUFVJO.js";
+} from "./chunk-3Q3S6CDZ.js";
 import {
   Icon
 } from "./chunk-XCVAVCIO.js";
@@ -495,11 +495,12 @@ function DateRangePicker({
   const [currentValue, setCurrentValue] = useControllableState({ value: value === void 0 ? void 0 : Array.isArray(value) ? value : ["", ""], defaultValue, onChange });
   const [visible, setVisible] = useControllableState({ value: open, defaultValue: defaultOpen, onChange: onOpenChange });
   const [draftValue, setDraftValue] = useState(currentValue);
-  const [activeIndex, setActiveIndex] = useState(currentValue[0] && !currentValue[1] ? 1 : 0);
+  const [activeIndex, setActiveIndex] = useState(endpointDisabled[0] || currentValue[0] && !currentValue[1] ? 1 : 0);
+  const [confirmedIndex, setConfirmedIndex] = useState(null);
+  const [presetSelected, setPresetSelected] = useState(false);
   const [hoverDate, setHoverDate] = useState("");
   const [viewMonth, setViewMonth] = useState(() => startOfMonth(parseDate(dayFromValue(currentValue[0] || currentValue[1])) ?? /* @__PURE__ */ new Date()));
   const [endViewMonth, setEndViewMonth] = useState(() => startOfMonth(parseDate(dayFromValue(currentValue[1])) ?? addMonths(parseDate(dayFromValue(currentValue[0])) ?? /* @__PURE__ */ new Date(), 1)));
-  const [compactDateTime, setCompactDateTime] = useState(false);
   const showSecond = showSecondFrom(showTime);
   const defaultTime = defaultTimeFrom(showTime);
   const defaultEndTime = defaultTimeFrom(showTime, 1);
@@ -510,51 +511,46 @@ function DateRangePicker({
   const resolvedNeedConfirm = needConfirm ?? Boolean(showTime);
   const rangeDates = [dayFromValue(draftValue[0]), dayFromValue(draftValue[1])];
   const invalidDateTimeRange = Boolean(showTime && draftValue[0] && draftValue[1] && draftValue[0] > draftValue[1]);
-  useEffect(() => {
-    if (!showTime || typeof document === "undefined") {
-      setCompactDateTime(false);
-      return void 0;
-    }
-    const updateLayout = () => {
-      const pairedPanelWidth = 2 * (280 + (showSecond ? 144 : 96) + 1) + 3;
-      setCompactDateTime(document.documentElement.clientWidth < pairedPanelWidth + 16);
-    };
-    updateLayout();
-    window.addEventListener("resize", updateLayout);
-    return () => window.removeEventListener("resize", updateLayout);
-  }, [showSecond, showTime]);
   useEffect(() => {
     if (!visible) return void 0;
     const close = (event) => {
       const target = event.target;
-      if (!rootRef.current?.contains(target) && !popupRef.current?.contains(target)) setVisible(false);
+      if (!rootRef.current?.contains(target) && !popupRef.current?.contains(target)) dismissPanel();
     };
     document.addEventListener("pointerdown", close);
     return () => document.removeEventListener("pointerdown", close);
-  }, [setVisible, visible]);
-  function changeOpen(next) {
-    if (next) {
+  });
+  function dismissPanel() {
+    setVisible(false);
+  }
+  function changeOpen(next, endpoint) {
+    if (next && !visible) {
+      setConfirmedIndex(null);
+      setPresetSelected(false);
       setDraftValue(currentValue);
       setTimes([timePart(currentValue[0], defaultTime), timePart(currentValue[1], defaultEndTime)]);
-      setActiveIndex(endpointDisabled[0] ? 1 : endpointDisabled[1] ? 0 : currentValue[0] && !currentValue[1] ? 1 : 0);
+      setActiveIndex(endpointDisabled[0] ? 1 : endpointDisabled[1] ? 0 : endpoint ?? (currentValue[0] && !currentValue[1] ? 1 : 0));
       const nextStartMonth = startOfMonth(parseDate(dayFromValue(currentValue[0] || currentValue[1])) ?? /* @__PURE__ */ new Date());
       setViewMonth(nextStartMonth);
       setEndViewMonth(startOfMonth(parseDate(dayFromValue(currentValue[1])) ?? addMonths(nextStartMonth, 1)));
     }
+    if (next && endpoint !== void 0 && !endpointDisabled[endpoint]) setActiveIndex(endpoint);
     setVisible(next);
   }
-  function isDisabled(day, index = activeIndex, pairedDateTime = false) {
+  function isDisabled(day, index = activeIndex, dateTimeStep = false) {
     if (endpointDisabled[index]) return true;
     const minimum = minDate ?? props.min;
     const maximum = maxDate ?? props.max;
     if (minimum && day < String(minimum).slice(0, 10)) return true;
     if (maximum && day > String(maximum).slice(0, 10)) return true;
     const from = index === 1 ? rangeDates[0] : void 0;
-    if (pairedDateTime) {
-      const otherEndpoint = index === 0 ? rangeDates[1] : rangeDates[0];
-      if (index === 0 && otherEndpoint && day > otherEndpoint) return true;
-      if (index === 1 && otherEndpoint && day < otherEndpoint) return true;
-      if (otherEndpoint && maxRangeDays && Math.abs(daysBetween(otherEndpoint, day)) >= maxRangeDays) return true;
+    if (dateTimeStep) {
+      const otherIndex2 = index === 0 ? 1 : 0;
+      const otherEndpoint = rangeDates[otherIndex2];
+      if (otherEndpoint && (endpointDisabled[otherIndex2] || confirmedIndex === otherIndex2)) {
+        if (index === 0 && day > otherEndpoint || index === 1 && day < otherEndpoint) return true;
+        if (maxRangeDays && Math.abs(daysBetween(otherEndpoint, day)) >= maxRangeDays) return true;
+      }
     } else if (from && maxRangeDays && Math.abs(daysBetween(from, day)) >= maxRangeDays) return true;
     return disabledDate?.(day, { from, type: "date" }) ?? false;
   }
@@ -562,8 +558,12 @@ function DateRangePicker({
     return showTime ? withTime(day, times[index], showSecond) : day;
   }
   function updateDraft(next) {
+    setPresetSelected(false);
     setDraftValue(next);
     onCalendarChange?.(next);
+    if (!showTime && isValidRange(next) && (next[0] !== currentValue[0] || next[1] !== currentValue[1])) {
+      setCurrentValue(next);
+    }
   }
   function selectDate(day) {
     if (isDisabled(day)) return;
@@ -573,7 +573,6 @@ function DateRangePicker({
       next[index] = buildRangeValue(day, index);
       updateDraft(next);
       if (!resolvedNeedConfirm && isValidRange(next)) {
-        setCurrentValue(next);
         changeOpen(false);
       }
       return;
@@ -591,7 +590,6 @@ function DateRangePicker({
     setActiveIndex(0);
     setHoverDate("");
     if (!resolvedNeedConfirm) {
-      setCurrentValue(ordered);
       changeOpen(false);
     }
   }
@@ -601,16 +599,7 @@ function DateRangePicker({
     nextValue[index] = buildRangeValue(day, index);
     updateDraft(nextValue);
     setHoverDate("");
-    if (!resolvedNeedConfirm && compactDateTime && index === 0) {
-      setActiveIndex(1);
-      setEndViewMonth(startOfMonth(parseDate(day) ?? /* @__PURE__ */ new Date()));
-      return;
-    }
     setActiveIndex(index);
-    if (!resolvedNeedConfirm && nextValue[0] && nextValue[1] && nextValue[0] <= nextValue[1]) {
-      setCurrentValue(nextValue);
-      changeOpen(false);
-    }
   }
   function changeTime(index, nextTime) {
     if (endpointDisabled[index]) return;
@@ -646,11 +635,16 @@ function DateRangePicker({
     }
     return true;
   }
+  const otherIndex = activeIndex === 0 ? 1 : 0;
+  const needsOtherConfirmation = Boolean(showTime && !presetSelected && !endpointDisabled[otherIndex] && confirmedIndex !== otherIndex);
   function confirm() {
-    if (compactDateTime && showTime && activeIndex === 0) {
-      if (!draftValue[0]) return;
-      setActiveIndex(1);
-      setEndViewMonth(startOfMonth(parseDate(dayFromValue(draftValue[1] || draftValue[0])) ?? /* @__PURE__ */ new Date()));
+    if (needsOtherConfirmation) {
+      if (!draftValue[activeIndex] && !allowEmpty[activeIndex]) return;
+      setConfirmedIndex(activeIndex);
+      setActiveIndex(otherIndex);
+      const month = startOfMonth(parseDate(dayFromValue(draftValue[activeIndex])) ?? /* @__PURE__ */ new Date());
+      if (otherIndex === 0) setViewMonth(month);
+      else setEndViewMonth(month);
       setHoverDate("");
       return;
     }
@@ -666,12 +660,13 @@ function DateRangePicker({
     ];
     if (!isValidRange(next)) return;
     updateDraft(next);
+    setConfirmedIndex(null);
+    setPresetSelected(true);
     setTimes([timePart(next[0], defaultTime), timePart(next[1], defaultEndTime)]);
     const nextStartMonth = startOfMonth(parseDate(dayFromValue(next[0] || next[1])) ?? /* @__PURE__ */ new Date());
     setViewMonth(nextStartMonth);
     setEndViewMonth(startOfMonth(parseDate(dayFromValue(next[1])) ?? addMonths(nextStartMonth, 1)));
-    if (!resolvedNeedConfirm) {
-      setCurrentValue(next);
+    if (!showTime && !resolvedNeedConfirm) {
       changeOpen(false);
     }
   }
@@ -721,6 +716,7 @@ function DateRangePicker({
               value: times[index],
               showSecond,
               ariaLabel: `${endpointLabel}\u65F6\u95F4`,
+              disabledTime: endpointDisabled[index] ? () => true : void 0,
               onChange: (nextTime) => changeTime(index, nextTime)
             }
           )
@@ -729,8 +725,9 @@ function DateRangePicker({
       endpointLabel
     );
   }
-  const startFloating = useFloatingPlaceholder({ mode: placeholderMode, placeholder: placeholder[0], filled: Boolean(currentValue[0]), active: visible });
-  const endFloating = useFloatingPlaceholder({ mode: placeholderMode, placeholder: placeholder[1], filled: Boolean(currentValue[1]), active: visible });
+  const displayValue = visible && allowEmpty.some(Boolean) ? draftValue : currentValue;
+  const startFloating = useFloatingPlaceholder({ mode: placeholderMode, placeholder: placeholder[0], filled: Boolean(displayValue[0]), active: visible });
+  const endFloating = useFloatingPlaceholder({ mode: placeholderMode, placeholder: placeholder[1], filled: Boolean(displayValue[1]), active: visible });
   return /* @__PURE__ */ jsxs2("span", { ref: rootRef, className: `sia-picker sia-picker-range-control sia-picker--${size} sia-picker--${status}${visible ? " is-open" : ""}${disabled ? " is-disabled" : ""} ${className}`.trim(), children: [
     /* @__PURE__ */ jsxs2(
       "button",
@@ -746,66 +743,68 @@ function DateRangePicker({
         "aria-describedby": props["aria-describedby"],
         "aria-errormessage": props["aria-errormessage"],
         disabled,
-        onClick: () => changeOpen(!visible),
+        onClick: (event) => {
+          const field = event.target.closest("[data-range-endpoint]");
+          const endpoint = field?.dataset.rangeEndpoint;
+          if (showTime && (endpoint === "0" || endpoint === "1")) {
+            const index = Number(endpoint);
+            if (!endpointDisabled[index]) changeOpen(true, index);
+          } else if (visible) dismissPanel();
+          else changeOpen(true);
+        },
         children: [
-          /* @__PURE__ */ jsxs2("span", { className: `sia-picker-range-control__field${startFloating.className}`, children: [
-            /* @__PURE__ */ jsx2("span", { className: `sia-picker-range-control__value${currentValue[0] ? "" : " is-placeholder"}`, children: currentValue[0] ? formatValue(currentValue[0]) : placeholder[0] }),
+          /* @__PURE__ */ jsxs2("span", { "data-range-endpoint": "0", className: `sia-picker-range-control__field${startFloating.className}${visible && activeIndex === 0 ? " is-active" : ""}`, children: [
+            /* @__PURE__ */ jsx2("span", { className: `sia-picker-range-control__value${displayValue[0] ? "" : " is-placeholder"}`, children: displayValue[0] ? formatValue(displayValue[0]) : placeholder[0] }),
             startFloating.label
           ] }),
           /* @__PURE__ */ jsx2("span", { className: "sia-picker-range-control__separator", children: separator }),
-          /* @__PURE__ */ jsxs2("span", { className: `sia-picker-range-control__field${endFloating.className}`, children: [
-            /* @__PURE__ */ jsx2("span", { className: `sia-picker-range-control__value${currentValue[1] ? "" : " is-placeholder"}`, children: currentValue[1] ? formatValue(currentValue[1]) : placeholder[1] }),
+          /* @__PURE__ */ jsxs2("span", { "data-range-endpoint": "1", className: `sia-picker-range-control__field${endFloating.className}${visible && activeIndex === 1 ? " is-active" : ""}`, children: [
+            /* @__PURE__ */ jsx2("span", { className: `sia-picker-range-control__value${displayValue[1] ? "" : " is-placeholder"}`, children: displayValue[1] ? formatValue(displayValue[1]) : placeholder[1] }),
             endFloating.label
           ] }),
           /* @__PURE__ */ jsx2("span", { className: "sia-picker__icon", "aria-hidden": "true", children: suffixIcon ?? /* @__PURE__ */ jsx2(Icon, { name: "calendar", size: 16 }) })
         ]
       }
     ),
-    allowClear && (currentValue[0] || currentValue[1]) && !disabled ? /* @__PURE__ */ jsx2("button", { type: "button", className: "sia-picker__clear", "aria-label": "\u6E05\u9664\u65E5\u671F\u8303\u56F4", onClick: clearValue, children: /* @__PURE__ */ jsx2(Icon, { name: "circle-close", variant: "filled", size: 15 }) }) : null,
-    /* @__PURE__ */ jsxs2(PopupPortal, { ref: popupRef, anchorRef: rootRef, open: visible, className: `sia-date-panel sia-date-panel--range${showTime ? ` sia-date-panel--with-time sia-date-panel--range-time-${compactDateTime ? "compact" : "paired"}` : ""}${presets?.length ? " sia-date-panel--with-presets" : ""}`, role: "dialog", "aria-label": "\u65E5\u671F\u8303\u56F4\u9009\u62E9\u9762\u677F", children: [
-      /* @__PURE__ */ jsx2("div", { className: "sia-date-panel__body", children: showTime ? /* @__PURE__ */ jsx2("div", { className: "sia-date-panel__range-date-time", children: compactDateTime ? renderDateTimeGroup(activeIndex) : /* @__PURE__ */ jsxs2(Fragment, { children: [
-        renderDateTimeGroup(0),
-        renderDateTimeGroup(1)
-      ] }) }) : /* @__PURE__ */ jsxs2("div", { className: "sia-date-panel__range-calendars", children: [
-        /* @__PURE__ */ jsxs2("section", { className: "sia-date-panel__calendar", children: [
-          /* @__PURE__ */ jsx2(
-            CalendarHeader,
-            {
-              month: viewMonth,
-              range: true,
-              onPreviousYear: () => setViewMonth(addMonths(viewMonth, -12)),
-              onPreviousMonth: () => setViewMonth(addMonths(viewMonth, -1))
-            }
-          ),
-          /* @__PURE__ */ jsx2(CalendarMonth, { month: viewMonth, range: rangeDates, previewEnd: activeIndex === 1 ? hoverDate : "", disabledDate: isDisabled, onSelect: selectDate, onHover: activeIndex === 1 ? setHoverDate : void 0 })
-        ] }),
-        /* @__PURE__ */ jsxs2("section", { className: "sia-date-panel__calendar", children: [
-          /* @__PURE__ */ jsx2(
-            CalendarHeader,
-            {
-              month: addMonths(viewMonth, 1),
-              range: true,
-              onNextMonth: () => setViewMonth(addMonths(viewMonth, 1)),
-              onNextYear: () => setViewMonth(addMonths(viewMonth, 12))
-            }
-          ),
-          /* @__PURE__ */ jsx2(CalendarMonth, { month: addMonths(viewMonth, 1), range: rangeDates, previewEnd: activeIndex === 1 ? hoverDate : "", disabledDate: isDisabled, onSelect: selectDate, onHover: activeIndex === 1 ? setHoverDate : void 0 })
+    allowClear && (displayValue[0] || displayValue[1]) && !disabled ? /* @__PURE__ */ jsx2("button", { type: "button", className: "sia-picker__clear", "aria-label": "\u6E05\u9664\u65E5\u671F\u8303\u56F4", onClick: clearValue, children: /* @__PURE__ */ jsx2(Icon, { name: "circle-close", variant: "filled", size: 15 }) }) : null,
+    /* @__PURE__ */ jsxs2(PopupPortal, { ref: popupRef, anchorRef: rootRef, open: visible, className: `sia-date-panel sia-date-panel--range${showTime ? " sia-date-panel--with-time sia-date-panel--range-time-compact" : ""}${presets?.length ? " sia-date-panel--with-presets" : ""}`, role: "dialog", "aria-label": "\u65E5\u671F\u8303\u56F4\u9009\u62E9\u9762\u677F", children: [
+      /* @__PURE__ */ jsxs2("div", { className: "sia-date-panel__body", children: [
+        presets?.length ? /* @__PURE__ */ jsx2("aside", { className: "sia-date-panel__presets", "aria-label": "\u5FEB\u6377\u65E5\u671F\u8303\u56F4", children: presets.map((preset, index) => /* @__PURE__ */ jsx2("button", { type: "button", onClick: () => applyPreset(preset), children: preset.label }, index)) }) : null,
+        showTime ? /* @__PURE__ */ jsx2("div", { className: "sia-date-panel__range-date-time", children: renderDateTimeGroup(activeIndex) }) : /* @__PURE__ */ jsxs2("div", { className: "sia-date-panel__range-calendars", children: [
+          /* @__PURE__ */ jsxs2("section", { className: "sia-date-panel__calendar", children: [
+            /* @__PURE__ */ jsx2(
+              CalendarHeader,
+              {
+                month: viewMonth,
+                range: true,
+                onPreviousYear: () => setViewMonth(addMonths(viewMonth, -12)),
+                onPreviousMonth: () => setViewMonth(addMonths(viewMonth, -1))
+              }
+            ),
+            /* @__PURE__ */ jsx2(CalendarMonth, { month: viewMonth, range: rangeDates, previewEnd: activeIndex === 1 ? hoverDate : "", disabledDate: isDisabled, onSelect: selectDate, onHover: activeIndex === 1 ? setHoverDate : void 0 })
+          ] }),
+          /* @__PURE__ */ jsxs2("section", { className: "sia-date-panel__calendar", children: [
+            /* @__PURE__ */ jsx2(
+              CalendarHeader,
+              {
+                month: addMonths(viewMonth, 1),
+                range: true,
+                onNextMonth: () => setViewMonth(addMonths(viewMonth, 1)),
+                onNextYear: () => setViewMonth(addMonths(viewMonth, 12))
+              }
+            ),
+            /* @__PURE__ */ jsx2(CalendarMonth, { month: addMonths(viewMonth, 1), range: rangeDates, previewEnd: activeIndex === 1 ? hoverDate : "", disabledDate: isDisabled, onSelect: selectDate, onHover: activeIndex === 1 ? setHoverDate : void 0 })
+          ] })
         ] })
-      ] }) }),
+      ] }),
       /* @__PURE__ */ jsx2(
         DatePanelFooter,
         {
           showToday: showToday && !presets?.length,
-          needConfirm: resolvedNeedConfirm || allowEmpty.some(Boolean),
-          disabledConfirm: compactDateTime && showTime && activeIndex === 0 ? !draftValue[0] : !isValidRange(draftValue),
-          confirmText: compactDateTime && showTime && activeIndex === 0 ? "\u4E0B\u4E00\u6B65" : "\u786E\u5B9A",
+          needConfirm: Boolean(showTime) || resolvedNeedConfirm || allowEmpty.some(Boolean),
+          disabledConfirm: needsOtherConfirmation ? !draftValue[activeIndex] && !allowEmpty[activeIndex] : !isValidRange(draftValue),
           extra: /* @__PURE__ */ jsxs2(Fragment, { children: [
             renderExtraFooter?.(),
-            presets?.map((preset, index) => /* @__PURE__ */ jsx2("button", { type: "button", onClick: () => applyPreset(preset), children: preset.label }, index)),
-            compactDateTime && showTime && activeIndex === 1 ? /* @__PURE__ */ jsx2("button", { type: "button", onClick: () => {
-              setActiveIndex(0);
-              setViewMonth(startOfMonth(parseDate(dayFromValue(draftValue[0])) ?? /* @__PURE__ */ new Date()));
-            }, children: "\u4E0A\u4E00\u6B65" }) : null,
             invalidDateTimeRange ? /* @__PURE__ */ jsx2("small", { className: "sia-date-panel__range-error", children: "\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u65E9\u4E8E\u5F00\u59CB\u65F6\u95F4" }) : maxRangeDays ? /* @__PURE__ */ jsxs2("small", { children: [
               "\u6700\u591A\u9009\u62E9 ",
               maxRangeDays,