Skip to content

Commit f512f18

Browse files
Yuiai01dujiaqi
andauthored
fix: Use the passed in default when disabled (#594)
* fix: Use the passed in default when disabled * add test case --------- Co-authored-by: dujiaqi <[email protected]>
1 parent ab0c349 commit f512f18

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/RangePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
307307

308308
// Fill disabled unit
309309
for (let i = 0; i < 2; i += 1) {
310-
if (mergedDisabled[i] && !getValue(postValues, i) && !getValue(allowEmpty, i)) {
310+
if (mergedDisabled[i] && !postValues && !getValue(postValues, i) && !getValue(allowEmpty, i)) {
311311
postValues = updateValues(postValues, generateConfig.getNow(), i);
312312
}
313313
}

tests/range.spec.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,4 +1776,10 @@ describe('Picker.Range', () => {
17761776
// No selected cell
17771777
expect(document.querySelector('.rc-picker-cell-selected')).toBeFalsy();
17781778
});
1779+
1780+
it('range picker should use the passed in default when part is disabled', () => {
1781+
render(<MomentRangePicker defaultValue={[null, null]} disabled={[false, true]} />);
1782+
1783+
expect(document.querySelectorAll('input')[1].value).toBeFalsy();
1784+
});
17791785
});

0 commit comments

Comments
 (0)