Skip to content

Commit 1c31f02

Browse files
authored
Merge 139279d into 85a8c5b
2 parents 85a8c5b + 139279d commit 1c31f02

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/RangePicker.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function canValueTrigger<DateType>(
7373
return true;
7474
}
7575

76-
if (disabled[(index + 1) % 2]) {
76+
if (disabled[(index+1) % 2]) {
7777
return true;
7878
}
7979

@@ -394,6 +394,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
394394
}
395395

396396
function triggerChange(newValue: RangeValue<DateType>, sourceIndex: 0 | 1) {
397+
if(mergedDisabled[sourceIndex])
398+
return
397399
let values = newValue;
398400
let startValue = getValue(values, 0);
399401
let endValue = getValue(values, 1);
@@ -447,7 +449,6 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
447449
const canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
448450

449451
const canTrigger = values === null || (canStartValueTrigger && canEndValueTrigger);
450-
451452
if (canTrigger) {
452453
// Trigger onChange only when value is validate
453454
setInnerValue(values);
@@ -539,6 +540,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
539540
});
540541

541542
const onDateMouseEnter = (date: DateType) => {
543+
if(mergedDisabled[mergedActivePickerIndex])
544+
return
542545
setHoverRangedValue(updateValues(selectedValue, date, mergedActivePickerIndex));
543546
if (mergedActivePickerIndex === 0) {
544547
onStartEnter(date);
@@ -548,6 +551,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
548551
};
549552

550553
const onDateMouseLeave = () => {
554+
if(mergedDisabled[mergedActivePickerIndex])
555+
return
551556
setHoverRangedValue(updateValues(selectedValue, null, mergedActivePickerIndex));
552557
if (mergedActivePickerIndex === 0) {
553558
onStartLeave();

tests/__snapshots__/range.spec.tsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ exports[`Picker.Range panelRender 1`] = `
136136
<div>
137137
<div
138138
class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
139-
style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
139+
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
140140
>
141141
<div
142142
class="rc-picker-range-wrapper rc-picker-date-range-wrapper"
@@ -201,7 +201,7 @@ exports[`Picker.Range use dateRender and monthCellRender in date range picker 1`
201201
<div>
202202
<div
203203
class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
204-
style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
204+
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
205205
>
206206
<div
207207
class="rc-picker-range-wrapper rc-picker-date-range-wrapper"
@@ -1161,7 +1161,7 @@ exports[`Picker.Range use dateRender and monthCellRender in month range picker 1
11611161
<div>
11621162
<div
11631163
class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
1164-
style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
1164+
style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
11651165
>
11661166
<div
11671167
class="rc-picker-range-wrapper rc-picker-month-range-wrapper"

0 commit comments

Comments
 (0)