Skip to content

Commit b4a38df

Browse files
authored
fix: RangePicker date.month is not a function error (#427)
close ant-design/ant-design#36154
1 parent c84d4b3 commit b4a38df

File tree

2 files changed

+47
-24
lines changed

2 files changed

+47
-24
lines changed

src/PickerPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
218218
defaultDateObject || now,
219219
);
220220
}
221-
return date;
221+
return Array.isArray(date) ? date[0] : date;
222222
},
223223
});
224224

tests/range.spec.tsx

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,7 @@ describe('Picker.Range', () => {
3232

3333
matchValues(wrapper, '1989-11-28', '1990-09-03');
3434
});
35-
it('defaultPickerValue with showTime', () => {
36-
const startDate = getMoment('1982-02-12');
37-
const endDate = getMoment('1982-02-12');
3835

39-
const wrapper = mount(
40-
<MomentRangePicker defaultPickerValue={[startDate, endDate]} showTime />,
41-
);
42-
wrapper.openPicker();
43-
expect(wrapper.find('.rc-picker-year-btn').first().text()).toEqual(startDate.format('YYYY'));
44-
});
4536
it('controlled', () => {
4637
const wrapper = mount(
4738
<MomentRangePicker value={[getMoment('1989-11-28'), getMoment('1990-09-03')]} />,
@@ -352,22 +343,54 @@ describe('Picker.Range', () => {
352343
expect(wrapper.find('input').last().props().placeholder).toEqual('bamboo');
353344
});
354345

355-
it('defaultPickerValue', () => {
356-
const wrapper = mount(
357-
<MomentRangePicker defaultPickerValue={[getMoment('1989-11-28'), getMoment('1990-09-03')]} />,
358-
);
346+
describe('defaultPickerValue', () => {
347+
it('defaultPickerValue works', () => {
348+
const wrapper = mount(
349+
<MomentRangePicker
350+
defaultPickerValue={[getMoment('1989-11-28'), getMoment('1990-09-03')]}
351+
/>,
352+
);
359353

360-
wrapper.openPicker();
361-
expect(wrapper.find('PickerPanel').first().find('.rc-picker-header-view').text()).toEqual(
362-
'Nov1989',
363-
);
364-
wrapper.closePicker();
354+
wrapper.openPicker();
355+
expect(wrapper.find('PickerPanel').first().find('.rc-picker-header-view').text()).toEqual(
356+
'Nov1989',
357+
);
358+
wrapper.closePicker();
365359

366-
wrapper.openPicker(1);
367-
expect(wrapper.find('PickerPanel').last().find('.rc-picker-header-view').text()).toEqual(
368-
'Oct1990',
369-
);
370-
wrapper.closePicker(1);
360+
wrapper.openPicker(1);
361+
expect(wrapper.find('PickerPanel').last().find('.rc-picker-header-view').text()).toEqual(
362+
'Oct1990',
363+
);
364+
wrapper.closePicker(1);
365+
});
366+
367+
it('defaultPickerValue with showTime', () => {
368+
const startDate = getMoment('1982-02-12');
369+
const endDate = getMoment('1982-02-12');
370+
371+
const wrapper = mount(
372+
<MomentRangePicker defaultPickerValue={[startDate, endDate]} showTime />,
373+
);
374+
wrapper.openPicker();
375+
expect(wrapper.find('.rc-picker-year-btn').first().text()).toEqual(startDate.format('YYYY'));
376+
});
377+
378+
it('defaultPickerValue with showTime should works when open panel', () => {
379+
const startDate = getMoment('1982-02-12');
380+
const endDate = getMoment('1982-02-12');
381+
382+
const wrapper = mount(
383+
<MomentRangePicker
384+
defaultValue={[startDate, endDate]}
385+
defaultPickerValue={[startDate, endDate]}
386+
showTime
387+
/>,
388+
);
389+
expect(() => {
390+
wrapper.openPicker();
391+
}).not.toThrow();
392+
expect(wrapper.find('.rc-picker-year-btn').first().text()).toEqual(startDate.format('YYYY'));
393+
});
371394
});
372395

373396
describe('focus test', () => {

0 commit comments

Comments
 (0)