Revert "[DateTime] Add dayPickerProps to datetime components" (#1693)

* Revert "Prepare Release 1.31.0 (#1687)" This reverts commit b55feef. * Revert "[DateTime] Add dayPickerProps to datetime components (#1647)" This reverts commit 21f63bc.
palantir · Oct 9, 2017 · 84b7b56 · 84b7b56 · blueprint-bot · Oct 9, 2017
1 parent b55feef
commit 84b7b56
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 557 deletions.
diff --git a/packages/datetime/src/dateInput.tsx b/packages/datetime/src/dateInput.tsx
@@ -8,7 +8,6 @@
 import * as classNames from "classnames";
 import * as moment from "moment";
 import * as React from "react";
-import * as ReactDayPicker from "react-day-picker";
 
 import {
     AbstractComponent,
@@ -50,16 +49,6 @@ export interface IDateInputProps extends IDatePickerBaseProps, IProps {
      */
     closeOnSelection?: boolean;
 
-    /**
-     * Props to pass to ReactDayPicker. See API documentation
-     * [here](http://react-day-picker.js.org/docs/api-daypicker.html).
-     *
-     * The following props are managed by the component and cannot be configured:
-     * `canChangeMonth`, `captionElement`, `fromMonth` (use `minDate`), `month` (use
-     * `initialMonth`), `toMonth` (use `maxDate`).
-     */
-    dayPickerProps?: ReactDayPicker.Props;
-
     /**
      * Whether the date input is non-interactive.
      * @default false
@@ -158,7 +147,6 @@ export interface IDateInputState {
 export class DateInput extends AbstractComponent<IDateInputProps, IDateInputState> {
     public static defaultProps: IDateInputProps = {
         closeOnSelection: true,
-        dayPickerProps: {},
         disabled: false,
         format: "YYYY-MM-DD",
         invalidDateMessage: "Invalid date",

diff --git a/packages/datetime/src/datePicker.tsx b/packages/datetime/src/datePicker.tsx
@@ -24,16 +24,6 @@ export interface IDatePickerProps extends IDatePickerBaseProps, IProps {
      */
     canClearSelection?: boolean;
 
-    /**
-     * Props to pass to ReactDayPicker. See API documentation
-     * [here](http://react-day-picker.js.org/docs/api-daypicker.html).
-     *
-     * The following props are managed by the component and cannot be configured:
-     * `canChangeMonth`, `captionElement`, `fromMonth` (use `minDate`), `month` (use
-     * `initialMonth`), `toMonth` (use `maxDate`).
-     */
-    dayPickerProps?: ReactDayPicker.Props;
-
     /**
      * Initial day the calendar will display as selected.
      * This should not be set if `value` is set.
@@ -71,7 +61,6 @@ export interface IDatePickerState {
 export class DatePicker extends AbstractComponent<IDatePickerProps, IDatePickerState> {
     public static defaultProps: IDatePickerProps = {
         canClearSelection: true,
-        dayPickerProps: {},
         maxDate: getDefaultMaxDate(),
         minDate: getDefaultMinDate(),
         showActionsBar: false,
@@ -117,30 +106,20 @@ export class DatePicker extends AbstractComponent<IDatePickerProps, IDatePickerS
     }
 
     public render() {
-        const {
-            className,
-            dayPickerProps,
-            locale,
-            localeUtils,
-            maxDate,
-            minDate,
-            modifiers,
-            showActionsBar,
-        } = this.props;
+        const { className, locale, localeUtils, maxDate, minDate, showActionsBar } = this.props;
         const { displayMonth, displayYear } = this.state;
 
         return (
             <div className={classNames(Classes.DATEPICKER, className)}>
                 <ReactDayPicker
-                    enableOutsideDays={true}
-                    locale={locale}
-                    localeUtils={localeUtils}
-                    modifiers={modifiers}
-                    {...dayPickerProps}
                     canChangeMonth={true}
                     captionElement={this.renderCaption}
-                    disabledDays={this.getDisabledDaysModifier()}
+                    disabledDays={this.disabledDays}
+                    enableOutsideDays={true}
                     fromMonth={minDate}
+                    locale={locale}
+                    localeUtils={localeUtils}
+                    modifiers={this.props.modifiers}
                     month={new Date(displayYear, displayMonth)}
                     onDayClick={this.handleDayClick}
                     onMonthChange={this.handleMonthChange}
@@ -192,12 +171,6 @@ export class DatePicker extends AbstractComponent<IDatePickerProps, IDatePickerS
 
     private disabledDays = (day: Date) => !DateUtils.isDayInRange(day, [this.props.minDate, this.props.maxDate]);
 
-    private getDisabledDaysModifier = () => {
-        const { dayPickerProps: { disabledDays } } = this.props;
-
-        return disabledDays instanceof Array ? [this.disabledDays, ...disabledDays] : [this.disabledDays, disabledDays];
-    };
-
     private renderCaption = (props: ReactDayPicker.CaptionElementProps) => (
         <DatePickerCaption
             {...props}
@@ -225,13 +198,7 @@ export class DatePicker extends AbstractComponent<IDatePickerProps, IDatePickerS
         );
     }
 
-    private handleDayClick = (
-        day: Date,
-        modifiers: ReactDayPicker.DayModifiers,
-        e: React.MouseEvent<HTMLDivElement>,
-    ) => {
-        Utils.safeInvoke(this.props.dayPickerProps.onDayClick, day, modifiers, e);
-
+    private handleDayClick = (day: Date, modifiers: ReactDayPicker.DayModifiers) => {
         let newValue = day;
 
         if (this.props.canClearSelection && modifiers.selected) {
@@ -301,8 +268,6 @@ export class DatePicker extends AbstractComponent<IDatePickerProps, IDatePickerS
             }
         }
 
-        Utils.safeInvoke(this.props.dayPickerProps.onMonthChange, value);
-
         this.setStateWithValueIfUncontrolled({ displayMonth, displayYear }, value);
     };
 
@@ -314,8 +279,6 @@ export class DatePicker extends AbstractComponent<IDatePickerProps, IDatePickerS
             Utils.safeInvoke(this.props.onChange, value, false);
         }
 
-        Utils.safeInvoke(this.props.dayPickerProps.onMonthChange, value);
-
         this.setStateWithValueIfUncontrolled({ displayMonth }, value);
     };
 
@@ -340,8 +303,6 @@ export class DatePicker extends AbstractComponent<IDatePickerProps, IDatePickerS
             }
         }
 
-        Utils.safeInvoke(this.props.dayPickerProps.onMonthChange, value);
-
         this.setStateWithValueIfUncontrolled({ displayMonth, displayYear }, value);
     };
 

diff --git a/packages/datetime/src/dateRangeInput.tsx b/packages/datetime/src/dateRangeInput.tsx
@@ -8,7 +8,6 @@
 import * as classNames from "classnames";
 import * as moment from "moment";
 import * as React from "react";
-import * as ReactDayPicker from "react-day-picker";
 
 import {
     AbstractComponent,
@@ -62,16 +61,6 @@ export interface IDateRangeInputProps extends IDatePickerBaseProps, IProps {
      */
     contiguousCalendarMonths?: boolean;
 
-    /**
-     * Props to pass to ReactDayPicker. See API documentation
-     * [here](http://react-day-picker.js.org/docs/api-daypicker.html).
-     *
-     * The following props are managed by the component and cannot be configured:
-     * `canChangeMonth`, `captionElement`, `numberOfMonths`, `fromMonth` (use
-     * `minDate`), `month` (use `initialMonth`), `toMonth` (use `maxDate`).
-     */
-    dayPickerProps?: ReactDayPicker.Props;
-
     /**
      * The default date range to be used in the component when uncontrolled.
      * This will be ignored if `value` is set.
@@ -218,7 +207,6 @@ export class DateRangeInput extends AbstractComponent<IDateRangeInputProps, IDat
         allowSingleDayRange: false,
         closeOnSelection: true,
         contiguousCalendarMonths: true,
-        dayPickerProps: {},
         disabled: false,
         endInputProps: {},
         format: "YYYY-MM-DD",