Pass through modifiers propType

react-dates · Jun 24, 2018 · d144670 · d144670
1 parent 0875b1b
commit d144670
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/components/CalendarMonth.jsx b/src/components/CalendarMonth.jsx
@@ -12,7 +12,7 @@ import { CalendarDayPhrases } from '../defaultPhrases';
 import getPhrasePropTypes from '../utils/getPhrasePropTypes';
 
 import CalendarWeek from './CalendarWeek';
-import CalendarDay from './CalendarDay';
+import CalendarDay, { propTypes as CalendarDayPropTypes } from './CalendarDay';
 
 import calculateDimension from '../utils/calculateDimension';
 import getCalendarMonthWeeks from '../utils/getCalendarMonthWeeks';
@@ -29,12 +29,12 @@ import {
   DAY_SIZE,
 } from '../constants';
 
-const propTypes = forbidExtraProps({
+export const propTypes = {
   ...withStylesPropTypes,
   month: momentPropTypes.momentObj,
   isVisible: PropTypes.bool,
   enableOutsideDays: PropTypes.bool,
-  modifiers: PropTypes.object,
+  modifiers: PropTypes.objectOf(CalendarDayPropTypes.modifiers),
   orientation: ScrollableOrientationShape,
   daySize: nonNegativeInteger,
   onDayClick: PropTypes.func,
@@ -57,7 +57,7 @@ const propTypes = forbidExtraProps({
   monthFormat: PropTypes.string,
   phrases: PropTypes.shape(getPhrasePropTypes(CalendarDayPhrases)),
   dayAriaLabelFormat: PropTypes.string,
-});
+};
 
 const defaultProps = {
   month: moment(),
@@ -234,7 +234,7 @@ class CalendarMonth extends React.Component {
   }
 }
 
-CalendarMonth.propTypes = propTypes;
+CalendarMonth.propTypes = forbidExtraProps(propTypes);
 CalendarMonth.defaultProps = defaultProps;
 
 export default withStyles(({ reactDates: { color, font, spacing } }) => ({

diff --git a/src/components/CalendarMonthGrid.jsx b/src/components/CalendarMonthGrid.jsx
@@ -10,7 +10,7 @@ import { addEventListener } from 'consolidated-events';
 import { CalendarDayPhrases } from '../defaultPhrases';
 import getPhrasePropTypes from '../utils/getPhrasePropTypes';
 
-import CalendarMonth from './CalendarMonth';
+import CalendarMonth, { propTypes as CalendarMonthPropTypes } from './CalendarMonth';
 
 import isTransitionEndSupported from '../utils/isTransitionEndSupported';
 import getTransformStyles from '../utils/getTransformStyles';
@@ -29,14 +29,14 @@ import {
   DAY_SIZE,
 } from '../constants';
 
-const propTypes = forbidExtraProps({
+export const propTypes = {
   ...withStylesPropTypes,
   enableOutsideDays: PropTypes.bool,
   firstVisibleMonthIndex: PropTypes.number,
   initialMonth: momentPropTypes.momentObj,
   isAnimating: PropTypes.bool,
   numberOfMonths: PropTypes.number,
-  modifiers: PropTypes.object,
+  modifiers: PropTypes.objectOf(CalendarMonthPropTypes.modifiers),
   orientation: ScrollableOrientationShape,
   onDayClick: PropTypes.func,
   onDayMouseEnter: PropTypes.func,
@@ -62,7 +62,7 @@ const propTypes = forbidExtraProps({
   monthFormat: PropTypes.string,
   phrases: PropTypes.shape(getPhrasePropTypes(CalendarDayPhrases)),
   dayAriaLabelFormat: PropTypes.string,
-});
+};
 
 const defaultProps = {
   enableOutsideDays: false,
@@ -354,7 +354,7 @@ class CalendarMonthGrid extends React.Component {
   }
 }
 
-CalendarMonthGrid.propTypes = propTypes;
+CalendarMonthGrid.propTypes = forbidExtraProps(propTypes);
 CalendarMonthGrid.defaultProps = defaultProps;
 
 export default withStyles(({ reactDates: { color, zIndex } }) => ({

diff --git a/src/components/DayPicker.jsx b/src/components/DayPicker.jsx
@@ -12,7 +12,7 @@ import OutsideClickHandler from 'react-outside-click-handler';
 import { DayPickerPhrases } from '../defaultPhrases';
 import getPhrasePropTypes from '../utils/getPhrasePropTypes';
 
-import CalendarMonthGrid from './CalendarMonthGrid';
+import CalendarMonthGrid, { propTypes as CalendarMonthGridPropTypes } from './CalendarMonthGrid';
 import DayPickerNavigation from './DayPickerNavigation';
 import DayPickerKeyboardShortcuts, {
   TOP_LEFT,
@@ -86,7 +86,7 @@ const propTypes = forbidExtraProps({
   renderMonthElement: mutuallyExclusiveProps(PropTypes.func, 'renderMonthText', 'renderMonthElement'),
 
   // day props
-  modifiers: PropTypes.object,
+  modifiers: CalendarMonthGridPropTypes.modifiers,
   renderCalendarDay: PropTypes.func,
   renderDayContents: PropTypes.func,
   onDayClick: PropTypes.func,