@bigbinary/neeto-atoms 1.0.69 → 1.0.71

package/dist/cjs/{DatePicker-D_B6oyc9.js → DatePicker-Ccylp0hF.js}

@@ -1033,129 +1033,143 @@ const DatePicker = React.forwardRef(
     const weekRowHoverClassName = picker === "week" ? "[&_button]:!transition-none [&:hover_button]:!bg-primary [&:hover_button]:!text-primary-foreground [&:hover_button]:!rounded-none [&:hover_button]:cursor-pointer" : void 0;
     const ariaDescribedBy = [error ? errorId : null, helpText ? helpTextId : null].filter(Boolean).join(" ") || void 0;
     const calendarSelected = () => {
-      if (showTime || needConfirm) return pendingDate ?? void 0;
+      if (showTime || needConfirm) {
+        return pendingDate ?? currentValue ?? void 0;
+      }
       return currentValue ?? void 0;
     };
-    const triggerContent = /* @__PURE__ */ jsxRuntime.jsxs(primitives_Popover.Popover, { open, onOpenChange: trigger ? setOpen : void 0, children: [
-      trigger ? /* @__PURE__ */ jsxRuntime.jsx(primitives_Popover.PopoverTrigger, { asChild: true, children: trigger }) : /* @__PURE__ */ jsxRuntime.jsx(
-        DatePickerTrigger,
-        {
-          containerRef,
-          inputRef,
-          disabled,
-          error,
-          hasField,
-          className,
-          triggerSizeClass: sizeConfig.trigger,
-          inputSizeClass: sizeConfig.input,
-          iconSizeClass: sizeConfig.icon,
-          label,
-          ariaDescribedBy,
-          placeholder: placeholder ?? defaultPlaceholder,
-          inputText,
-          allowClear,
-          timezone,
-          onInputChange: handleInputChange,
-          onInputKeyDown: handleInputKeyDown,
-          onInputFocus: () => {
-            if (!open) openPopover();
-          },
-          onInputBlur: handleInputBlur,
-          onClear: handleClear
-        }
-      ),
-      open && /* @__PURE__ */ jsxRuntime.jsxs(
-        primitives_Popover.PopoverContent,
-        {
-          id: popoverContentId,
-          className: "w-auto p-0",
-          align,
-          side,
-          onOpenAutoFocus: (e) => e.preventDefault(),
-          onCloseAutoFocus: (e) => e.preventDefault(),
-          onPointerDownOutside: (e) => e.preventDefault(),
-          onInteractOutside: (e) => e.preventDefault(),
-          children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: utils$1.cn("flex", showTime && "flex-row"), children: [
-              type === "date" && picker === "month" ? /* @__PURE__ */ jsxRuntime.jsx(
-                MonthPicker,
-                {
-                  value: currentValue ?? null,
-                  displayedYear: calendarMonth.getFullYear(),
-                  onYearChange: (year) => setCalendarMonth(
-                    new Date(year, calendarMonth.getMonth(), 1)
+    const handleTriggerOpenChange = (nextOpen) => {
+      if (nextOpen === open) return;
+      if (nextOpen) openPopover();
+      else closePopover();
+    };
+    const triggerContent = /* @__PURE__ */ jsxRuntime.jsxs(
+      primitives_Popover.Popover,
+      {
+        open,
+        onOpenChange: trigger ? handleTriggerOpenChange : void 0,
+        children: [
+          trigger ? /* @__PURE__ */ jsxRuntime.jsx(primitives_Popover.PopoverTrigger, { asChild: true, children: trigger }) : /* @__PURE__ */ jsxRuntime.jsx(
+            DatePickerTrigger,
+            {
+              containerRef,
+              inputRef,
+              disabled,
+              error,
+              hasField,
+              className,
+              triggerSizeClass: sizeConfig.trigger,
+              inputSizeClass: sizeConfig.input,
+              iconSizeClass: sizeConfig.icon,
+              label,
+              ariaDescribedBy,
+              placeholder: placeholder ?? defaultPlaceholder,
+              inputText,
+              allowClear,
+              timezone,
+              onInputChange: handleInputChange,
+              onInputKeyDown: handleInputKeyDown,
+              onInputFocus: () => {
+                if (!open) openPopover();
+              },
+              onInputBlur: handleInputBlur,
+              onClear: handleClear
+            }
+          ),
+          open && /* @__PURE__ */ jsxRuntime.jsxs(
+            primitives_Popover.PopoverContent,
+            {
+              id: popoverContentId,
+              className: "w-auto p-0",
+              align,
+              side,
+              onOpenAutoFocus: (e) => e.preventDefault(),
+              onCloseAutoFocus: (e) => e.preventDefault(),
+              onPointerDownOutside: (e) => e.preventDefault(),
+              onInteractOutside: (e) => e.preventDefault(),
+              children: [
+                /* @__PURE__ */ jsxRuntime.jsxs("div", { className: utils$1.cn("flex", showTime && "flex-row"), children: [
+                  type === "date" && picker === "month" ? /* @__PURE__ */ jsxRuntime.jsx(
+                    MonthPicker,
+                    {
+                      value: currentValue ?? null,
+                      displayedYear: calendarMonth.getFullYear(),
+                      onYearChange: (year) => setCalendarMonth(
+                        new Date(year, calendarMonth.getMonth(), 1)
+                      ),
+                      onSelect: handleGridPickerSelect,
+                      isDisabled: (date) => isMonthDisabled(date, normalizedMinDate, normalizedMaxDate)
+                    }
+                  ) : type === "date" && picker === "year" ? /* @__PURE__ */ jsxRuntime.jsx(
+                    YearPicker,
+                    {
+                      value: currentValue ?? null,
+                      displayedYear: calendarMonth.getFullYear(),
+                      onYearChange: (year) => setCalendarMonth(new Date(year, 0, 1)),
+                      onSelect: handleGridPickerSelect,
+                      isDisabled: (date) => isYearDisabled(date, normalizedMinDate, normalizedMaxDate)
+                    }
+                  ) : type === "date" ? /* @__PURE__ */ jsxRuntime.jsx(
+                    primitives_Calendar.Calendar,
+                    {
+                      mode: "single",
+                      captionLayout: "dropdown",
+                      today: todayDate,
+                      month: calendarMonth,
+                      onMonthChange: setCalendarMonth,
+                      selected: calendarSelected(),
+                      onSelect: handleSingleDateSelectWithPicker,
+                      disabled: calendarDisabled,
+                      weekStartsOn,
+                      classNames: weekRowHoverClassName ? { week: utils$1.cn("mt-2 flex w-full", weekRowHoverClassName) } : void 0,
+                      ...weekHighlightProps,
+                      ...normalizedMinDate && { fromDate: normalizedMinDate },
+                      ...normalizedMaxDate && { toDate: normalizedMaxDate }
+                    }
+                  ) : /* @__PURE__ */ jsxRuntime.jsx(
+                    RangeCalendar,
+                    {
+                      todayDate,
+                      weekStartsOn,
+                      month: calendarMonth,
+                      onMonthChange: setCalendarMonth,
+                      selected: memoizedRangeSelected,
+                      onSelect: handleRangeSelect,
+                      disabled: calendarDisabled,
+                      fromDate: normalizedMinDate,
+                      toDate: normalizedMaxDate,
+                      onHoverIn: handleHoverIn,
+                      onHoverOut: handleHoverOut
+                    }
                   ),
-                  onSelect: handleGridPickerSelect,
-                  isDisabled: (date) => isMonthDisabled(date, normalizedMinDate, normalizedMaxDate)
-                }
-              ) : type === "date" && picker === "year" ? /* @__PURE__ */ jsxRuntime.jsx(
-                YearPicker,
-                {
-                  value: currentValue ?? null,
-                  displayedYear: calendarMonth.getFullYear(),
-                  onYearChange: (year) => setCalendarMonth(new Date(year, 0, 1)),
-                  onSelect: handleGridPickerSelect,
-                  isDisabled: (date) => isYearDisabled(date, normalizedMinDate, normalizedMaxDate)
-                }
-              ) : type === "date" ? /* @__PURE__ */ jsxRuntime.jsx(
-                primitives_Calendar.Calendar,
-                {
-                  mode: "single",
-                  captionLayout: "dropdown",
-                  today: todayDate,
-                  month: calendarMonth,
-                  onMonthChange: setCalendarMonth,
-                  selected: calendarSelected(),
-                  onSelect: handleSingleDateSelectWithPicker,
-                  disabled: calendarDisabled,
-                  weekStartsOn,
-                  classNames: weekRowHoverClassName ? { week: utils$1.cn("mt-2 flex w-full", weekRowHoverClassName) } : void 0,
-                  ...weekHighlightProps,
-                  ...normalizedMinDate && { fromDate: normalizedMinDate },
-                  ...normalizedMaxDate && { toDate: normalizedMaxDate }
-                }
-              ) : /* @__PURE__ */ jsxRuntime.jsx(
-                RangeCalendar,
-                {
-                  todayDate,
-                  weekStartsOn,
-                  month: calendarMonth,
-                  onMonthChange: setCalendarMonth,
-                  selected: memoizedRangeSelected,
-                  onSelect: handleRangeSelect,
-                  disabled: calendarDisabled,
-                  fromDate: normalizedMinDate,
-                  toDate: normalizedMaxDate,
-                  onHoverIn: handleHoverIn,
-                  onHoverOut: handleHoverOut
-                }
-              ),
-              showTime && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-inline-start border-border", children: /* @__PURE__ */ jsxRuntime.jsx(
-                TimePickerPanel.TimePickerPanel,
-                {
-                  value: pendingTime,
-                  onChange: setPendingTime,
-                  format: timePickerFormat,
-                  showSeconds,
-                  disabled
-                }
-              ) })
-            ] }),
-            showFooter && /* @__PURE__ */ jsxRuntime.jsx(
-              DatePickerFooter,
-              {
-                showTime,
-                needConfirm,
-                timezone,
-                onTimezoneChange,
-                onNow: handleNow,
-                onOk: handleOk
-              }
-            )
-          ]
-        }
-      )
-    ] });
+                  showTime && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-inline-start border-border", children: /* @__PURE__ */ jsxRuntime.jsx(
+                    TimePickerPanel.TimePickerPanel,
+                    {
+                      value: pendingTime,
+                      onChange: setPendingTime,
+                      format: timePickerFormat,
+                      showSeconds,
+                      disabled
+                    }
+                  ) })
+                ] }),
+                showFooter && /* @__PURE__ */ jsxRuntime.jsx(
+                  DatePickerFooter,
+                  {
+                    showTime,
+                    needConfirm,
+                    timezone,
+                    onTimezoneChange,
+                    onNow: handleNow,
+                    onOk: handleOk
+                  }
+                )
+              ]
+            }
+          )
+        ]
+      }
+    );
     if (!hasField) {
       return /* @__PURE__ */ jsxRuntime.jsx("div", { ref, className, children: triggerContent });
     }
@@ -1180,4 +1194,4 @@ const DatePicker = React.forwardRef(
 DatePicker.displayName = "DatePicker";
 
 exports.DatePicker = DatePicker;
-//# sourceMappingURL=DatePicker-D_B6oyc9.js.map
+//# sourceMappingURL=DatePicker-Ccylp0hF.js.map