Skip to content

Commit 684467d

Browse files
authored
fix: should not action when RangePicker set disabled (#659)
1 parent f699375 commit 684467d

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

src/RangePicker.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
354354
endInputRef,
355355
getValue(selectedValue, 0),
356356
getValue(selectedValue, 1),
357+
mergedDisabled,
357358
onOpenChange,
358359
);
359360

src/hooks/useRangeOpen.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export default function useRangeOpen(
3333
endInputRef: React.RefObject<HTMLInputElement>,
3434
startSelectedValue: any,
3535
endSelectedValue: any,
36+
disabled: [boolean, boolean],
3637
onOpenChange?: (open: boolean) => void,
3738
): [
3839
open: boolean,
@@ -93,7 +94,7 @@ export default function useRangeOpen(
9394
setNextActiveIndex(null);
9495

9596
// Focus back
96-
if (nextActiveIndex !== null) {
97+
if (nextActiveIndex !== null && !disabled[nextActiveIndex]) {
9798
raf(() => {
9899
const ref = [startInputRef, endInputRef][nextActiveIndex];
99100
ref.current?.focus();

tests/range.spec.tsx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,26 @@ describe('Picker.Range', () => {
262262
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
263263
});
264264

265+
it('should close panel when finish first choose with showTime = true and disabled = [false, true]', () => {
266+
const { baseElement } = render(<MomentRangePicker showTime disabled={[false, true]} />);
267+
expect(baseElement.querySelectorAll('.rc-picker-input')).toHaveLength(2);
268+
fireEvent.click(baseElement.querySelectorAll('.rc-picker-input')[0]);
269+
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeFalsy();
270+
fireEvent.click(baseElement.querySelector('.rc-picker-cell-inner'));
271+
fireEvent.click(baseElement.querySelector('.rc-picker-ok button'));
272+
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
273+
});
274+
275+
it('should close panel when finish second choose with showTime = true and disabled = [true, false]', () => {
276+
const { baseElement } = render(<MomentRangePicker showTime disabled={[true, false]} />);
277+
expect(baseElement.querySelectorAll('.rc-picker-input')).toHaveLength(2);
278+
fireEvent.click(baseElement.querySelectorAll('.rc-picker-input')[1]);
279+
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeFalsy();
280+
fireEvent.click(baseElement.querySelector('.rc-picker-cell-range-start .rc-picker-cell-inner'));
281+
fireEvent.click(baseElement.querySelector('.rc-picker-ok button'));
282+
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
283+
});
284+
265285
it('panel can not be clicked with open and disabled', () => {
266286
const onChange = jest.fn();
267287
const { baseElement } = render(<MomentRangePicker disabled open onChange={onChange} />);

0 commit comments

Comments
 (0)