Skip to content

fix: RangePicker should reorder when start is after end #31

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 2 commits into from
Mar 5, 2020
Merged

fix: RangePicker should reorder when start is after end #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15c05a
should reorder when range exchange
zombieJ Mar 5, 2020
2fb6736
add test case
zombieJ Mar 5, 2020
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
26 changes: 16 additions & 10 deletions src/RangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,25 +382,31 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
const startValue = getValue(values, 0);
let endValue = getValue(values, 1);

// Clean up end date when start date is after end date
if (
startValue &&
endValue &&
!isSameDate(generateConfig, startValue, endValue) &&
generateConfig.isAfter(startValue, endValue)
) {
values = [startValue, null];
endValue = null;
if (!isSameDate(generateConfig, startValue, endValue)) {
// Clean up end date when start date is after end date
values = [startValue, null];
endValue = null;
} else {
// Reorder when in same date
values = [endValue, startValue];
}
}

setSelectedValue(values);

const startStr = startValue
? generateConfig.locale.format(locale.locale, startValue, formatList[0])
: '';
const endStr = endValue
? generateConfig.locale.format(locale.locale, endValue, formatList[0])
: '';
const startStr =
values && values[0]
? generateConfig.locale.format(locale.locale, values[0], formatList[0])
: '';
const endStr =
values && values[1]
? generateConfig.locale.format(locale.locale, values[1], formatList[0])
: '';

if (onCalendarChange) {
onCalendarChange(values, [startStr, endStr]);
Expand Down
36 changes: 36 additions & 0 deletions tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,4 +1045,40 @@ describe('Picker.Range', () => {
expect(wrapper.find('DatePanel').length).toBeFalsy();
expect(wrapper.find('MonthPanel').length).toBeTruthy();
});

it('datetime should reorder in onChange if start is after end in same date', () => {
const onChange = jest.fn();

const wrapper = mount(<MomentRangePicker onChange={onChange} showTime />);
wrapper.openPicker();
wrapper.selectCell(15);
wrapper
.find('ul')
.first()
.find('li')
.last()
.simulate('click');
wrapper.find('.rc-picker-ok button').simulate('click');

wrapper.selectCell(15);
wrapper
.find('ul')
.first()
.find('li')
.first()
.simulate('click');
wrapper.find('.rc-picker-ok button').simulate('click');

expect(onChange).toHaveBeenCalledWith(expect.anything(), [
'1990-09-15 00:00:00',
'1990-09-15 23:00:00',
]);

expect(
isSame(onChange.mock.calls[0][0][0], '1990-09-15 00:00:00'),
).toBeTruthy();
expect(
isSame(onChange.mock.calls[0][0][1], '1990-09-15 23:00:00'),
).toBeTruthy();
});
});