fix: RangePicker switch field should keep the time sync with date (#769)

* fix: range time selection

* test: add test case

* docs: demo back

Author: zombieJ

src/PickerPanel/TimePanel/TimePanelBody/index.tsx

@@ -145,7 +145,7 @@ export default function TimePanelBody<DateType extends object = any>(
   // ========================= Column =========================
   // Create a template date for the trigger change event
   const triggerDateTmpl = React.useMemo(() => {
-    let tmpl = pickerValue || generateConfig.getNow();
+    let tmpl = value || pickerValue || generateConfig.getNow();
 
     const isNotNull = (num: number) => num !== null && num !== undefined;
 
@@ -168,6 +168,7 @@ export default function TimePanelBody<DateType extends object = any>(
 
     return tmpl;
   }, [
+    value,
     pickerValue,
     hour,
     minute,

tests/new-range.spec.tsx

@@ -1240,4 +1240,28 @@ describe('NewPicker.Range', () => {
     render(<DayRangePicker picker="week" value={[dayjs(), dayjs().add(21, 'days')]} open />);
     expect(document.querySelector('.rc-picker-cell-range-start')).toBeFalsy();
   });
+
+  it('click time should not modify date', async () => {
+    const onChange = jest.fn();
+    const { container } = render(
+      <DayRangePicker showTime value={[dayjs(), dayjs().add(21, 'days')]} onChange={onChange} />,
+    );
+
+    openPicker(container);
+
+    // Start
+    fireEvent.click(document.querySelectorAll('li.rc-picker-time-panel-cell')[2]);
+    fireEvent.click(document.querySelector('.rc-picker-ok button'));
+    await waitFakeTimer();
+
+    // End
+    fireEvent.click(document.querySelectorAll('li.rc-picker-time-panel-cell')[2]);
+    fireEvent.click(document.querySelector('.rc-picker-ok button'));
+    await waitFakeTimer();
+
+    expect(onChange).toHaveBeenCalledWith(expect.anything(), [
+      '1990-09-03 02:00:00',
+      '1990-09-24 02:00:00',
+    ]);
+  });
 });

tsconfig.json

@@ -13,5 +13,12 @@
       "rc-picker": ["src/index.tsx"]
     }
   },
-  "include": [".dumirc.ts", "src/**/*.ts", "src/**/*.tsx", "docs/examples/focus.tsx"]
+  "include": [
+    ".dumirc.ts",
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "docs/examples/focus.tsx",
+    "tests/**/*.ts",
+    "tests/**/*.tsx"
+  ]
 }