Skip to content

Commit 3ec319c

Browse files
committed
fix: RangePicker right panel swith to month should not back of year
1 parent 28b752b commit 3ec319c

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/RangePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
805805
);
806806

807807
let viewDate = date;
808-
if (panelPosition === 'right') {
808+
if (panelPosition === 'right' && mergedModes[mergedActivePickerIndex] === newMode) {
809809
viewDate = getClosingViewDate(viewDate, newMode as any, generateConfig, -1);
810810
}
811811
setViewDate(viewDate, mergedActivePickerIndex);

tests/range.spec.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,4 +1734,14 @@ describe('Picker.Range', () => {
17341734

17351735
matchValues(wrapper, '1990-09-09', '1990-10-09');
17361736
});
1737+
1738+
it('right date panel switch to month should keep in the same year', () => {
1739+
const wrapper = mount(<MomentRangePicker />);
1740+
wrapper.openPicker(0);
1741+
wrapper
1742+
.find('.rc-picker-month-btn')
1743+
.last()
1744+
.simulate('click');
1745+
expect(wrapper.find('.rc-picker-year-btn').text()).toEqual('1990');
1746+
});
17371747
});

0 commit comments

Comments
 (0)