Merge 2d9966d into efc0bfd

react-component · Sep 21, 2023 · 3a9eca7 · 3a9eca7
2 parents efc0bfd + 2d9966d
commit 3a9eca7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx
@@ -360,6 +360,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
     open,
     activePickerIndex,
     changeOnBlur,
+    needConfirmButton,
     startInputRef,
     endInputRef,
     getValue(selectedValue, 0),

diff --git a/src/hooks/useRangeOpen.ts b/src/hooks/useRangeOpen.ts
@@ -29,6 +29,7 @@ export default function useRangeOpen(
   open: boolean,
   activePickerIndex: 0 | 1 | undefined,
   changeOnBlur: boolean,
+  needConfirmButton: boolean,
   startInputRef: React.RefObject<HTMLInputElement>,
   endInputRef: React.RefObject<HTMLInputElement>,
   startSelectedValue: any,
@@ -93,7 +94,9 @@ export default function useRangeOpen(
         }
       }
     } else if (source === 'confirm' || (source === 'blur' && changeOnBlur)) {
-      const customNextActiveIndex = afferentOpen ? queryNextIndex(index) : nextActiveIndex;
+      // dateTime mode does not need help getting the index
+      const customNextActiveIndex =
+        afferentOpen && !needConfirmButton ? queryNextIndex(index) : nextActiveIndex;
 
       if (customNextActiveIndex !== null) {
         setFirstTimeOpen(false);

diff --git a/tests/range.spec.tsx b/tests/range.spec.tsx
@@ -1076,7 +1076,9 @@ describe('Picker.Range', () => {
         open
         cellRender={(date, info) => {
           expect(info.range).toEqual(range);
-          return date.format('YYYY-MM-DD');
+          if (typeof date !== 'number') {
+            return date.format('YYYY-MM-DD');
+          }
         }}
       />,
     );
@@ -1968,4 +1970,19 @@ describe('Picker.Range', () => {
       expect(onChange).not.toHaveBeenCalled();
     });
   });
+
+  it('dateTime mode should be can use a confirm button to close the panel', () => {
+    const onOpenChange = jest.fn();
+
+    render(
+      <MomentRangePicker open showTime onOpenChange={onOpenChange} />,
+    );
+
+    for (let i = 0; i < 2; i++) {
+      selectCell(24);
+      fireEvent.click(document.querySelector('.rc-picker-ok button'));
+    }
+
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+  });
 });