Skip to content

Commit ea22824

Browse files
committed
chore: Ranges use select style intead of hover style
1 parent a0ef68b commit ea22824

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/RangePicker.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
317317
},
318318
});
319319

320+
const [rangeHoverValue, setRangeHoverValue] = React.useState<
321+
RangeValue<DateType>
322+
>(null);
323+
320324
// ========================== Hover Range ==========================
321325
const [hoverRangedValue, setHoverRangedValue] = React.useState<
322326
RangeValue<DateType>
@@ -710,7 +714,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
710714
value={{
711715
inRange: true,
712716
panelPosition,
713-
rangedValue: selectedValue,
717+
rangedValue: rangeHoverValue || selectedValue,
714718
hoverRangedValue: panelHoverRangedValue,
715719
onSelect: onContextSelect,
716720
}}
@@ -843,12 +847,10 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
843847
triggerChange(newValues);
844848
}}
845849
onMouseEnter={() => {
846-
setHoverRangedValue(rangeValues);
850+
setRangeHoverValue(rangeValues);
847851
}}
848852
onMouseLeave={() => {
849-
setHoverRangedValue(
850-
updateValues(selectedValue, null, activePickerIndex),
851-
);
853+
setRangeHoverValue(null);
852854
}}
853855
>
854856
{label}

tests/range.spec.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,24 +311,24 @@ describe('Picker.Range', () => {
311311
wrapper.openPicker();
312312
wrapper.find('.rc-picker-ranges li span').simulate('mouseEnter');
313313
expect(
314-
wrapper.findCell(11).hasClass('rc-picker-cell-range-hover-start'),
314+
wrapper.findCell(11).hasClass('rc-picker-cell-range-start'),
315315
).toBeTruthy();
316316
expect(
317-
wrapper.findCell(12).hasClass('rc-picker-cell-range-hover'),
317+
wrapper.findCell(12).hasClass('rc-picker-cell-in-range'),
318318
).toBeTruthy();
319319
expect(
320-
wrapper.findCell(13).hasClass('rc-picker-cell-range-hover-end'),
320+
wrapper.findCell(13).hasClass('rc-picker-cell-range-end'),
321321
).toBeTruthy();
322322

323323
wrapper.find('.rc-picker-ranges li span').simulate('mouseLeave');
324324
expect(
325-
wrapper.findCell(11).hasClass('rc-picker-cell-range-hover-start'),
325+
wrapper.findCell(11).hasClass('rc-picker-cell-range-start'),
326326
).toBeFalsy();
327327
expect(
328-
wrapper.findCell(12).hasClass('rc-picker-cell-range-hover'),
328+
wrapper.findCell(12).hasClass('rc-picker-cell-in-range'),
329329
).toBeFalsy();
330330
expect(
331-
wrapper.findCell(13).hasClass('rc-picker-cell-range-hover-end'),
331+
wrapper.findCell(13).hasClass('rc-picker-cell-range-end'),
332332
).toBeFalsy();
333333
});
334334
});

0 commit comments

Comments
 (0)