Skip to content

fix: Use the passed in default when disabled #594

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 2 commits into from
Mar 10, 2023
Merged

fix: Use the passed in default when disabled #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87a6d66
fix: Use the passed in default when disabled
Feb 25, 2023
17367fc
add test case
Mar 9, 2023
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/RangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {

// Fill disabled unit
for (let i = 0; i < 2; i += 1) {
if (mergedDisabled[i] && !getValue(postValues, i) && !getValue(allowEmpty, i)) {
if (mergedDisabled[i] && !postValues && !getValue(postValues, i) && !getValue(allowEmpty, i)) {
postValues = updateValues(postValues, generateConfig.getNow(), i);
}
}
Expand Down
6 changes: 6 additions & 0 deletions tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1776,4 +1776,10 @@ describe('Picker.Range', () => {
// No selected cell
expect(document.querySelector('.rc-picker-cell-selected')).toBeFalsy();
});

it('range picker should use the passed in default when part is disabled', () => {
render(<MomentRangePicker defaultValue={[null, null]} disabled={[false, true]} />);

expect(document.querySelectorAll('input')[1].value).toBeFalsy();
});
});