Skip to content

fix: panel shouldn't be clicked with open and disabled #640

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

Merged
merged 1 commit into from
May 25, 2023
Merged

fix: panel shouldn't be clicked with open and disabled #640

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
5 changes: 3 additions & 2 deletions src/hooks/useRangeDisabled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function useRangeDisabled<DateType>(

const disabledStartDate = React.useCallback(
(date: DateType) => {
if (disabledDate && disabledDate(date)) {
if (disabled[0] || (disabledDate && disabledDate(date))) {
return true;
}

Expand Down Expand Up @@ -75,7 +75,8 @@ export default function useRangeDisabled<DateType>(

const disabledEndDate = React.useCallback(
(date: DateType) => {
if (disabledDate && disabledDate(date)) {

if (disabled[1] || (disabledDate && disabledDate(date))) {
return true;
}

Expand Down
10 changes: 9 additions & 1 deletion tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,22 @@ describe('Picker.Range', () => {
});

it('should close panel when finish choose panel and next is disabled with disabled = [false, true]/[true,false]', () => {
const { baseElement, container } = render(<MomentRangePicker disabled={[false, true]} />);
const { baseElement } = render(<MomentRangePicker 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'));
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} />);
expect(baseElement.querySelector('.rc-picker-cell')).toBeTruthy();
fireEvent.click(baseElement.querySelector('.rc-picker-cell'));
expect(onChange).not.toBeCalled();
});

it('startDate will have disabledDate when endDate is not selectable', () => {
const onChange = jest.fn();
const { container } = render(
Expand Down