Merge branch 'master' into fix/range-picker-arrow-wrong-position

Author: bbb169

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-picker",
-  "version": "4.7.0",
+  "version": "4.7.2",
   "description": "React date & time picker",
   "keywords": [
     "react",

src/PickerInput/Selector/RangeSelector.tsx

@@ -200,8 +200,8 @@ function RangeSelector<DateType extends object = any>(
       const offsetLeft = x - pX;
 
       const activeOffset = placementRight ? parentWidth - inputWidth - offsetLeft : offsetLeft;
-      setActiveBarStyle(({ position }) => ({
-        position,
+      setActiveBarStyle(({ insetInlineStart, insetInlineEnd, ...rest }) => ({
+        ...rest,
         width: inputWidth,
         // parent will have border while focus, so need to  cut `parentBorderWidth` on opposite side.
         [offsetUnit]: activeOffset - parentBorderRightWidth,

src/PickerInput/hooks/useRangeValue.ts

@@ -270,10 +270,9 @@ export default function useRangeValue<ValueType extends DateType[], DateType ext
     // >>> Invalid
     const validateDates =
       // Validate start
-      (!start || !isInvalidateDate(start, { activeIndex: 0 })) &&
+      (disabled[0] || !start || !isInvalidateDate(start, { activeIndex: 0 })) &&
       // Validate end
-      (!end || !isInvalidateDate(end, { from: start, activeIndex: 1 }));
-
+      (disabled[1] || !end || !isInvalidateDate(end, { from: start, activeIndex: 1 }));
     // >>> Result
     const allPassed =
       // Null value is from clear button

tests/range.spec.tsx

@@ -231,6 +231,43 @@ describe('Picker.Range', () => {
       expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
     });
 
+    it('should not be checked if the startDate is disabled', () => {
+      const onChange = jest.fn();
+      const { container } = render(
+        <DayRangePicker
+          disabled={[true, false]}
+          defaultValue={[getDay('2024-10-28'), getDay('2024-11-20')]}
+          disabledDate={(date: Dayjs) => date <= dayjs('2024-11-20').endOf('day')}
+          onChange={onChange}
+        />,
+      );
+
+      openPicker(container, 1);
+      selectCell('21', 1);
+      expect(onChange).toHaveBeenCalledWith(
+        [expect.anything(), expect.anything()],
+        ['2024-10-28', '2024-11-21'],
+      );
+    });
+    it('should not be checked if the endDate is disabled', () => {
+      const onChange = jest.fn();
+      const { container } = render(
+        <DayRangePicker
+          disabled={[false, true]}
+          defaultValue={[getDay('2024-10-28'), getDay('2024-11-20')]}
+          disabledDate={(date: Dayjs) => date >= dayjs('2024-11-10').endOf('day')}
+          onChange={onChange}
+        />,
+      );
+
+      openPicker(container, 0);
+      selectCell('21', 0);
+      expect(onChange).toHaveBeenCalledWith(
+        [expect.anything(), expect.anything()],
+        ['2024-10-21', '2024-11-20'],
+      );
+    });
+
     it('should close panel when finish first choose with showTime = true and disabled = [false, true]', () => {
       const { baseElement } = render(<DayRangePicker showTime disabled={[false, true]} />);
       expect(baseElement.querySelectorAll('.rc-picker-input')).toHaveLength(2);