fix: do not select disabled cells after page switch

arfedulov · Dec 31, 2018 · b536d89 · b536d89
1 parent 394470c
commit b536d89
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 25 deletions.
diff --git a/example/calendar.tsx b/example/calendar.tsx
@@ -138,7 +138,6 @@ class DateTimeForm extends React.Component<any, any> {
           clearable={clearable}
           value={this.state.dateTime}
           iconPosition='left'
-          minDate={moment('2018-12-31 10:20')}
           preserveViewMode={false}
           autoComplete='off'
           onChange={this.handleChange}

diff --git a/src/pickers/MonthPicker.tsx b/src/pickers/MonthPicker.tsx
@@ -208,22 +208,26 @@ class MonthPicker
     this.props.onChange(e, data);
   }
 
-  protected switchToNextPage = (): void => {
+  protected switchToNextPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const nextDate = date.clone();
       nextDate.add(1, 'year');
 
       return { date: nextDate };
-    });
+    }, callback);
   }
 
-  protected switchToPrevPage = (): void => {
+  protected switchToPrevPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const prevDate = date.clone();
       prevDate.subtract(1, 'year');
 
       return { date: prevDate };
-    });
+    }, callback);
   }
 }
 

diff --git a/src/pickers/YearPicker.tsx b/src/pickers/YearPicker.tsx
@@ -206,7 +206,9 @@ class YearPicker extends SingleSelectionPicker<YearPickerProps> {
     this.props.onChange(e, data);
   }
 
-  protected switchToNextPage = (e, data, callback): void => {
+  protected switchToNextPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const nextDate = date.clone();
       nextDate.add(YEARS_ON_PAGE, 'year');
@@ -215,7 +217,9 @@ class YearPicker extends SingleSelectionPicker<YearPickerProps> {
     }, callback);
   }
 
-  protected switchToPrevPage = (e, data, callback): void => {
+  protected switchToPrevPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const prevDate = date.clone();
       prevDate.subtract(YEARS_ON_PAGE, 'year');

diff --git a/src/pickers/dayPicker/DatesRangePicker.tsx b/src/pickers/dayPicker/DatesRangePicker.tsx
@@ -236,22 +236,26 @@ class DatesRangePicker
     this.props.onChange(e, data);
   }
 
-  protected switchToNextPage = (): void => {
+  protected switchToNextPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const nextDate = date.clone();
       nextDate.add(1, 'month');
 
       return { date: nextDate };
-    });
+    }, callback);
   }
 
-  protected switchToPrevPage = (): void => {
+  protected switchToPrevPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const prevDate = date.clone();
       prevDate.subtract(1, 'month');
 
       return { date: prevDate };
-    });
+    }, callback);
   }
 }
 

diff --git a/src/pickers/dayPicker/DayPicker.tsx b/src/pickers/dayPicker/DayPicker.tsx
@@ -176,22 +176,26 @@ class DayPicker
     this.props.onChange(e, data);
   }
 
-  protected switchToNextPage = (): void => {
+  protected switchToNextPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const nextDate = date.clone();
       nextDate.add(1, 'month');
 
       return { date: nextDate };
-    });
+    }, callback);
   }
 
-  protected switchToPrevPage = (): void => {
+  protected switchToPrevPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const prevDate = date.clone();
       prevDate.subtract(1, 'month');
 
       return { date: prevDate };
-    });
+    }, callback);
   }
 }
 

diff --git a/src/pickers/timePicker/HourPicker.tsx b/src/pickers/timePicker/HourPicker.tsx
@@ -192,22 +192,26 @@ class HourPicker
     this.props.onChange(e, data);
   }
 
-  protected switchToNextPage = (): void => {
+  protected switchToNextPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const nextDate = date.clone();
       nextDate.add(1, 'day');
 
       return { date: nextDate };
-    });
+    }, callback);
   }
 
-  protected switchToPrevPage = (): void => {
+  protected switchToPrevPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const prevDate = date.clone();
       prevDate.subtract(1, 'day');
 
       return { date: prevDate };
-    });
+    }, callback);
   }
 }
 

diff --git a/src/pickers/timePicker/MinutePicker.tsx b/src/pickers/timePicker/MinutePicker.tsx
@@ -200,22 +200,26 @@ class MinutePicker
     this.props.onChange(e, data);
   }
 
-  protected switchToNextPage = (): void => {
+  protected switchToNextPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const nextDate = date.clone();
       nextDate.add(1, 'day');
 
       return { date: nextDate };
-    });
+    }, callback);
   }
 
-  protected switchToPrevPage = (): void => {
+  protected switchToPrevPage = (e: React.SyntheticEvent,
+                                data: any,
+                                callback: () => void): void => {
     this.setState(({ date }) => {
       const prevDate = date.clone();
       prevDate.subtract(1, 'day');
 
       return { date: prevDate };
-    });
+    }, callback);
   }
 }
 

diff --git a/src/views/BaseCalendarView.ts b/src/views/BaseCalendarView.ts
@@ -63,9 +63,9 @@ export interface CalendarWithOptionalHeaderViewProps {
   /** Whether a calendar has header. */
   hasHeader: boolean;
   /** Called after click on next page button. */
-  onNextPageBtnClick?: () => void;
+  onNextPageBtnClick?: (e?: React.SyntheticEvent, data?: any, cb?: () => void) => void;
   /** Called after click on previous page button. */
-  onPrevPageBtnClick?: () => void;
+  onPrevPageBtnClick?: (e?: React.SyntheticEvent, data?: any, cb?: () => void) => void;
   /** Whether to display previous page button as active or disabled. */
   hasPrevPage?: boolean;
   /** Whether to display next page button as active or disabled. */