Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: should not action when RangePicker set disabled #659

Merged
merged 1 commit into from
Jul 25, 2023
Merged

fix: should not action when RangePicker set disabled #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/RangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
endInputRef,
getValue(selectedValue, 0),
getValue(selectedValue, 1),
mergedDisabled,
onOpenChange,
);

Expand Down
3 changes: 2 additions & 1 deletion src/hooks/useRangeOpen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export default function useRangeOpen(
endInputRef: React.RefObject<HTMLInputElement>,
startSelectedValue: any,
endSelectedValue: any,
disabled: [boolean, boolean],
onOpenChange?: (open: boolean) => void,
): [
open: boolean,
Expand Down Expand Up @@ -93,7 +94,7 @@ export default function useRangeOpen(
setNextActiveIndex(null);

// Focus back
if (nextActiveIndex !== null) {
if (nextActiveIndex !== null && !disabled[nextActiveIndex]) {
raf(() => {
const ref = [startInputRef, endInputRef][nextActiveIndex];
ref.current?.focus();
Expand Down
20 changes: 20 additions & 0 deletions tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,26 @@ describe('Picker.Range', () => {
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
});

it('should close panel when finish first choose with showTime = true and disabled = [false, true]', () => {
const { baseElement } = render(<MomentRangePicker showTime disabled={[false, true]} />);
expect(baseElement.querySelectorAll('.rc-picker-input')).toHaveLength(2);
fireEvent.click(baseElement.querySelectorAll('.rc-picker-input')[0]);
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeFalsy();
fireEvent.click(baseElement.querySelector('.rc-picker-cell-inner'));
fireEvent.click(baseElement.querySelector('.rc-picker-ok button'));
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
});

it('should close panel when finish second choose with showTime = true and disabled = [true, false]', () => {
const { baseElement } = render(<MomentRangePicker showTime disabled={[true, false]} />);
expect(baseElement.querySelectorAll('.rc-picker-input')).toHaveLength(2);
fireEvent.click(baseElement.querySelectorAll('.rc-picker-input')[1]);
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeFalsy();
fireEvent.click(baseElement.querySelector('.rc-picker-cell-range-start .rc-picker-cell-inner'));
fireEvent.click(baseElement.querySelector('.rc-picker-ok button'));
expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
});

it('panel can not be clicked with open and disabled', () => {
const onChange = jest.fn();
const { baseElement } = render(<MomentRangePicker disabled open onChange={onChange} />);
Expand Down
Loading