chore: fix type

Author: zombieJ

src/NewPicker/PickerInput/SinglePicker.tsx

@@ -100,7 +100,7 @@ function Picker<DateType extends object = any>(
   ref: React.Ref<PickerRef>,
 ) {
   // ========================= Prop =========================
-  const filledProps = useFilledProps(props);
+  const [filledProps, internalPicker, complexPicker] = useFilledProps(props);
 
   const {
     // Style
@@ -138,6 +138,7 @@ function Picker<DateType extends object = any>(
     mode,
     onPanelChange,
     onCalendarChange,
+    multiple,
 
     // Picker Value
     defaultPickerValue,
@@ -179,21 +180,14 @@ function Picker<DateType extends object = any>(
 
   const [mergedOpen, triggerOpen] = useOpen(open, defaultOpen, onOpenChange);
 
-  // ======================== Picker ========================
-  /** Almost same as `picker`, but add `datetime` for `date` with `showTime` */
-  const internalPicker: InternalMode = picker === 'date' && showTime ? 'datetime' : picker;
-
-  /** The picker is `datetime` or `time` */
-  const complexPicker = internalPicker === 'time' || internalPicker === 'datetime';
-  const mergedNeedConfirm = needConfirm ?? complexPicker;
-
   // ======================== Format ========================
   const [formatList, maskFormat] = useFieldFormat(internalPicker, locale, format);
 
   // ======================== Values ========================
   const [mergedValue, setInnerValue, getCalendarValue, triggerCalendarChange] = useInnerValue(
     generateConfig,
     locale,
+    multiple,
     formatList,
     defaultValue,
     value,
@@ -531,7 +525,7 @@ function Picker<DateType extends object = any>(
       hoverValue={hoverValues}
       onHover={onPanelHover}
       // Submit
-      needConfirm={mergedNeedConfirm}
+      needConfirm={needConfirm}
       onSubmit={triggerPartConfirm}
       // Preset
       presets={presetList}
@@ -615,7 +609,7 @@ function Picker<DateType extends object = any>(
     }
 
     // Submit with complex picker
-    if (!mergedOpen && complexPicker && !mergedNeedConfirm && lastOp === 'panel') {
+    if (!mergedOpen && complexPicker && !needConfirm && lastOp === 'panel') {
       triggerOpen(true);
       triggerPartConfirm();
     }

src/NewPicker/PickerInput/hooks/useFlexibleValue.ts

@@ -6,6 +6,7 @@ import useSyncState from '../../hooks/useSyncState';
 import type { FormatType, Locale } from '../../interface';
 import { fillIndex } from '../../util';
 import type { RangePickerProps } from '../RangePicker';
+import type { PickerProps } from '../SinglePicker';
 import useLockEffect from './useLockEffect';
 import { useCalendarValue, useUtil } from './useRangeValue';
 
@@ -18,12 +19,14 @@ const EMPTY_VALUE: any[] = [];
 type TriggerCalendarChange<DateType> = (dates: DateType[]) => void;
 
 export function useInnerValue<DateType extends object = any>(
+  multiple: boolean,
   generateConfig: GenerateConfig<DateType>,
   locale: Locale,
   formatList: FormatType[],
+
   defaultValue?: DateType,
   value?: DateType,
-  onCalendarChange?: RangePickerProps<DateType>['onCalendarChange'],
+  onCalendarChange?: PickerProps<DateType>['onCalendarChange'],
 ) {
   // This is the root value which will sync with controlled or uncontrolled value
   const [innerValue, setInnerValue] = useMergedState(defaultValue, {
@@ -45,6 +48,10 @@ export function useInnerValue<DateType extends object = any>(
     formatList,
   );
 
+  function pickByMultiple<T>(values: T[]): any {
+    return multiple ? values : values[0];
+  }
+
   const triggerCalendarChange: TriggerCalendarChange<DateType> = useEvent((dates) => {
     const clone: DateType[] = [...dates];
 
@@ -56,7 +63,7 @@ export function useInnerValue<DateType extends object = any>(
 
       // Trigger calendar change event
       if (onCalendarChange) {
-        onCalendarChange(clone, getDateTexts(clone), {
+        onCalendarChange(pickByMultiple(clone), pickByMultiple(getDateTexts(clone)), {
           range: isSameStart ? 'end' : 'start',
         });
       }

src/NewPicker/PickerInput/hooks/useRangeValue.ts

@@ -33,14 +33,18 @@ const EMPTY_VALUE: [null, null] = [null, null];
 
 type TriggerCalendarChange<DateType> = ([start, end]: RangeValueType<DateType>) => void;
 
+type RefillType<T> = {
+  [P in keyof T]: string;
+};
+
 export function useUtil<
   DateType extends object = any,
   MergedValueType extends DateType[] = RangeValueType<DateType>,
 >(generateConfig: GenerateConfig<DateType>, locale: Locale, formatList: FormatType[]) {
-  const getDateTexts = ([start, end]: RangeValueType<DateType>) => {
-    return [start, end].map((date) =>
+  const getDateTexts = (dates: MergedValueType) => {
+    return dates.map((date) =>
       formatValue(date, { generateConfig, locale, format: formatList[0] }),
-    ) as [string, string];
+    ) as any as RefillType<Required<MergedValueType>>;
   };
 
   const isSameDates = (source: MergedValueType, target: MergedValueType) => {
@@ -116,7 +120,8 @@ export function useInnerValue<DateType extends object = any>(
 
       // Trigger calendar change event
       if (onCalendarChange) {
-        onCalendarChange(clone, getDateTexts(clone), {
+        const cellTexts = getDateTexts(clone);
+        onCalendarChange(clone, cellTexts, {
           range: isSameStart ? 'end' : 'start',
         });
       }