Skip to content

fix: RangePicker should keep disabled #133

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
Aug 25, 2020
Merged

fix: RangePicker should keep disabled #133

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
2 changes: 1 addition & 1 deletion src/PickerPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
onViewDateChange: setViewDate,
sourceMode,
onPanelChange: onInternalPanelChange,
disabledDate: picker === mergedMode ? disabledDate : undefined,
disabledDate: mergedMode !== 'decade' ? disabledDate : undefined,
};
delete pickerProps.onChange;
delete pickerProps.onSelect;
Expand Down
19 changes: 0 additions & 19 deletions tests/panel.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,25 +315,6 @@ describe('Picker.Panel', () => {
expect(onPanelChange).toHaveBeenCalled();
});

// decade is not a picker, but we still test here in case will support
it('picker', () => {
const onPanelChange = jest.fn();
const wrapper = mount(
<MomentPickerPanel
picker={'decade' as any}
mode="decade"
onPanelChange={onPanelChange}
disabledDate={date => date.year() === 1900}
/>,
);

wrapper.selectCell('1900-1909');
expect(onPanelChange).not.toHaveBeenCalled();

wrapper.selectCell('1910-1919');
expect(onPanelChange).toHaveBeenCalled();
});

it('not trigger when same panel', () => {
const onPanelChange = jest.fn();
const wrapper = mount(<MomentPickerPanel onPanelChange={onPanelChange} />);
Expand Down
14 changes: 14 additions & 0 deletions tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,4 +1744,18 @@ describe('Picker.Range', () => {
.simulate('click');
expect(wrapper.find('.rc-picker-year-btn').text()).toEqual('1990');
});

// https://github.com/ant-design/ant-design/issues/26390
it('month panel should be disabled', () => {
const wrapper = mount(<MomentRangePicker />);
wrapper.openPicker();
wrapper.selectCell(15);

wrapper
.find('.rc-picker-month-btn')
.first()
.simulate('click');
expect(wrapper.findCell('Jan').hasClass('rc-picker-cell-disabled')).toBeTruthy();
expect(wrapper.findCell('Dec').hasClass('rc-picker-cell-disabled')).toBeFalsy();
});
});