chore: unique

react-component · Dec 7, 2023 · c23740e · c23740e
1 parent a4c2bf7
commit c23740e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/src/NewPicker/PickerInput/SinglePicker.tsx b/src/NewPicker/PickerInput/SinglePicker.tsx
@@ -92,10 +92,22 @@ export interface MultiplePickerProps<DateType extends object> extends BasePicker
   onCalendarChange?: (date: DateType[], dateString: string[], info: BaseInfo) => void;
 }
 
-export type PickerProps<DateType extends object> =
+export type PickerProps<DateType extends object = any> =
   | SinglePickerProps<DateType>
   | MultiplePickerProps<DateType>;
 
+type InternalPickerProps<DateType extends object = any> = Omit<
+  MultiplePickerProps<DateType>,
+  'onChange' | 'onCalendarChange'
+> & {
+  onChange?: (date: DateType | DateType[], dateString: string | string[]) => void;
+  onCalendarChange?: (
+    date: DateType | DateType[],
+    dateString: string | string[],
+    info: BaseInfo,
+  ) => void;
+};
+
 function Picker<DateType extends object = any>(
   props: PickerProps<DateType>,
   ref: React.Ref<PickerRef>,
@@ -171,7 +183,7 @@ function Picker<DateType extends object = any>(
 
     // Native
     onClick,
-  } = filledProps;
+  } = filledProps as InternalPickerProps<DateType>;
 
   // ========================= Refs =========================
   const selectorRef = usePickerRef(ref);
@@ -185,11 +197,13 @@ function Picker<DateType extends object = any>(
   const [formatList, maskFormat] = useFieldFormat(internalPicker, locale, format);
 
   // ======================= Calendar =======================
-  const onInternalCalendarChange: any = (
-    dates: DateType[],
-    dateStrings: string[],
-    info: BaseInfo,
-  ) => {};
+  function pickerParam<T>(values: T | T[]) {
+    return multiple ? values : values[0];
+  }
+
+  const onInternalCalendarChange = (dates: DateType[], dateStrings: string[], info: BaseInfo) => {
+    onCalendarChange?.(pickerParam(dates), pickerParam(dateStrings), info);
+  };
 
   // ======================== Values ========================
   const [mergedValue, setInnerValue, getCalendarValue, triggerCalendarChange] = useInnerValue(

diff --git a/src/NewPicker/PickerInput/hooks/useFilledProps.ts b/src/NewPicker/PickerInput/hooks/useFilledProps.ts
@@ -31,8 +31,9 @@ type ToArrayType<T> = T extends any[] ? T : [T];
 
 /**
  * Align the outer props with unique typed and fill undefined props.
- * This is shared with both RangePicker and Picker.
- * This will auto handle the legacy props fill like `clearIcon` + `allowClear` = `clearIcon`
+ * This is shared with both RangePicker and Picker. This will do:
+ * - Convert `value` & `defaultValue` to array
+ * - handle the legacy props fill like `clearIcon` + `allowClear` = `clearIcon`
  */
 export default function useFilledProps<
   DateType extends object,