Merge 14997d0 into 1d0a25f

Author: BoyYangzai

src/hooks/useRangeDisabled.ts

@@ -43,7 +43,7 @@ export default function useRangeDisabled<DateType>(
 
   const disabledStartDate = React.useCallback(
     (date: DateType) => {
-      if (disabledDate && disabledDate(date)) {
+      if (disabled[0] || (disabledDate && disabledDate(date))) {
         return true;
       }
 
@@ -75,7 +75,8 @@ export default function useRangeDisabled<DateType>(
 
   const disabledEndDate = React.useCallback(
     (date: DateType) => {
-      if (disabledDate && disabledDate(date)) {
+
+      if (disabled[1] || (disabledDate && disabledDate(date))) {
         return true;
       }
 

tests/range.spec.tsx

@@ -252,14 +252,22 @@ describe('Picker.Range', () => {
     });
 
     it('should close panel when finish choose panel and next is disabled with disabled = [false, true]/[true,false]', () => {
-      const { baseElement, container } = render(<MomentRangePicker disabled={[false, true]} />);
+      const { baseElement } = render(<MomentRangePicker disabled={[false, true]} />);
       expect(baseElement.querySelectorAll('.rc-picker-input')).toHaveLength(2);
       fireEvent.click(baseElement.querySelectorAll('.rc-picker-input')[0]);
       expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeFalsy();
       fireEvent.click(baseElement.querySelector('.rc-picker-cell-inner'));
       expect(baseElement.querySelector('.rc-picker-dropdown-hidden')).toBeTruthy();
     });
 
+    it('panel can not be clicked with open and disabled', () => {
+      const onChange = jest.fn();
+      const { baseElement } = render(<MomentRangePicker disabled open onChange={onChange} />);
+      expect(baseElement.querySelector('.rc-picker-cell')).toBeTruthy();
+      fireEvent.click(baseElement.querySelector('.rc-picker-cell'));
+      expect(onChange).not.toBeCalled();
+    });
+
     it('startDate will have disabledDate when endDate is not selectable', () => {
       const onChange = jest.fn();
       const { container } = render(