Merge pull request #37 from onefinestay/proptypes-and-linting

fix the lints
onefinestay · May 18, 2015 · 69a717f · 69a717f
2 parents 47972c8 + 41ae9c3
commit 69a717f
Show file tree

Hide file tree

Showing 22 changed files with 186 additions and 59 deletions.
diff --git a/dist/DateRangePicker.js b/dist/DateRangePicker.js
@@ -26,6 +26,10 @@ var _utilsBemMixin = require('./utils/BemMixin');
 
 var _utilsBemMixin2 = _interopRequireDefault(_utilsBemMixin);
 
+var _utilsCustomPropTypes = require('./utils/CustomPropTypes');
+
+var _utilsCustomPropTypes2 = _interopRequireDefault(_utilsCustomPropTypes);
+
 var _Legend = require('./Legend');
 
 var _Legend2 = _interopRequireDefault(_Legend);
@@ -85,18 +89,7 @@ var DateRangePicker = _reactAddons2['default'].createClass({
     selectionType: _reactAddons2['default'].PropTypes.oneOf(['single', 'range']),
     showLegend: _reactAddons2['default'].PropTypes.bool,
     stateDefinitions: _reactAddons2['default'].PropTypes.object,
-    value: function value(props, propName) {
-      var val = props[propName];
-
-      if (!val) {
-        return null;
-      } else if (_momentRange2['default'].isMoment(val)) {
-        return null;
-      } else if (val.start && val.end && _momentRange2['default'].isMoment(val.start) && _momentRange2['default'].isMoment(val.end)) {
-        return null;
-      }
-      return new Error('Value must be a moment or a moment range');
-    }
+    value: _utilsCustomPropTypes2['default'].momentOrMomentRange
   },
 
   getDefaultProps: function getDefaultProps() {
@@ -301,7 +294,7 @@ var DateRangePicker = _reactAddons2['default'].createClass({
     }
   },
 
-  onUnHighlightDate: function onUnHighlightDate(date) {
+  onUnHighlightDate: function onUnHighlightDate() {
     this.setState({
       highlightedDate: null
     });
@@ -508,7 +501,6 @@ var DateRangePicker = _reactAddons2['default'].createClass({
     var hideSelection = _state2.hideSelection;
     var highlightedDate = _state2.highlightedDate;
     var highlightedRange = _state2.highlightedRange;
-    var highlightStartDate = _state2.highlightStartDate;
 
     var monthDate = this.getMonthDate();
     var year = monthDate.year();

diff --git a/dist/calendar/CalendarDate.js b/dist/calendar/CalendarDate.js
@@ -10,10 +10,6 @@ var _reactAddons = require('react/addons');
 
 var _reactAddons2 = _interopRequireDefault(_reactAddons);
 
-var _momentRange = require('moment-range');
-
-var _momentRange2 = _interopRequireDefault(_momentRange);
-
 var _immutable = require('immutable');
 
 var _immutable2 = _interopRequireDefault(_immutable);

diff --git a/dist/calendar/CalendarDatePeriod.js b/dist/calendar/CalendarDatePeriod.js
@@ -27,6 +27,11 @@ var CalendarDatePeriod = _reactAddons2['default'].createClass({
 
   mixins: [_utilsBemMixin2['default'], _utilsPureRenderMixin2['default']],
 
+  propTypes: {
+    color: _reactAddons2['default'].PropTypes.string,
+    period: _reactAddons2['default'].PropTypes.string
+  },
+
   render: function render() {
     var _props = this.props;
     var color = _props.color;

diff --git a/dist/calendar/CalendarHighlight.js b/dist/calendar/CalendarHighlight.js
@@ -27,6 +27,10 @@ var CalendarHighlight = _reactAddons2['default'].createClass({
 
   mixins: [_utilsBemMixin2['default'], _utilsPureRenderMixin2['default']],
 
+  propTypes: {
+    modifier: _reactAddons2['default'].PropTypes.string
+  },
+
   render: function render() {
     var modifier = this.props.modifier;
 

diff --git a/dist/calendar/CalendarMonth.js b/dist/calendar/CalendarMonth.js
@@ -30,6 +30,10 @@ var _utilsBemMixin = require('../utils/BemMixin');
 
 var _utilsBemMixin2 = _interopRequireDefault(_utilsBemMixin);
 
+var _utilsCustomPropTypes = require('../utils/CustomPropTypes');
+
+var _utilsCustomPropTypes2 = _interopRequireDefault(_utilsCustomPropTypes);
+
 var _utilsIsMomentRange = require('../utils/isMomentRange');
 
 var _utilsIsMomentRange2 = _interopRequireDefault(_utilsIsMomentRange);
@@ -50,6 +54,16 @@ var CalendarMonth = _reactAddons2['default'].createClass({
 
   mixins: [_utilsBemMixin2['default'], _utilsPureRenderMixin2['default']],
 
+  propTypes: {
+    dateComponent: _reactAddons2['default'].PropTypes.func,
+    enabledRange: _utilsCustomPropTypes2['default'].momentRange,
+    firstOfWeek: _reactAddons2['default'].PropTypes.oneOf([0, 1, 2, 3, 4, 5, 6]),
+    hideSelection: _reactAddons2['default'].PropTypes.bool,
+    highlightedDate: _reactAddons2['default'].PropTypes.object,
+    highlightedRange: _reactAddons2['default'].PropTypes.object,
+    value: _utilsCustomPropTypes2['default'].momentOrMomentRange
+  },
+
   renderDay: function renderDay(date, i) {
     var _props = this.props;
     var CalendarDate = _props.dateComponent;
@@ -137,11 +151,11 @@ var CalendarMonth = _reactAddons2['default'].createClass({
     var enabledRange = this.props.enabledRange;
 
     if (year < enabledRange.start.year()) {
-      return;
+      return null;
     }
 
     if (year > enabledRange.end.year()) {
-      return;
+      return null;
     }
 
     return _reactAddons2['default'].createElement(

diff --git a/dist/calendar/CalendarSelection.js b/dist/calendar/CalendarSelection.js
@@ -27,6 +27,11 @@ var CalendarSelection = _reactAddons2['default'].createClass({
 
   mixins: [_utilsBemMixin2['default'], _utilsPureRenderMixin2['default']],
 
+  propTypes: {
+    modifier: _reactAddons2['default'].PropTypes.string,
+    pending: _reactAddons2['default'].PropTypes.bool.isRequired
+  },
+
   render: function render() {
     var _props = this.props;
     var modifier = _props.modifier;

diff --git a/dist/utils/BemMixin.js b/dist/utils/BemMixin.js
@@ -65,7 +65,8 @@ var BemMixin = {
     var opts = {
       namespace: this.getBemNamespace(),
       element: this.constructor.displayName,
-      block: this.getBemBlock() };
+      block: this.getBemBlock()
+    };
 
     _extends(opts, options);
     return _bemCx2['default'](opts);

diff --git a/dist/utils/CustomPropTypes.js b/dist/utils/CustomPropTypes.js
@@ -0,0 +1,42 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var _momentRange = require('moment-range');
+
+var _momentRange2 = _interopRequireDefault(_momentRange);
+
+var _isMomentRange = require('./isMomentRange');
+
+var _isMomentRange2 = _interopRequireDefault(_isMomentRange);
+
+exports['default'] = {
+  momentOrMomentRange: function momentOrMomentRange(props, propName) {
+    var val = props[propName];
+
+    if (!val) {
+      return null;
+    } else if (_momentRange2['default'].isMoment(val)) {
+      return null;
+    } else if (_isMomentRange2['default'](val)) {
+      return null;
+    }
+    return new Error('Value must be a moment or a moment range');
+  },
+
+  momentRange: function momentRange(props, propName) {
+    var val = props[propName];
+
+    if (!val) {
+      return null;
+    } else if (_isMomentRange2['default'](val)) {
+      return null;
+    }
+    return new Error('Value must be a moment range');
+  }
+};
+module.exports = exports['default'];
diff --git a/dist/utils/bemCx.js b/dist/utils/bemCx.js
@@ -33,7 +33,7 @@ function bemCx() {
   bemClasses.push(baseClassName);
 
   if (states) {
-    if (typeof states == 'object') {
+    if (typeof states === 'object') {
       states = Object.keys(states).filter(function (s) {
         return states[s];
       });
@@ -45,7 +45,7 @@ function bemCx() {
   }
 
   if (modifiers) {
-    if (typeof modifiers == 'object') {
+    if (typeof modifiers === 'object') {
       modifiers = Object.keys(modifiers).filter(function (m) {
         return modifiers[m];
       });

diff --git a/dist/utils/shallowEqual.js b/dist/utils/shallowEqual.js
@@ -1,5 +1,9 @@
 'use strict';
 
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var _momentRange = require('moment-range');
@@ -19,6 +23,7 @@ function shallowEqual(objA, objB) {
     return true;
   }
   var key;
+
   // Test for A's keys different from B.
   for (key in objA) {
     if (objA.hasOwnProperty(key)) {
@@ -35,6 +40,7 @@ function shallowEqual(objA, objB) {
       }
     }
   }
+
   // Test for B's keys missing from A.
   for (key in objB) {
     if (objB.hasOwnProperty(key) && !objA.hasOwnProperty(key)) {
@@ -44,4 +50,5 @@ function shallowEqual(objA, objB) {
   return true;
 }
 
-module.exports = shallowEqual;
+exports['default'] = shallowEqual;
+module.exports = exports['default'];
diff --git a/src/DateRangePicker.jsx b/src/DateRangePicker.jsx
@@ -5,6 +5,7 @@ import Immutable from 'immutable';
 import calendar from 'calendar';
 
 import BemMixin from './utils/BemMixin';
+import CustomPropTypes from './utils/CustomPropTypes';
 import Legend from './Legend';
 
 import CalendarMonth from './calendar/CalendarMonth';
@@ -50,18 +51,7 @@ const DateRangePicker = React.createClass({
     selectionType: React.PropTypes.oneOf(['single', 'range']),
     showLegend: React.PropTypes.bool,
     stateDefinitions: React.PropTypes.object,
-    value(props, propName) {
-      let val = props[propName];
-
-      if (!val) {
-        return null;
-      } else if (moment.isMoment(val)) {
-        return null;
-      } else if (val.start && val.end && moment.isMoment(val.start) && moment.isMoment(val.end)) {
-        return null;
-      }
-      return new Error('Value must be a moment or a moment range');
-    }
+    value: CustomPropTypes.momentOrMomentRange
   },
 
   getDefaultProps() {
@@ -252,11 +242,11 @@ const DateRangePicker = React.createClass({
     }
   },
 
-  onUnHighlightDate(date) {
+  onUnHighlightDate() {
     this.setState({
       highlightedDate: null
     });
-  },  
+  },
 
   onSelectDate(date) {
     let {selectionType} = this.props;
@@ -298,7 +288,7 @@ const DateRangePicker = React.createClass({
         this.highlightDate(date);
       }
     }
-  },  
+  },
 
   startRangeSelection(date) {
     this.setState({
@@ -448,8 +438,7 @@ const DateRangePicker = React.createClass({
       enabledRange,
       hideSelection,
       highlightedDate,
-      highlightedRange,
-      highlightStartDate
+      highlightedRange
     } = this.state;
 
     let monthDate = this.getMonthDate();
@@ -473,7 +462,7 @@ const DateRangePicker = React.createClass({
     } else if (isMomentRange(value)) {
       if (!monthRange.overlaps(value)) {
         value = null;
-      }      
+      }
     }
 
     if (!moment.isMoment(highlightedDate) || !monthRange.contains(highlightedDate)) {
@@ -482,7 +471,7 @@ const DateRangePicker = React.createClass({
 
     if (!isMomentRange(highlightedRange) || !monthRange.overlaps(highlightedRange)) {
       highlightedRange = null;
-    }    
+    }
 
     props = {
       bemBlock,

diff --git a/src/calendar/CalendarDate.jsx b/src/calendar/CalendarDate.jsx
@@ -2,10 +2,10 @@
 
 import React from 'react/addons';
 
-import moment from 'moment-range';
 import Immutable from 'immutable';
 
 import BemMixin from '../utils/BemMixin';
+import CustomPropTypes from '../utils/CustomPropTypes';
 import PureRenderMixin from '../utils/PureRenderMixin';
 import lightenDarkenColor from '../utils/lightenDarkenColor';
 
@@ -18,7 +18,7 @@ const CalendarDate = React.createClass({
   mixins: [BemMixin, PureRenderMixin],
 
   propTypes: {
-    date: React.PropTypes.object.isRequired,
+    date: CustomPropTypes.moment,
 
     firstOfMonth: React.PropTypes.object.isRequired,
 

diff --git a/src/calendar/CalendarDatePeriod.jsx b/src/calendar/CalendarDatePeriod.jsx
@@ -8,13 +8,18 @@ import PureRenderMixin from '../utils/PureRenderMixin';
 const CalendarDatePeriod = React.createClass({
   mixins: [BemMixin, PureRenderMixin],
 
+  propTypes: {
+    color: React.PropTypes.string,
+    period: React.PropTypes.string
+  },
+
   render() {
     let {color, period} = this.props;
     let modifiers = {[period]: true};
     let style;
 
     if (color) {
-      style= {backgroundColor: color};
+      style = {backgroundColor: color};
     }
 
     return (

diff --git a/src/calendar/CalendarHighlight.jsx b/src/calendar/CalendarHighlight.jsx
@@ -8,6 +8,10 @@ import PureRenderMixin from '../utils/PureRenderMixin';
 const CalendarHighlight = React.createClass({
   mixins: [BemMixin, PureRenderMixin],
 
+  propTypes: {
+    modifier: React.PropTypes.string
+  },
+
   render() {
     let {modifier} = this.props;
     let modifiers = {[modifier]: true};