Add theme prop in prep for react-with-styles and the like

react-dates · Mar 31, 2017 · f92b63c · f92b63c
1 parent 197f6ae
commit f92b63c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 45 deletions.
diff --git a/src/components/CalendarDay.jsx b/src/components/CalendarDay.jsx
@@ -1,13 +1,15 @@
 import React, { PropTypes } from 'react';
 import shallowCompare from 'react-addons-shallow-compare';
 import momentPropTypes from 'react-moment-proptypes';
-import { forbidExtraProps } from 'airbnb-prop-types';
+import { forbidExtraProps, nonNegativeInteger } from 'airbnb-prop-types';
 import moment from 'moment';
 import cx from 'classnames';
 
+import { DAY_SIZE } from '../constants';
+
 const propTypes = forbidExtraProps({
   day: momentPropTypes.momentObj,
-  daySize: PropTypes.number,
+  daySize: nonNegativeInteger,
   isOutsideDay: PropTypes.bool,
   modifiers: PropTypes.object,
   onDayClick: PropTypes.func,
@@ -18,7 +20,7 @@ const propTypes = forbidExtraProps({
 
 const defaultProps = {
   day: moment(),
-  daySize: 39,
+  daySize: DAY_SIZE,
   isOutsideDay: false,
   modifiers: {},
   onDayClick() {},

diff --git a/src/components/CalendarMonth.jsx b/src/components/CalendarMonth.jsx
@@ -3,7 +3,7 @@
 import React, { PropTypes } from 'react';
 import shallowCompare from 'react-addons-shallow-compare';
 import momentPropTypes from 'react-moment-proptypes';
-import { forbidExtraProps } from 'airbnb-prop-types';
+import { forbidExtraProps, nonNegativeInteger } from 'airbnb-prop-types';
 import moment from 'moment';
 import cx from 'classnames';
 
@@ -17,6 +17,7 @@ import {
   HORIZONTAL_ORIENTATION,
   VERTICAL_ORIENTATION,
   VERTICAL_SCROLLABLE,
+  DAY_SIZE,
 } from '../../constants';
 
 const propTypes = forbidExtraProps({
@@ -25,7 +26,7 @@ const propTypes = forbidExtraProps({
   enableOutsideDays: PropTypes.bool,
   modifiers: PropTypes.object,
   orientation: ScrollableOrientationShape,
-  daySize: PropTypes.number,
+  daySize: nonNegativeInteger,
   onDayClick: PropTypes.func,
   onDayMouseEnter: PropTypes.func,
   onDayMouseLeave: PropTypes.func,
@@ -41,7 +42,7 @@ const defaultProps = {
   enableOutsideDays: false,
   modifiers: {},
   orientation: HORIZONTAL_ORIENTATION,
-  daySize: 39,
+  daySize: DAY_SIZE,
   onDayClick() {},
   onDayMouseEnter() {},
   onDayMouseLeave() {},

diff --git a/src/components/CalendarMonthGrid.jsx b/src/components/CalendarMonthGrid.jsx
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react';
 import shallowCompare from 'react-addons-shallow-compare';
 import momentPropTypes from 'react-moment-proptypes';
-import { forbidExtraProps } from 'airbnb-prop-types';
+import { forbidExtraProps, nonNegativeInteger } from 'airbnb-prop-types';
 import moment from 'moment';
 import cx from 'classnames';
 import { addEventListener, removeEventListener } from 'consolidated-events';
@@ -18,6 +18,7 @@ import {
   HORIZONTAL_ORIENTATION,
   VERTICAL_ORIENTATION,
   VERTICAL_SCROLLABLE,
+  DAY_SIZE,
 } from '../../constants';
 
 const propTypes = forbidExtraProps({
@@ -34,7 +35,7 @@ const propTypes = forbidExtraProps({
   onMonthTransitionEnd: PropTypes.func,
   renderDay: PropTypes.func,
   transformValue: PropTypes.string,
-  daySize: PropTypes.number,
+  daySize: nonNegativeInteger,
 
   // i18n
   monthFormat: PropTypes.string,
@@ -54,7 +55,7 @@ const defaultProps = {
   onMonthTransitionEnd() {},
   renderDay: null,
   transformValue: 'none',
-  daySize: 39,
+  daySize: DAY_SIZE,
 
   // i18n
   monthFormat: 'MMMM YYYY', // english locale

diff --git a/src/components/DateRangePicker.jsx b/src/components/DateRangePicker.jsx
@@ -71,8 +71,6 @@ const defaultProps = {
   navPrev: null,
   navNext: null,
 
-  onDatesChange() {},
-  onFocusChange() {},
   onPrevMonthClick() {},
   onNextMonthClick() {},
 
@@ -240,12 +238,10 @@ export default class DateRangePicker extends React.Component {
   maybeRenderDayPickerWithPortal() {
     const { withPortal, withFullScreenPortal } = this.props;
 
-    console.log('hello world')
     if (!this.isOpened()) {
       return null;
     }
 
-    console.log('hello')
     if (withPortal || withFullScreenPortal) {
       return (
         <Portal isOpened>

diff --git a/src/components/DayPicker.jsx b/src/components/DayPicker.jsx
@@ -502,7 +502,6 @@ export default class DayPicker extends React.Component {
             role="region"
             tabIndex={-1}
           >
-<<<<<<< HEAD
             {!verticalScrollable && this.renderNavigation()}
 
             <div
@@ -526,33 +525,12 @@ export default class DayPicker extends React.Component {
                 renderDay={renderDay}
                 onMonthTransitionEnd={this.updateStateAfterMonthTransition}
                 monthFormat={monthFormat}
+                daySize={daySize}
               />
               {verticalScrollable && this.renderNavigation()}
             </div>
 
             {renderCalendarInfo && renderCalendarInfo()}
-=======
-            <CalendarMonthGrid
-              ref={(ref) => { this.calendarMonthGrid = ref; }}
-              transformValue={transformValue}
-              enableOutsideDays={enableOutsideDays}
-              firstVisibleMonthIndex={firstVisibleMonthIndex}
-              initialMonth={currentMonth}
-              isAnimating={isCalendarMonthGridAnimating}
-              modifiers={modifiers}
-              orientation={orientation}
-              withPortal={withPortal}
-              numberOfMonths={numberOfMonths * scrollableMonthMultiple}
-              onDayClick={onDayClick}
-              onDayMouseEnter={onDayMouseEnter}
-              onDayMouseLeave={onDayMouseLeave}
-              renderDay={renderDay}
-              onMonthTransitionEnd={this.updateStateAfterMonthTransition}
-              monthFormat={monthFormat}
-              daySize={daySize}
-            />
-            {verticalScrollable && this.renderNavigation()}
->>>>>>> Adds daySize prop to the DRP/SDP/DP that scales everything accordingly
           </div>
         </OutsideClickHandler>
       </div>

diff --git a/src/components/DayPickerRangeController.jsx b/src/components/DayPickerRangeController.jsx
@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import momentPropTypes from 'react-moment-proptypes';
-import { forbidExtraProps } from 'airbnb-prop-types';
+import { forbidExtraProps, nonNegativeInteger } from 'airbnb-prop-types';
 import moment from 'moment';
 
 import { DayPickerPhrases } from '../defaultPhrases';
@@ -19,6 +19,7 @@ import {
   START_DATE,
   END_DATE,
   HORIZONTAL_ORIENTATION,
+  DAY_SIZE,
 } from '../../constants';
 
 import DayPicker from './DayPicker';
@@ -43,7 +44,7 @@ const propTypes = forbidExtraProps({
   orientation: ScrollableOrientationShape,
   withPortal: PropTypes.bool,
   initialVisibleMonth: PropTypes.func,
-  daySize: PropTypes.number,
+  daySize: nonNegativeInteger,
 
   navPrev: PropTypes.node,
   navNext: PropTypes.node,
@@ -83,7 +84,7 @@ const defaultProps = {
   withPortal: false,
 
   initialVisibleMonth: () => moment(),
-  daySize: 39,
+  daySize: DAY_SIZE,
 
   navPrev: null,
   navNext: null,

diff --git a/src/components/SingleDatePicker.jsx b/src/components/SingleDatePicker.jsx
@@ -389,14 +389,11 @@ export default class SingleDatePicker extends React.Component {
           navPrev={navPrev}
           navNext={navNext}
           renderDay={renderDay}
-<<<<<<< HEAD
           renderCalendarInfo={renderCalendarInfo}
           isFocused={isDayPickerFocused}
           onBlur={this.onDayPickerBlur}
           phrases={phrases}
-=======
           daySize={daySize}
->>>>>>> Adds daySize prop to the DRP/SDP/DP that scales everything accordingly
         />
 
         {withFullScreenPortal && (

diff --git a/stories/DayPicker.js b/stories/DayPicker.js
@@ -19,10 +19,7 @@ const TestPrevIcon = () => (
     Prev
   </span>
 );
-<<<<<<< HEAD
-=======
 
->>>>>>> Adds daySize prop to the DRP/SDP/DP that scales everything accordingly
 const TestNextIcon = () => (
   <span
     style={{