diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx
index fae8f42d3..8fa17c2b1 100644
--- a/src/RangePicker.tsx
+++ b/src/RangePicker.tsx
@@ -73,7 +73,7 @@ function canValueTrigger<DateType>(
     return true;
   }
 
-  if (disabled[(index + 1) % 2]) {
+  if (disabled[(index+1) % 2]) {
     return true;
   }
 
@@ -394,6 +394,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   }
 
   function triggerChange(newValue: RangeValue<DateType>, sourceIndex: 0 | 1) {
+    if(mergedDisabled[sourceIndex])
+      return
     let values = newValue;
     let startValue = getValue(values, 0);
     let endValue = getValue(values, 1);
@@ -447,7 +449,6 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
     const canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
 
     const canTrigger = values === null || (canStartValueTrigger && canEndValueTrigger);
-
     if (canTrigger) {
       // Trigger onChange only when value is validate
       setInnerValue(values);
@@ -539,6 +540,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   });
 
   const onDateMouseEnter = (date: DateType) => {
+    if(mergedDisabled[mergedActivePickerIndex]) 
+      return 
     setHoverRangedValue(updateValues(selectedValue, date, mergedActivePickerIndex));
     if (mergedActivePickerIndex === 0) {
       onStartEnter(date);
@@ -548,6 +551,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   };
 
   const onDateMouseLeave = () => {
+    if(mergedDisabled[mergedActivePickerIndex]) 
+      return 
     setHoverRangedValue(updateValues(selectedValue, null, mergedActivePickerIndex));
     if (mergedActivePickerIndex === 0) {
       onStartLeave();
diff --git a/tests/__snapshots__/range.spec.tsx.snap b/tests/__snapshots__/range.spec.tsx.snap
index 43bc750bc..820a81c6f 100644
--- a/tests/__snapshots__/range.spec.tsx.snap
+++ b/tests/__snapshots__/range.spec.tsx.snap
@@ -136,7 +136,7 @@ exports[`Picker.Range panelRender 1`] = `
   <div>
     <div
       class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
-      style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
+      style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
     >
       <div
         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`
   <div>
     <div
       class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
-      style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
+      style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
     >
       <div
         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
   <div>
     <div
       class="rc-picker-dropdown rc-picker-dropdown-range rc-picker-dropdown-placement-bottomLeft"
-      style="left: -1000vw; top: -1000vh; box-sizing: border-box;"
+      style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
     >
       <div
         class="rc-picker-range-wrapper rc-picker-month-range-wrapper"