Skip to content

fix: RangePicker selection switch #48

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
Apr 9, 2020
Merged

fix: RangePicker selection switch #48

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
f2a34bd
fix range logic
zombieJ Apr 9, 2020
5c6bb8c
test case
zombieJ Apr 9, 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
27 changes: 20 additions & 7 deletions src/RangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,11 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
updateValues(selectedValue, date, mergedActivePickerIndex),
);

setViewDate(date, mergedActivePickerIndex);
let viewDate = date;
if (panelPosition === 'right') {
viewDate = getClosingViewDate(viewDate, newMode as any, generateConfig, -1);
}
setViewDate(viewDate, mergedActivePickerIndex);
}}
onOk={null}
onSelect={undefined}
Expand Down Expand Up @@ -725,12 +729,21 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
},
});

panels = (
<>
{direction === 'rtl' ? rightPanel : leftPanel}
{direction === 'rtl' ? showDoublePanel && leftPanel : showDoublePanel && rightPanel}
</>
);
if (direction === 'rtl') {
panels = (
<>
{rightPanel}
{showDoublePanel && leftPanel}
</>
);
} else {
panels = (
<>
{leftPanel}
{showDoublePanel && rightPanel}
</>
);
}
} else {
panels = renderPanel();
}
Expand Down
22 changes: 22 additions & 0 deletions tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,28 @@ describe('Picker.Range', () => {
});
},
);

// https://github.com/ant-design/ant-design/issues/22991
it('click switch 1 offset', () => {
const wrapper = mount(<MomentRangePicker />);
wrapper.openPicker();
expect(
wrapper
.find('.rc-picker-header-view')
.first()
.text(),
).toEqual('Sep1990');
wrapper
.find('.rc-picker-header-next-btn')
.last()
.simulate('click');
expect(
wrapper
.find('.rc-picker-header-view')
.first()
.text(),
).toEqual('Oct1990');
});
});

// https://github.com/ant-design/ant-design/issues/20868
Expand Down