Skip to content

Commit b971ff7

Browse files
authored
fix: Disabled RangePicker display issue (#55)
1 parent 40b0796 commit b971ff7

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

src/RangePicker.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,12 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
236236
const [selectedValue, setSelectedValue] = useMergedState(mergedValue, {
237237
postState: values => {
238238
let postValues = values;
239+
240+
if (mergedDisabled[0] && mergedDisabled[1]) {
241+
return postValues;
242+
}
243+
244+
// Fill disabled unit
239245
for (let i = 0; i < 2; i += 1) {
240246
if (mergedDisabled[i] && !getValue(postValues, i) && !getValue(allowEmpty, i)) {
241247
postValues = updateValues(postValues, generateConfig.getNow(), i);

tests/range.spec.tsx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,23 @@ describe('Picker.Range', () => {
275275
wrapper.clearValue();
276276
expect(onChange.mock.calls[0][1]).toEqual(['', '2000-11-11']);
277277
});
278+
279+
// https://github.com/ant-design/ant-design/issues/23726
280+
it('not fill when all disabled and no value', () => {
281+
const wrapper = mount(<MomentRangePicker disabled />);
282+
expect(
283+
wrapper
284+
.find('input')
285+
.first()
286+
.props().value,
287+
).toEqual('');
288+
expect(
289+
wrapper
290+
.find('input')
291+
.last()
292+
.props().value,
293+
).toEqual('');
294+
});
278295
});
279296

280297
describe('ranges', () => {

0 commit comments

Comments
 (0)