improvement: dateTime mode apply the current time (#671)

* improvement: dateTime mode apply the current time

* chore: delete the verification of value

* chore: change method and test case

---------

Co-authored-by: dujiaqi <[email protected]>

Author: Yuiai01

src/hooks/useTimeSelection.ts

@@ -25,11 +25,12 @@ export default function useTimeSelection<DateType>({
     newMinute: number,
     newSecond: number,
   ) => {
-    let newDate = value || generateConfig.getNow();
+    const now = generateConfig.getNow();
+    let newDate = value || now;
 
-    const mergedHour = Math.max(0, newHour);
-    let mergedMinute = Math.max(0, newMinute);
-    let mergedSecond = Math.max(0, newSecond);
+    const mergedHour = newHour < 0 ? generateConfig.getHour(now) : newHour;
+    let mergedMinute = newMinute < 0 ? generateConfig.getMinute(now) : newMinute;
+    let mergedSecond = newSecond < 0 ? generateConfig.getSecond(now) : newSecond;
 
     const newDisabledMinutes = disabledMinutes && disabledMinutes(mergedHour);
     if (newDisabledMinutes?.includes(mergedMinute)) {

tests/disabledTime.spec.tsx

@@ -92,6 +92,7 @@ describe('Picker.DisabledTime', () => {
   });
 
   it('dynamic disabledTime should be correct', () => {
+    jest.useFakeTimers().setSystemTime(getMoment('2023-09-05 22:02:00').valueOf());
     render(
       <MomentPicker
         open
@@ -106,6 +107,7 @@ describe('Picker.DisabledTime', () => {
             }
           },
           disabledSeconds: (_, selectMinute) => {
+            console.log(selectMinute)
             if (selectMinute === 2) {
               return [0, 1];
             } else {
@@ -134,6 +136,7 @@ describe('Picker.DisabledTime', () => {
     expect(document.querySelector('.rc-picker-input input').getAttribute('value')).toEqual(
       '02:02:02',
     );
+    jest.useRealTimers();
   });
 
   describe('warning for legacy props', () => {

tests/picker.spec.tsx

@@ -52,6 +52,10 @@ describe('Picker.Basic', () => {
     });
   }
 
+  function selectColumn(colIndex: number, rowIndex: number) {
+    fireEvent.click(document.querySelectorAll('ul')[colIndex].querySelectorAll('li')[rowIndex]);
+  }
+
   describe('mode', () => {
     const modeList: { mode: PanelMode; className: string }[] = [
       {
@@ -474,10 +478,6 @@ describe('Picker.Basic', () => {
       const { container } = render(<MomentPicker picker="time" onChange={onChange} onOk={onOk} />);
       openPicker(container);
 
-      function selectColumn(colIndex: number, rowIndex: number) {
-        fireEvent.click(document.querySelectorAll('ul')[colIndex].querySelectorAll('li')[rowIndex]);
-      }
-
       selectColumn(0, 13);
       selectColumn(1, 22);
       selectColumn(2, 33);
@@ -1107,4 +1107,16 @@ describe('Picker.Basic', () => {
     // Reset locale
     moment.locale('en');
   });
+
+  it('select minutes and seconds directly in dateTime mode will apply the current time', () => {
+    jest.setSystemTime(getMoment('2023-09-04 21:49:10').valueOf());
+    const ui = <MomentPicker showTime />;
+    const { container } = render(ui);
+
+    openPicker(container);
+    // Select minute
+    selectColumn(1, 5);
+
+    expect(container.querySelector('input')).toHaveValue('2023-09-04 21:05:10');
+  });
 });