From 87a6d66b244994c1def45ba5afe6752572df901c Mon Sep 17 00:00:00 2001 From: dujiaqi Date: Sat, 25 Feb 2023 11:21:05 +0800 Subject: [PATCH 1/2] fix: Use the passed in default when disabled --- src/RangePicker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx index bd0010b46..fc03655a7 100644 --- a/src/RangePicker.tsx +++ b/src/RangePicker.tsx @@ -307,7 +307,7 @@ function InnerRangePicker(props: RangePickerProps) { // 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); } } From 17367fcde3b6537b9574c4abb8024eb757b3a54d Mon Sep 17 00:00:00 2001 From: dujiaqi Date: Thu, 9 Mar 2023 20:36:41 +0800 Subject: [PATCH 2/2] add test case --- tests/range.spec.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/range.spec.tsx b/tests/range.spec.tsx index c3d0df916..4e77570dd 100644 --- a/tests/range.spec.tsx +++ b/tests/range.spec.tsx @@ -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(); + + expect(document.querySelectorAll('input')[1].value).toBeFalsy(); + }); });