Skip to content

fix: RangePicker.defaultPickerValue has no effect if showTime is set #291

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 1 commit into from
Sep 4, 2021
Merged

fix: RangePicker.defaultPickerValue has no effect if showTime is set #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/PickerPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ export type PickerPanelDateProps<DateType> = {

export type PickerPanelTimeProps<DateType> = {
picker: 'time';
} & PickerPanelSharedProps<DateType> & SharedTimeProps<DateType>;
} & PickerPanelSharedProps<DateType> &
SharedTimeProps<DateType>;

export type PickerPanelProps<DateType> =
| PickerPanelBaseProps<DateType>
Expand Down Expand Up @@ -208,12 +209,16 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
// When value is null and set showTime
if (!mergedValue && showTime) {
if (typeof showTime === 'object') {
return setDateTime(generateConfig, date, showTime.defaultValue || now);
return setDateTime(
generateConfig,
Array.isArray(date) ? date[0] : date,
showTime.defaultValue || now,
);
}
if (defaultValue) {
return setDateTime(generateConfig, date, defaultValue);
return setDateTime(generateConfig, Array.isArray(date) ? date[0] : date, defaultValue);
}
return setDateTime(generateConfig, date, now);
return setDateTime(generateConfig, Array.isArray(date) ? date[0] : date, now);
}
return date;
},
Expand Down
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 @@ -848,7 +848,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
defaultValue={
mergedActivePickerIndex === 0 ? getValue(selectedValue, 1) : getValue(selectedValue, 0)
}
defaultPickerValue={undefined}
// defaultPickerValue={undefined}
/>
</RangeContext.Provider>
);
Expand Down
9 changes: 9 additions & 0 deletions tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,16 @@ describe('Picker.Range', () => {

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

const wrapper = mount(
<MomentRangePicker defaultPickerValue={[startDate, endDate]} showTime />,
);
wrapper.openPicker();
expect(wrapper.find('.rc-picker-year-btn').first().text()).toEqual(startDate.format('YYYY'));
});
it('controlled', () => {
const wrapper = mount(
<MomentRangePicker value={[getMoment('1989-11-28'), getMoment('1990-09-03')]} />,
Expand Down