@ceed/ads 1.8.0-next.6 → 1.8.0-next.8

package/dist/components/DateRangePicker/DateRangePicker.d.ts

@@ -1,6 +1,9 @@
 import React from "react";
 import Input from "../Input";
 interface BaseDateRangePickerProps {
+    /**
+     * props.format 의 형식을 따라야 한다.
+     */
     value?: string;
     defaultValue?: string;
     onChange?: (event: {
@@ -19,7 +22,14 @@ interface BaseDateRangePickerProps {
     maxDate?: string;
     disableFuture?: boolean;
     disablePast?: boolean;
+    /**
+     * value, onChange의 값은 해당 포맷을 따른다.
+     */
     format?: string;
+    /**
+     * Input 에 표시되는 값의 포맷을 지정한다.
+     */
+    displayFormat?: string;
     inputReadOnly?: boolean;
     hideClearButton?: boolean;
 }

package/dist/components/FilterMenu/FilterMenu.d.ts

@@ -4,6 +4,7 @@ interface FilterMenuProps {
     filters?: FilterItem[];
     values?: Record<string, any>;
     defaultValues?: Record<string, any>;
+    resetValues?: Record<string, any>;
     onChange?: (values: Record<string, any>) => void;
     onClose?: () => void;
     /**

package/dist/components/FilterMenu/types.d.ts

@@ -24,7 +24,7 @@ export interface FilterRadioGroupItem extends FilterBaseItem<string | number> {
         value: string | number;
     }[];
 }
-export interface FilterDateRangeItem extends FilterBaseItem<[DateTime, DateTime]>, Pick<DateRangePickerProps, "minDate" | "maxDate" | "disableFuture" | "disablePast" | "format" | "inputReadOnly" | "hideClearButton"> {
+export interface FilterDateRangeItem extends FilterBaseItem<[DateTime, DateTime]>, Pick<DateRangePickerProps, "minDate" | "maxDate" | "disableFuture" | "disablePast" | "format" | "displayFormat" | "inputReadOnly" | "hideClearButton"> {
     type: "date-range";
 }
 export interface FilterCurrencyInputItem extends FilterBaseItem<number>, Pick<CurrencyInputProps, "max" | "placeholder" | "useMinorUnit" | "currency"> {

package/dist/index.cjs

@@ -4157,7 +4157,9 @@ var CalendarButton2 = (0, import_joy34.styled)(IconButton_default, {
   "&:focus": {
     "--Icon-color": "currentColor",
     outlineOffset: `${theme.getCssVar("focus-thickness")}`,
-    outline: `${theme.getCssVar("focus-thickness")} solid ${theme.getCssVar("palette-focusVisible")}`
+    outline: `${theme.getCssVar("focus-thickness")} solid ${theme.getCssVar(
+      "palette-focusVisible"
+    )}`
   }
 }));
 var StyledPopper2 = (0, import_joy34.styled)(import_base3.Popper, {
@@ -4183,6 +4185,32 @@ var DateRangePickerRoot = (0, import_joy34.styled)("div", {
 })({
   width: "100%"
 });
+var validValueFormat2 = (value, format) => {
+  try {
+    const [date1Str, date2Str] = value.split(" - ");
+    if (!date1Str || !date2Str) {
+      return false;
+    }
+    const parsedDate1 = parseDate2(date1Str, format);
+    const parsedDate2 = parseDate2(date2Str, format);
+    if (parsedDate1.toString() === "Invalid Date" || parsedDate2.toString() === "Invalid Date") {
+      return false;
+    }
+    const formattedValue = formatValueString2(
+      [parsedDate1, parsedDate2],
+      format
+    );
+    if (value !== formattedValue) {
+      return false;
+    }
+    const regex = new RegExp(
+      `^${format.replace(/Y/g, "\\d").replace(/M/g, "\\d").replace(/D/g, "\\d")} - ${format.replace(/Y/g, "\\d").replace(/M/g, "\\d").replace(/D/g, "\\d")}$`
+    );
+    return regex.test(value);
+  } catch (e) {
+    return false;
+  }
+};
 var formatValueString2 = ([date1, date2], format) => {
   const getStr = (date) => {
     let day = `${date.getDate()}`;
@@ -4279,6 +4307,7 @@ var DateRangePicker = (0, import_react26.forwardRef)(
       sx,
       className,
       format = "YYYY/MM/DD",
+      displayFormat = "YYYY/MM/DD",
       size,
       inputReadOnly,
       hideClearButton,
@@ -4295,12 +4324,27 @@ var DateRangePicker = (0, import_react26.forwardRef)(
         [props.name, onChange]
       )
     );
+    const [displayValue, setDisplayValue] = (0, import_react26.useState)(
+      () => value ? formatValueString2(parseDates(value, format), displayFormat) : ""
+    );
     const [anchorEl, setAnchorEl] = (0, import_react26.useState)(null);
     const open = Boolean(anchorEl);
     const calendarValue = (0, import_react26.useMemo)(
       () => value ? parseDates(value, format) : void 0,
       [value, format]
     );
+    (0, import_react26.useEffect)(() => {
+      if (value) {
+        try {
+          const dates = parseDates(value, format);
+          const newDisplayValue = formatValueString2(dates, displayFormat);
+          setDisplayValue(newDisplayValue);
+        } catch (error2) {
+        }
+      } else {
+        setDisplayValue("");
+      }
+    }, [displayFormat, value, format]);
     (0, import_react26.useEffect)(() => {
       if (!anchorEl) {
         innerRef.current?.blur();
@@ -4311,9 +4355,41 @@ var DateRangePicker = (0, import_react26.forwardRef)(
     ]);
     const handleChange = (0, import_react26.useCallback)(
       (event) => {
-        setValue(event.target.value);
+        const value2 = event.target.value;
+        setDisplayValue(
+          value2 ? formatValueString2(parseDates(value2, format), displayFormat) : value2
+        );
+        setValue(value2);
       },
-      [setValue]
+      [displayFormat, format, setValue]
+    );
+    const handleDisplayInputChange = (0, import_react26.useCallback)(
+      (event) => {
+        if (event.target.value === "") {
+          handleChange({
+            target: {
+              name: props.name,
+              value: ""
+            }
+          });
+          return;
+        }
+        const isValidDisplayValue = validValueFormat2(
+          event.target.value,
+          displayFormat
+        );
+        if (isValidDisplayValue) {
+          const dates = parseDates(event.target.value, displayFormat);
+          const formattedValue = formatValueString2(dates, format);
+          handleChange({
+            target: {
+              name: props.name,
+              value: formattedValue
+            }
+          });
+        }
+      },
+      [displayFormat, format, handleChange, props.name]
     );
     const handleCalendarToggle = (0, import_react26.useCallback)(
       (event) => {
@@ -4325,10 +4401,26 @@ var DateRangePicker = (0, import_react26.forwardRef)(
     const handleCalendarChange = (0, import_react26.useCallback)(
       ([date1, date2]) => {
         if (!date1 || !date2) return;
-        setValue(formatValueString2([date1, date2], format));
+        const formattedValue = formatValueString2([date1, date2], format);
+        if (props.value !== void 0) {
+          onChange?.({ target: { name: props.name, value: formattedValue } });
+        } else {
+          setDisplayValue(
+            formatValueString2([date1, date2], displayFormat)
+          );
+          setValue(formattedValue);
+        }
         setAnchorEl(null);
       },
-      [setValue, setAnchorEl, format]
+      [
+        props.value,
+        props.name,
+        onChange,
+        setValue,
+        setAnchorEl,
+        format,
+        displayFormat
+      ]
     );
     const handleInputMouseDown = (0, import_react26.useCallback)(
       (event) => {
@@ -4346,17 +4438,21 @@ var DateRangePicker = (0, import_react26.forwardRef)(
         color: error ? "danger" : innerProps.color,
         ref,
         size,
-        value,
-        onChange: handleChange,
+        value: displayValue,
+        onChange: handleDisplayInputChange,
         disabled,
         required,
-        placeholder: `${format} - ${format}`,
+        placeholder: `${displayFormat} - ${displayFormat}`,
         slotProps: {
           input: {
             component: TextMaskAdapter5,
             ref: innerRef,
-            format,
-            sx: { "&:hover": { cursor: inputReadOnly || readOnly ? "default" : "text" } },
+            format: displayFormat,
+            sx: {
+              "&:hover": {
+                cursor: inputReadOnly || readOnly ? "default" : "text"
+              }
+            },
             onMouseDown: handleInputMouseDown
           }
         },
@@ -4426,6 +4522,7 @@ var DateRangePicker = (0, import_react26.forwardRef)(
             color: "neutral",
             onClick: () => {
               setValue("");
+              setDisplayValue("");
               setAnchorEl(null);
             }
           },
@@ -4582,7 +4679,7 @@ function CheckboxGroup(props) {
     {
       key: `${id}-${option.value}`,
       label: option.label,
-      checked: internalValue.includes(option.value),
+      checked: internalValue?.includes(option.value),
       onChange: handleCheckboxChange(option.value)
     }
   )));
@@ -4666,6 +4763,7 @@ function DateRange(props) {
     disableFuture,
     disablePast,
     format = "YYYY/MM/DD",
+    displayFormat,
     inputReadOnly,
     hideClearButton
   } = props;
@@ -4690,6 +4788,12 @@ function DateRange(props) {
       const now = /* @__PURE__ */ new Date();
       const currentYear = now.getFullYear();
       const currentMonth = now.getMonth();
+      const formatDate = (date) => {
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, "0");
+        const day = String(date.getDate()).padStart(2, "0");
+        return `${year}-${month}-${day}`;
+      };
       switch (option) {
         case "all-time":
           return null;
@@ -4697,24 +4801,26 @@ function DateRange(props) {
           const startOfMonth = new Date(currentYear, currentMonth, 1);
           const endOfMonth = new Date(currentYear, currentMonth + 1, 0);
           return [
-            startOfMonth.toISOString().split("T")[0],
-            endOfMonth.toISOString().split("T")[0]
+            formatDate(startOfMonth),
+            formatDate(endOfMonth)
           ];
         }
         case "this-year": {
           const startOfYear = new Date(currentYear, 0, 1);
           const endOfYear = new Date(currentYear, 11, 31);
           return [
-            startOfYear.toISOString().split("T")[0],
-            endOfYear.toISOString().split("T")[0]
+            formatDate(startOfYear),
+            formatDate(endOfYear)
           ];
         }
         case "last-month": {
-          const startOfLastMonth = new Date(currentYear, currentMonth - 1, 1);
-          const endOfLastMonth = new Date(currentYear, currentMonth, 0);
+          const lastMonthYear = currentMonth === 0 ? currentYear - 1 : currentYear;
+          const lastMonth = currentMonth === 0 ? 11 : currentMonth - 1;
+          const startOfLastMonth = new Date(lastMonthYear, lastMonth, 1);
+          const endOfLastMonth = new Date(lastMonthYear, lastMonth + 1, 0);
           return [
-            startOfLastMonth.toISOString().split("T")[0],
-            endOfLastMonth.toISOString().split("T")[0]
+            formatDate(startOfLastMonth),
+            formatDate(endOfLastMonth)
           ];
         }
         case "custom":
@@ -4725,12 +4831,32 @@ function DateRange(props) {
     },
     [internalValue]
   );
+  const determineOptionFromValue = (0, import_react32.useCallback)(
+    (value2) => {
+      if (!value2) {
+        return "all-time";
+      }
+      const options = ["this-month", "this-year", "last-month"];
+      for (const option of options) {
+        const optionRange = getDateRangeForOption(option);
+        if (optionRange && optionRange[0] === value2[0] && optionRange[1] === value2[1]) {
+          return option;
+        }
+      }
+      return "custom";
+    },
+    [getDateRangeForOption]
+  );
   const customDateRangeValue = (0, import_react32.useMemo)(() => {
     if (selectedOption === "custom" && internalValue) {
       return `${internalValue[0]} - ${internalValue[1]}`;
     }
     return "";
   }, [selectedOption, internalValue]);
+  (0, import_react32.useEffect)(() => {
+    const newOption = determineOptionFromValue(internalValue);
+    setSelectedOption(newOption);
+  }, [internalValue, determineOptionFromValue]);
   const handleOptionChange = (0, import_react32.useCallback)(
     (event) => {
       const newOption = event.target.value;
@@ -4792,6 +4918,7 @@ function DateRange(props) {
       disableFuture,
       disablePast,
       format,
+      displayFormat,
       inputReadOnly,
       hideClearButton
     }
@@ -5173,13 +5300,14 @@ function PercentageRange(props) {
   ), /* @__PURE__ */ import_react37.default.createElement(import_joy49.Stack, { direction: "row", spacing: 2, alignItems: "flex-end" }, /* @__PURE__ */ import_react37.default.createElement(
     PercentageInput,
     {
+      key: maxValue,
       label: "Minimum",
       value: minValue,
       onChange: handleMinChange,
       useMinorUnit,
       maxDecimalScale,
       min,
-      max,
+      max: maxValue || max,
       "aria-labelledby": label ? id : void 0,
       "aria-label": "Minimum percentage",
       placeholder: "0%"
@@ -5187,12 +5315,13 @@ function PercentageRange(props) {
   ), /* @__PURE__ */ import_react37.default.createElement(
     PercentageInput,
     {
+      key: minValue,
       label: "Maximum",
       value: maxValue,
       onChange: handleMaxChange,
       useMinorUnit,
       maxDecimalScale,
-      min,
+      min: minValue || min,
       max,
       "aria-labelledby": label ? id : void 0,
       "aria-label": "Maximum percentage",
@@ -5267,6 +5396,7 @@ function FilterMenu(props) {
     filters,
     values,
     defaultValues,
+    resetValues = {},
     onChange,
     onClose,
     useClear,
@@ -5292,11 +5422,11 @@ function FilterMenu(props) {
     onClose?.();
   }, [onChange, onClose, internalValues]);
   const handleClear = (0, import_react39.useCallback)(() => {
-    const clearedValues = defaultValues || {};
+    const clearedValues = resetValues || {};
     setInternalValues(clearedValues);
     onChange?.(clearedValues);
     onClose?.();
-  }, [defaultValues, setInternalValues, onChange, onClose]);
+  }, [resetValues, setInternalValues, onChange, onClose]);
   return /* @__PURE__ */ import_react39.default.createElement(
     ModalDialog,
     {