Skip to content

Commit ce62257

Browse files
committed
fix: mode of rangePicker is array
1 parent 2b1678d commit ce62257

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

src/RangePicker.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
DisabledTimes,
1111
DisabledTime,
1212
PickerMode,
13+
PanelMode,
1314
} from './interface';
1415
import { toArray } from './utils/miscUtil';
1516
import RangeContext from './RangeContext';
@@ -45,6 +46,7 @@ export interface RangePickerSharedProps<DateType> {
4546
separator?: React.ReactNode;
4647
allowEmpty?: [boolean, boolean];
4748
selectable?: [boolean, boolean];
49+
mode?: [PanelMode, PanelMode];
4850
onChange?: (
4951
value: RangeValue<DateType>,
5052
formatString: [string, string],
@@ -68,6 +70,7 @@ type OmitPickerProps<Props> = Omit<
6870
| 'disabledTime'
6971
| 'showToday'
7072
| 'showTime'
73+
| 'mode'
7174
>;
7275

7376
export interface RangePickerBaseProps<DateType>
@@ -116,6 +119,7 @@ function InternalRangePicker<DateType>(
116119
defaultValue,
117120
defaultPickerValue,
118121
separator = '~',
122+
mode,
119123
picker,
120124
pickerRef,
121125
locale,
@@ -331,6 +335,7 @@ function InternalRangePicker<DateType>(
331335
placeholder={placeholder && placeholder[0]}
332336
defaultPickerValue={defaultPickerValue && defaultPickerValue[0]}
333337
{...{ disabledTime: disabledStartTime, showTime: startShowTime }} // Fix ts define
338+
mode={mode && mode[0]}
334339
disabled={disabled || mergedSelectable[0] === false}
335340
disabledDate={disabledStartDate}
336341
onChange={date => {
@@ -348,6 +353,7 @@ function InternalRangePicker<DateType>(
348353
placeholder={placeholder && placeholder[1]}
349354
defaultPickerValue={defaultPickerValue && defaultPickerValue[1]}
350355
{...{ disabledTime: disabledEndTime, showTime: endShowTime }} // Fix ts define
356+
mode={mode && mode[1]}
351357
disabled={disabled || mergedSelectable[1] === false}
352358
disabledDate={disabledEndDate}
353359
onChange={date => {

tests/range.spec.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,4 +447,13 @@ describe('Range', () => {
447447
matchValues(wrapper, '1990-09-13 01:02:03', '1990-09-23 05:06:07');
448448
});
449449
});
450+
451+
it('mode is array', () => {
452+
const wrapper = mount(<MomentRangePicker mode={['year', 'month']} />);
453+
wrapper.openPicker();
454+
expect(wrapper.find('.rc-picker-year-panel')).toHaveLength(1);
455+
456+
wrapper.openPicker(1);
457+
expect(wrapper.find('.rc-picker-month-panel')).toHaveLength(1);
458+
});
450459
});

0 commit comments

Comments
 (0)