From 69718b0b2753d80fa1581e55d702fef6abe98a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 16 Jan 2024 14:06:18 +0800
Subject: [PATCH 1/7] chore: defaultPickerValue working

---
 docs/examples/debug.tsx          |  4 +++-
 src/PickerInput/Popup/index.tsx  | 17 +++++++++++------
 src/PickerInput/RangePicker.tsx  |  1 +
 src/PickerInput/SinglePicker.tsx |  1 +
 tests/picker.spec.tsx            |  5 +++++
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/docs/examples/debug.tsx b/docs/examples/debug.tsx
index 95b3dda2a..2ae21c394 100644
--- a/docs/examples/debug.tsx
+++ b/docs/examples/debug.tsx
@@ -155,8 +155,10 @@ export default () => {
         //   disabledMinutes: () => [0, 1, 2, 3, 4, 5],
         //   disabledSeconds: () => [0, 1, 2, 3, 4, 5],
         // })}
+        defaultOpenValue={dayjs()}
         open
-        picker="time"
+        // picker="time"
+        showTime
         ref={singleRef}
         suffixIcon="🧶"
         // showTime={{
diff --git a/src/PickerInput/Popup/index.tsx b/src/PickerInput/Popup/index.tsx
index 37c56a7cd..7832779cc 100644
--- a/src/PickerInput/Popup/index.tsx
+++ b/src/PickerInput/Popup/index.tsx
@@ -25,6 +25,9 @@ export interface PopupProps<DateType extends object = any, PresetValue = DateTyp
   // Direction
   direction?: 'ltr' | 'rtl';
 
+  // Fill
+  pickerAsValue: boolean;
+
   // Change
   needConfirm: boolean;
   isInvalid: (date: DateType | DateType[]) => boolean;
@@ -60,6 +63,7 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
     onSelect,
     isInvalid,
     pickerValue,
+    pickerAsValue,
     onOk,
     onSubmit,
   } = props;
@@ -101,15 +105,16 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
 
   const valueList = React.useMemo(() => filterEmpty(toArray(value)), [value]);
 
-  const isTimePicker = picker === 'time';
-  const isEmptyValue = !valueList.length;
+  const isTimePickerEmptyValue = picker === 'time' && !valueList.length && pickerAsValue;
 
   const footerSubmitValue = React.useMemo(() => {
-    if (isTimePicker && isEmptyValue) {
+    if (isTimePickerEmptyValue) {
       return filterEmpty([pickerValue]);
     }
     return valueList;
-  }, [isTimePicker, valueList, isEmptyValue, pickerValue]);
+  }, [isTimePickerEmptyValue, valueList, pickerValue]);
+
+  const popupPanelValue = isTimePickerEmptyValue ? pickerValue : valueList;
 
   const disableSubmit = React.useMemo(() => {
     // Empty is invalid
@@ -122,7 +127,7 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
 
   const onFooterSubmit = () => {
     // For TimePicker, we will additional trigger the value update
-    if (isTimePicker && isEmptyValue) {
+    if (isTimePickerEmptyValue) {
       onSelect(pickerValue);
     }
 
@@ -140,7 +145,7 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
         onHover={onPresetHover}
       />
       <div>
-        <PopupPanel {...props} />
+        <PopupPanel {...props} value={popupPanelValue} />
         <Footer
           {...props}
           showNow={multiple ? false : showNow}
diff --git a/src/PickerInput/RangePicker.tsx b/src/PickerInput/RangePicker.tsx
index 4ffe32fb3..5d29028a9 100644
--- a/src/PickerInput/RangePicker.tsx
+++ b/src/PickerInput/RangePicker.tsx
@@ -572,6 +572,7 @@ function RangePicker<DateType extends object = any>(
       onSelect={onPanelSelect}
       // PickerValue
       pickerValue={currentPickerValue}
+      pickerAsValue={!!defaultPickerValue?.[activeIndex]}
       onPickerValueChange={setCurrentPickerValue}
       // Hover
       hoverValue={hoverValues}
diff --git a/src/PickerInput/SinglePicker.tsx b/src/PickerInput/SinglePicker.tsx
index e000aae8e..89483f9fb 100644
--- a/src/PickerInput/SinglePicker.tsx
+++ b/src/PickerInput/SinglePicker.tsx
@@ -503,6 +503,7 @@ function Picker<DateType extends object = any>(
       onSelect={onPanelSelect}
       // PickerValue
       pickerValue={currentPickerValue}
+      pickerAsValue={!!defaultPickerValue}
       onPickerValueChange={setCurrentPickerValue}
       // Hover
       hoverValue={hoverValues}
diff --git a/tests/picker.spec.tsx b/tests/picker.spec.tsx
index 97822a6cb..7ffed6098 100644
--- a/tests/picker.spec.tsx
+++ b/tests/picker.spec.tsx
@@ -1383,11 +1383,16 @@ describe('Picker.Basic', () => {
     const onCalendarChange = jest.fn();
     render(<DayPicker picker="time" open showNow onCalendarChange={onCalendarChange} />);
 
+    const submitBtn = document.querySelector('.rc-picker-ok button');
+    expect(submitBtn).toHaveAttribute('disabled');
+
     selectCell('00');
+    expect(submitBtn).not.toHaveAttribute('disabled');
     expect(onCalendarChange).toHaveBeenCalledWith(expect.anything(), '00:00:00', expect.anything());
     onCalendarChange.mockReset();
 
     fireEvent.click(document.querySelector('.rc-picker-now-btn'));
+    expect(submitBtn).not.toHaveAttribute('disabled');
     expect(onCalendarChange).toHaveBeenCalledWith(expect.anything(), '01:03:05', expect.anything());
   });
 });

From dba3191fc538d4840ca77cdb0a22e02c66a87db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 16 Jan 2024 14:11:41 +0800
Subject: [PATCH 2/7] test: test driven

---
 docs/examples/debug.tsx |  6 +++--
 tests/picker.spec.tsx   | 59 ++++++++++++++++++++++++++++++++---------
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/docs/examples/debug.tsx b/docs/examples/debug.tsx
index 2ae21c394..d478b3c44 100644
--- a/docs/examples/debug.tsx
+++ b/docs/examples/debug.tsx
@@ -155,10 +155,12 @@ export default () => {
         //   disabledMinutes: () => [0, 1, 2, 3, 4, 5],
         //   disabledSeconds: () => [0, 1, 2, 3, 4, 5],
         // })}
-        defaultOpenValue={dayjs()}
+        // defaultOpenValue={dayjs()}
         open
         // picker="time"
-        showTime
+        showTime={{
+          defaultValue: dayjs(),
+        }}
         ref={singleRef}
         suffixIcon="🧶"
         // showTime={{
diff --git a/tests/picker.spec.tsx b/tests/picker.spec.tsx
index 7ffed6098..1c16763af 100644
--- a/tests/picker.spec.tsx
+++ b/tests/picker.spec.tsx
@@ -1377,22 +1377,55 @@ describe('Picker.Basic', () => {
     ).toEqual('01');
   });
 
-  it('time picker should align to 0', () => {
-    jest.useFakeTimers().setSystemTime(getDay('1990-09-03 01:03:05').valueOf());
+  describe('time with defaultPickerValue', () => {
+    beforeEach(() => {
+      jest.useFakeTimers().setSystemTime(getDay('1990-09-03 01:03:05').valueOf());
+    });
 
-    const onCalendarChange = jest.fn();
-    render(<DayPicker picker="time" open showNow onCalendarChange={onCalendarChange} />);
+    it('time picker should align to 0', () => {
+      const onCalendarChange = jest.fn();
+      render(<DayPicker picker="time" open showNow onCalendarChange={onCalendarChange} />);
+
+      const submitBtn = document.querySelector('.rc-picker-ok button');
+      expect(submitBtn).toHaveAttribute('disabled');
 
-    const submitBtn = document.querySelector('.rc-picker-ok button');
-    expect(submitBtn).toHaveAttribute('disabled');
+      selectCell('00');
+      expect(submitBtn).not.toHaveAttribute('disabled');
+      expect(onCalendarChange).toHaveBeenCalledWith(
+        expect.anything(),
+        '00:00:00',
+        expect.anything(),
+      );
+      onCalendarChange.mockReset();
+
+      fireEvent.click(document.querySelector('.rc-picker-now-btn'));
+      expect(submitBtn).not.toHaveAttribute('disabled');
+      expect(onCalendarChange).toHaveBeenCalledWith(
+        expect.anything(),
+        '01:03:05',
+        expect.anything(),
+      );
+    });
 
-    selectCell('00');
-    expect(submitBtn).not.toHaveAttribute('disabled');
-    expect(onCalendarChange).toHaveBeenCalledWith(expect.anything(), '00:00:00', expect.anything());
-    onCalendarChange.mockReset();
+    it('defaultOpenValue with showTime', () => {
+      const onCalendarChange = jest.fn();
+      render(
+        <DayPicker
+          showTime={{
+            defaultValue: dayjs(),
+          }}
+          open
+          onCalendarChange={onCalendarChange}
+          defaultPickerValue={dayjs()}
+        />,
+      );
 
-    fireEvent.click(document.querySelector('.rc-picker-now-btn'));
-    expect(submitBtn).not.toHaveAttribute('disabled');
-    expect(onCalendarChange).toHaveBeenCalledWith(expect.anything(), '01:03:05', expect.anything());
+      selectCell(15);
+      expect(onCalendarChange).toHaveBeenCalledWith(
+        expect.anything(),
+        '1990-09-15 01:03:05',
+        expect.anything(),
+      );
+    });
   });
 });

From a866c9313e3841a09efeff6af103c69f1e813267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 16 Jan 2024 14:25:07 +0800
Subject: [PATCH 3/7] chore: align logic

---
 docs/examples/debug.tsx                      | 24 +++++++++++---------
 src/PickerInput/Popup/index.tsx              | 16 ++++++-------
 src/PickerInput/RangePicker.tsx              |  6 ++---
 src/PickerInput/SinglePicker.tsx             |  4 ++--
 src/PickerInput/hooks/useFilledProps.ts      |  3 +--
 src/PickerInput/hooks/useRangePickerValue.ts |  3 ++-
 src/hooks/useTimeConfig.ts                   |  3 +++
 src/interface.tsx                            |  9 +++++---
 8 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/docs/examples/debug.tsx b/docs/examples/debug.tsx
index d478b3c44..17cd37e3e 100644
--- a/docs/examples/debug.tsx
+++ b/docs/examples/debug.tsx
@@ -155,12 +155,12 @@ export default () => {
         //   disabledMinutes: () => [0, 1, 2, 3, 4, 5],
         //   disabledSeconds: () => [0, 1, 2, 3, 4, 5],
         // })}
-        // defaultOpenValue={dayjs()}
-        open
-        // picker="time"
-        showTime={{
-          defaultValue: dayjs(),
-        }}
+        defaultOpenValue={dayjs()}
+        // open
+        picker="time"
+        // showTime={{
+        //   defaultValue: dayjs(),
+        // }}
         ref={singleRef}
         suffixIcon="🧶"
         // showTime={{
@@ -189,11 +189,13 @@ export default () => {
         }}
       />
       <br />
-      {/* <RangePicker
+      <RangePicker
         {...sharedLocale}
-        value={rangeValue}
-        open
-        picker="week"
+        // value={rangeValue}
+        // open
+        showTime={{
+          defaultOpenValue: [dayjs()],
+        }}
         panelRender={(ori) => <>2333{ori}</>}
         onChange={(val, text) => {
           console.log('🔥 Change:', val, text);
@@ -214,7 +216,7 @@ export default () => {
             info,
           );
         }}
-      /> */}
+      />
       <br />
 
       <button
diff --git a/src/PickerInput/Popup/index.tsx b/src/PickerInput/Popup/index.tsx
index 7832779cc..ee6dca74e 100644
--- a/src/PickerInput/Popup/index.tsx
+++ b/src/PickerInput/Popup/index.tsx
@@ -26,7 +26,8 @@ export interface PopupProps<DateType extends object = any, PresetValue = DateTyp
   direction?: 'ltr' | 'rtl';
 
   // Fill
-  pickerAsValue: boolean;
+  /** TimePicker or showTime only */
+  defaultOpenValue: DateType;
 
   // Change
   needConfirm: boolean;
@@ -62,8 +63,7 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
     value,
     onSelect,
     isInvalid,
-    pickerValue,
-    pickerAsValue,
+    defaultOpenValue,
     onOk,
     onSubmit,
   } = props;
@@ -105,16 +105,16 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
 
   const valueList = React.useMemo(() => filterEmpty(toArray(value)), [value]);
 
-  const isTimePickerEmptyValue = picker === 'time' && !valueList.length && pickerAsValue;
+  const isTimePickerEmptyValue = picker === 'time' && !valueList.length;
 
   const footerSubmitValue = React.useMemo(() => {
     if (isTimePickerEmptyValue) {
-      return filterEmpty([pickerValue]);
+      return filterEmpty([defaultOpenValue]);
     }
     return valueList;
-  }, [isTimePickerEmptyValue, valueList, pickerValue]);
+  }, [isTimePickerEmptyValue, valueList, defaultOpenValue]);
 
-  const popupPanelValue = isTimePickerEmptyValue ? pickerValue : valueList;
+  const popupPanelValue = isTimePickerEmptyValue ? defaultOpenValue : valueList;
 
   const disableSubmit = React.useMemo(() => {
     // Empty is invalid
@@ -128,7 +128,7 @@ export default function Popup<DateType extends object = any>(props: PopupProps<D
   const onFooterSubmit = () => {
     // For TimePicker, we will additional trigger the value update
     if (isTimePickerEmptyValue) {
-      onSelect(pickerValue);
+      onSelect(defaultOpenValue);
     }
 
     onOk();
diff --git a/src/PickerInput/RangePicker.tsx b/src/PickerInput/RangePicker.tsx
index 5d29028a9..f4dc5d3bb 100644
--- a/src/PickerInput/RangePicker.tsx
+++ b/src/PickerInput/RangePicker.tsx
@@ -20,7 +20,7 @@ import type {
 import type { PickerPanelProps } from '../PickerPanel';
 import PickerTrigger from '../PickerTrigger';
 import { pickTriggerProps } from '../PickerTrigger/util';
-import { fillIndex } from '../utils/miscUtil';
+import { fillIndex, toArray } from '../utils/miscUtil';
 import PickerContext from './context';
 import useCellRender from './hooks/useCellRender';
 import useFieldsInvalidate from './hooks/useFieldsInvalidate';
@@ -128,7 +128,7 @@ export interface BaseRangePickerProps<DateType extends object>
 
 export interface RangePickerProps<DateType extends object>
   extends BaseRangePickerProps<DateType>,
-    Omit<RangeTimeProps<DateType>, 'format' | 'defaultValue'> {}
+    Omit<RangeTimeProps<DateType>, 'format' | 'defaultValue' | 'defaultOpenValue'> {}
 
 function getActiveRange(activeIndex: number) {
   return activeIndex === 1 ? 'end' : 'start';
@@ -572,7 +572,7 @@ function RangePicker<DateType extends object = any>(
       onSelect={onPanelSelect}
       // PickerValue
       pickerValue={currentPickerValue}
-      pickerAsValue={!!defaultPickerValue?.[activeIndex]}
+      defaultOpenValue={toArray(showTime?.defaultOpenValue)[activeIndex]}
       onPickerValueChange={setCurrentPickerValue}
       // Hover
       hoverValue={hoverValues}
diff --git a/src/PickerInput/SinglePicker.tsx b/src/PickerInput/SinglePicker.tsx
index 89483f9fb..665a921d8 100644
--- a/src/PickerInput/SinglePicker.tsx
+++ b/src/PickerInput/SinglePicker.tsx
@@ -323,7 +323,7 @@ function Picker<DateType extends object = any>(
     false, // multiplePanel,
     defaultPickerValue,
     pickerValue,
-    toArray(showTime?.defaultValue),
+    toArray(showTime?.defaultOpenValue),
     onInternalPickerValueChange,
     minDate,
     maxDate,
@@ -503,7 +503,7 @@ function Picker<DateType extends object = any>(
       onSelect={onPanelSelect}
       // PickerValue
       pickerValue={currentPickerValue}
-      pickerAsValue={!!defaultPickerValue}
+      defaultOpenValue={showTime?.defaultOpenValue}
       onPickerValueChange={setCurrentPickerValue}
       // Hover
       hoverValue={hoverValues}
diff --git a/src/PickerInput/hooks/useFilledProps.ts b/src/PickerInput/hooks/useFilledProps.ts
index 9c63c091d..dbff3b12a 100644
--- a/src/PickerInput/hooks/useFilledProps.ts
+++ b/src/PickerInput/hooks/useFilledProps.ts
@@ -121,9 +121,8 @@ export default function useFilledProps<
 
   const values = useList(value);
   const defaultValues = useList(defaultValue);
-  const defaultOpenValues = useList(defaultOpenValue, true);
   const pickerValues = useList(pickerValue);
-  const defaultPickerValues = useList(defaultPickerValue) || defaultOpenValues;
+  const defaultPickerValues = useList(defaultPickerValue);
 
   // ======================== Picker ========================
   /** Almost same as `picker`, but add `datetime` for `date` with `showTime` */
diff --git a/src/PickerInput/hooks/useRangePickerValue.ts b/src/PickerInput/hooks/useRangePickerValue.ts
index 8ee2b422f..34d4a33a1 100644
--- a/src/PickerInput/hooks/useRangePickerValue.ts
+++ b/src/PickerInput/hooks/useRangePickerValue.ts
@@ -4,6 +4,7 @@ import * as React from 'react';
 import type { GenerateConfig } from '../../generate';
 import type { InternalMode, Locale, PanelMode } from '../../interface';
 import { fillTime, isSame } from '../../utils/dateUtil';
+import { toArray } from '../../utils/miscUtil';
 import type { RangePickerProps } from '../RangePicker';
 
 export function offsetPanelDate<DateType = any>(
@@ -90,7 +91,7 @@ export default function useRangePickerValue<DateType extends object, ValueType e
     // Merge the `showTime.defaultValue` into `pickerValue`
     return isTimePicker
       ? current
-      : fillTime(generateConfig, current, timeDefaultValue[mergedActiveIndex]);
+      : fillTime(generateConfig, current, toArray(timeDefaultValue)[mergedActiveIndex]);
   }, [
     isTimePicker,
     mergedStartPickerValue,
diff --git a/src/hooks/useTimeConfig.ts b/src/hooks/useTimeConfig.ts
index cd2d027a3..92bbda572 100644
--- a/src/hooks/useTimeConfig.ts
+++ b/src/hooks/useTimeConfig.ts
@@ -26,6 +26,7 @@ const showTimeKeys = [
   'disabledMilliseconds',
   'disabledTime',
   'changeOnScroll',
+  'defaultOpenValue',
 ] as const;
 
 /**
@@ -51,6 +52,8 @@ function pickTimeProps<DateType extends object = any>(
     timeProps.format = propFormat;
   }
 
+  timeProps.defaultOpenValue = timeProps.defaultOpenValue || timeProps.defaultValue;
+
   return [timeProps, propFormat];
 }
 
diff --git a/src/interface.tsx b/src/interface.tsx
index 2d60549f8..8d1a8f7ff 100644
--- a/src/interface.tsx
+++ b/src/interface.tsx
@@ -165,6 +165,9 @@ export interface SharedTimeProps<DateType extends object = any> {
   /** Set default value template when empty selection */
   defaultValue?: DateType;
 
+  /** Set default value template when empty selection */
+  defaultOpenValue?: DateType;
+
   /** @deprecated Please use `disabledTime` instead. */
   disabledHours?: DisabledTimes['disabledHours'];
   /** @deprecated Please use `disabledTime` instead. */
@@ -181,9 +184,10 @@ export interface SharedTimeProps<DateType extends object = any> {
 
 export type RangeTimeProps<DateType extends object = any> = Omit<
   SharedTimeProps<DateType>,
-  'defaultValue'
+  'defaultValue' | 'defaultOpenValue'
 > & {
-  defaultValue?: [DateType, DateType];
+  defaultValue?: DateType[];
+  defaultOpenValue?: DateType[];
 };
 
 // ======================= Components =======================
@@ -369,7 +373,6 @@ export interface SharedPickerProps<DateType extends object = any>
   maxDate?: DateType;
 
   // Open
-  /** @deprecated Please use `defaultPickerValue` instead */
   defaultOpenValue?: DateType;
   defaultOpen?: boolean;
   open?: boolean;

From a9a67ba7cbdd36a011a7accdfaa225a742e20335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 16 Jan 2024 14:29:09 +0800
Subject: [PATCH 4/7] chore: fix defaultOpen logic

---
 src/PickerInput/Popup/Footer.tsx             | 2 +-
 src/PickerInput/RangePicker.tsx              | 2 +-
 src/PickerInput/hooks/useRangePickerValue.ts | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/PickerInput/Popup/Footer.tsx b/src/PickerInput/Popup/Footer.tsx
index 79b948955..4cd197480 100644
--- a/src/PickerInput/Popup/Footer.tsx
+++ b/src/PickerInput/Popup/Footer.tsx
@@ -18,7 +18,7 @@ export interface FooterProps<DateType extends object = any> {
   showNow: boolean;
   generateConfig: GenerateConfig<DateType>;
   disabledDate: DisabledDate<DateType>;
-  showTime?: Omit<RangeTimeProps<DateType>, 'defaultValue'>;
+  showTime?: Omit<RangeTimeProps<DateType>, 'defaultValue' | 'defaultOpenValue'>;
 
   // Invalid
   /** From Footer component used only. Check if can OK button click */
diff --git a/src/PickerInput/RangePicker.tsx b/src/PickerInput/RangePicker.tsx
index f4dc5d3bb..dd558605c 100644
--- a/src/PickerInput/RangePicker.tsx
+++ b/src/PickerInput/RangePicker.tsx
@@ -357,7 +357,7 @@ function RangePicker<DateType extends object = any>(
     multiplePanel,
     defaultPickerValue,
     pickerValue,
-    mergedShowTime?.defaultValue,
+    mergedShowTime?.defaultOpenValue,
     onPickerValueChange,
     minDate,
     maxDate,
diff --git a/src/PickerInput/hooks/useRangePickerValue.ts b/src/PickerInput/hooks/useRangePickerValue.ts
index 34d4a33a1..8ee2b422f 100644
--- a/src/PickerInput/hooks/useRangePickerValue.ts
+++ b/src/PickerInput/hooks/useRangePickerValue.ts
@@ -4,7 +4,6 @@ import * as React from 'react';
 import type { GenerateConfig } from '../../generate';
 import type { InternalMode, Locale, PanelMode } from '../../interface';
 import { fillTime, isSame } from '../../utils/dateUtil';
-import { toArray } from '../../utils/miscUtil';
 import type { RangePickerProps } from '../RangePicker';
 
 export function offsetPanelDate<DateType = any>(
@@ -91,7 +90,7 @@ export default function useRangePickerValue<DateType extends object, ValueType e
     // Merge the `showTime.defaultValue` into `pickerValue`
     return isTimePicker
       ? current
-      : fillTime(generateConfig, current, toArray(timeDefaultValue)[mergedActiveIndex]);
+      : fillTime(generateConfig, current, timeDefaultValue[mergedActiveIndex]);
   }, [
     isTimePicker,
     mergedStartPickerValue,

From c4f4ce08344ae3f6d4646099e52148627d4e3580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 16 Jan 2024 14:34:38 +0800
Subject: [PATCH 5/7] fix: merge logic

---
 src/hooks/useTimeConfig.ts | 3 +--
 src/interface.tsx          | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useTimeConfig.ts b/src/hooks/useTimeConfig.ts
index 92bbda572..de51a03cb 100644
--- a/src/hooks/useTimeConfig.ts
+++ b/src/hooks/useTimeConfig.ts
@@ -52,8 +52,6 @@ function pickTimeProps<DateType extends object = any>(
     timeProps.format = propFormat;
   }
 
-  timeProps.defaultOpenValue = timeProps.defaultOpenValue || timeProps.defaultValue;
-
   return [timeProps, propFormat];
 }
 
@@ -86,6 +84,7 @@ export function getTimeProps<DateType extends object>(
 
   const showTimeConfig = showTime && typeof showTime === 'object' ? showTime : {};
   const timeConfig = {
+    defaultOpenValue: showTimeConfig.defaultOpenValue || showTimeConfig.defaultValue,
     ...pickedProps,
     ...showTimeConfig,
   };
diff --git a/src/interface.tsx b/src/interface.tsx
index 8d1a8f7ff..ca273a639 100644
--- a/src/interface.tsx
+++ b/src/interface.tsx
@@ -162,7 +162,7 @@ export interface SharedTimeProps<DateType extends object = any> {
   /** Only work in picker is `time` */
   hideDisabledOptions?: boolean;
 
-  /** Set default value template when empty selection */
+  /** @deprecated Use `defaultOpenValue` instead */
   defaultValue?: DateType;
 
   /** Set default value template when empty selection */
@@ -186,6 +186,7 @@ export type RangeTimeProps<DateType extends object = any> = Omit<
   SharedTimeProps<DateType>,
   'defaultValue' | 'defaultOpenValue'
 > & {
+  /** @deprecated Use `defaultOpenValue` instead. */
   defaultValue?: DateType[];
   defaultOpenValue?: DateType[];
 };

From 197d493ada96ea34e07ddc1c8e9b9251ae377db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 16 Jan 2024 14:40:22 +0800
Subject: [PATCH 6/7] test: update test case

---
 src/PickerInput/hooks/useFilledProps.ts |  5 ---
 tests/picker.spec.tsx                   | 47 +++++++++++++------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/PickerInput/hooks/useFilledProps.ts b/src/PickerInput/hooks/useFilledProps.ts
index dbff3b12a..57cb5f098 100644
--- a/src/PickerInput/hooks/useFilledProps.ts
+++ b/src/PickerInput/hooks/useFilledProps.ts
@@ -155,11 +155,6 @@ export default function useFilledProps<
         `'disabledHours', 'disabledMinutes', 'disabledSeconds' will be removed in the next major version, please use 'disabledTime' instead.`,
       );
     }
-
-    warning(
-      !defaultOpenValue,
-      `'defaultOpenValue' is deprecated which merged into 'defaultPickerValue' instead.`,
-    );
   }
 
   // ======================== Props =========================
diff --git a/tests/picker.spec.tsx b/tests/picker.spec.tsx
index 1c16763af..505cd0a2e 100644
--- a/tests/picker.spec.tsx
+++ b/tests/picker.spec.tsx
@@ -812,10 +812,6 @@ describe('Picker.Basic', () => {
       />,
     );
 
-    expect(errSpy).toHaveBeenCalledWith(
-      "Warning: 'defaultOpenValue' is deprecated which merged into 'defaultPickerValue' instead.",
-    );
-
     openPicker(container);
     fireEvent.click(document.querySelector('.rc-picker-ok button'));
 
@@ -1407,25 +1403,30 @@ describe('Picker.Basic', () => {
       );
     });
 
-    it('defaultOpenValue with showTime', () => {
-      const onCalendarChange = jest.fn();
-      render(
-        <DayPicker
-          showTime={{
-            defaultValue: dayjs(),
-          }}
-          open
-          onCalendarChange={onCalendarChange}
-          defaultPickerValue={dayjs()}
-        />,
-      );
+    function testPropsName(propName: string) {
+      it(`${propName} with showTime`, () => {
+        const onCalendarChange = jest.fn();
+        render(
+          <DayPicker
+            showTime={{
+              [propName]: dayjs(),
+            }}
+            open
+            onCalendarChange={onCalendarChange}
+            defaultPickerValue={dayjs()}
+          />,
+        );
 
-      selectCell(15);
-      expect(onCalendarChange).toHaveBeenCalledWith(
-        expect.anything(),
-        '1990-09-15 01:03:05',
-        expect.anything(),
-      );
-    });
+        selectCell(15);
+        expect(onCalendarChange).toHaveBeenCalledWith(
+          expect.anything(),
+          '1990-09-15 01:03:05',
+          expect.anything(),
+        );
+      });
+    }
+
+    testPropsName('defaultValue');
+    testPropsName('defaultOpenValue');
   });
 });

From 851e61885ed82b437fb783ca53d690e70235e3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Tue, 16 Jan 2024 14:44:47 +0800
Subject: [PATCH 7/7] chore: fix lint

---
 src/PickerInput/hooks/useFilledProps.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PickerInput/hooks/useFilledProps.ts b/src/PickerInput/hooks/useFilledProps.ts
index 57cb5f098..f65198364 100644
--- a/src/PickerInput/hooks/useFilledProps.ts
+++ b/src/PickerInput/hooks/useFilledProps.ts
@@ -116,7 +116,6 @@ export default function useFilledProps<
     defaultValue,
     pickerValue,
     defaultPickerValue,
-    defaultOpenValue,
   } = props;
 
   const values = useList(value);