chore: move more

Author: zombieJ

src/NewPicker/PickerInput/RangePicker.tsx

@@ -129,7 +129,7 @@ function RangePicker<DateType extends object = any>(
   ref: React.Ref<PickerRef>,
 ) {
   // ========================= Prop =========================
-  const filledProps = useFilledProps(props, () => {
+  const [filledProps, internalPicker, complexPicker] = useFilledProps(props, () => {
     const { disabled, allowEmpty } = props;
 
     const mergedDisabled = separateConfig(disabled, false);
@@ -227,14 +227,6 @@ function RangePicker<DateType extends object = any>(
     }
   };
 
-  // ======================== 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);
 
@@ -601,7 +593,7 @@ function RangePicker<DateType extends object = any>(
       hoverValue={hoverValues}
       onHover={onPanelHover}
       // Submit
-      needConfirm={mergedNeedConfirm}
+      needConfirm={needConfirm}
       onSubmit={triggerPartConfirm}
       // Preset
       presets={presetList}
@@ -685,7 +677,7 @@ function RangePicker<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/useFilledProps.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { fillLocale } from '../../hooks/useLocale';
 import { getTimeConfig } from '../../hooks/useTimeConfig';
+import type { InternalMode } from '../../interface';
 import type { RangePickerProps } from '../RangePicker';
 import { fillClearIcon } from '../Selector/hooks/useClearIcon';
 
@@ -15,16 +16,17 @@ type PickedProps<DateType extends object = any> = Pick<
   | 'components'
   | 'clearIcon'
   | 'allowClear'
+  | 'needConfirm'
 > & {
   // RangePicker showTime definition is different with Picker
   showTime?: any;
 };
 
 type ExcludeBooleanType<T> = T extends boolean ? never : T;
 
-/** Align the outer props with unique typed and fill undefined props */
 /**
  * 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`
  */
 export default function useFilledProps<
@@ -34,10 +36,14 @@ export default function useFilledProps<
 >(
   props: InProps,
   updater?: () => UpdaterProps,
-): Omit<InProps, keyof UpdaterProps | 'showTime'> &
-  UpdaterProps & {
-    showTime?: ExcludeBooleanType<InProps['showTime']>;
-  } {
+): [
+  filledProps: Omit<InProps, keyof UpdaterProps | 'showTime'> &
+    UpdaterProps & {
+      showTime?: ExcludeBooleanType<InProps['showTime']>;
+    },
+  internalPicker: InternalMode,
+  complexPicker: boolean,
+] {
   const {
     locale,
     picker = 'date',
@@ -48,6 +54,7 @@ export default function useFilledProps<
     components = {},
     allowClear,
     clearIcon,
+    needConfirm,
   } = props;
 
   const filledProps = React.useMemo(
@@ -67,5 +74,23 @@ export default function useFilledProps<
     [props],
   );
 
-  return filledProps;
+  // ======================== Picker ========================
+  /** Almost same as `picker`, but add `datetime` for `date` with `showTime` */
+  const internalPicker: InternalMode =
+    picker === 'date' && filledProps.showTime ? 'datetime' : picker;
+
+  /** The picker is `datetime` or `time` */
+  const complexPicker = internalPicker === 'time' || internalPicker === 'datetime';
+  const mergedNeedConfirm = needConfirm ?? complexPicker;
+
+  // ======================== Merged ========================
+  const mergedProps = React.useMemo(
+    () => ({
+      ...filledProps,
+      needConfirm: mergedNeedConfirm,
+    }),
+    [filledProps, mergedNeedConfirm],
+  );
+
+  return [mergedProps, internalPicker, complexPicker];
 }