Build lib

Author: gpbl

lib/daypicker.js

@@ -358,6 +358,8 @@
         exports.clone = clone;
         exports.addMonths = addMonths;
         exports.isSameDay = isSameDay;
+        exports.isDayBefore = isDayBefore;
+        exports.isDayAfter = isDayAfter;
         exports.isPastDay = isPastDay;
         exports.isFutureDay = isFutureDay;
         exports.isDayBetween = isDayBetween;
@@ -402,6 +404,34 @@
           );
         }
 
+        /**
+ * Returns `true` if the first day is before the second day.
+ * 
+ * @export
+ * @param {Date} d1 
+ * @param {Date} d2 
+ * @returns {Boolean}
+ */
+        function isDayBefore(d1, d2) {
+          var day1 = clone(d1).setHours(0, 0, 0, 0);
+          var day2 = clone(d2).setHours(0, 0, 0, 0);
+          return day1 < day2;
+        }
+
+        /**
+ * Returns `true` if the first day is after the second day.
+ * 
+ * @export
+ * @param {Date} d1 
+ * @param {Date} d2 
+ * @returns {Boolean}
+ */
+        function isDayAfter(d1, d2) {
+          var day1 = clone(d1).setHours(0, 0, 0, 0);
+          var day2 = clone(d2).setHours(0, 0, 0, 0);
+          return day1 > day2;
+        }
+
         /**
  * Return `true` if a day is in the past, e.g. yesterday or any day
  * before yesterday.
@@ -412,7 +442,7 @@
         function isPastDay(d) {
           var today = new Date();
           today.setHours(0, 0, 0, 0);
-          return d < today;
+          return isDayBefore(d, today);
         }
 
         /**
@@ -439,14 +469,10 @@
  */
         function isDayBetween(d, d1, d2) {
           var date = clone(d);
-          var date1 = clone(d1);
-          var date2 = clone(d2);
-
           date.setHours(0, 0, 0, 0);
-          date1.setHours(0, 0, 0, 0);
-          date2.setHours(0, 0, 0, 0);
           return (
-            (date1 < date && date < date2) || (date2 < date && date < date1)
+            (isDayAfter(date, d1) && isDayBefore(date, d2)) ||
+            (isDayAfter(date, d2) && isDayBefore(date, d1))
           );
         }
 
@@ -467,18 +493,21 @@
           if (!from) {
             from = day;
           } else if (
-            from && to && isSameDay(from, to) && isSameDay(day, from)
+            from &&
+            to &&
+            isSameDay(from, to) &&
+            isSameDay(day, from)
           ) {
             from = null;
             to = null;
-          } else if (to && day < from) {
+          } else if (to && isDayBefore(day, from)) {
             from = day;
           } else if (to && isSameDay(day, to)) {
             from = day;
             to = day;
           } else {
             to = day;
-            if (to < from) {
+            if (isDayBefore(to, from)) {
               to = from;
               from = day;
             }
@@ -1028,25 +1057,35 @@
                     return (0, _DateUtils.isDayInRange)(d, range);
                   }
                   if (day.after) {
-                    return d > day.after;
+                    return (0, _DateUtils.isDayAfter)(d, day.after);
                   }
                   if (day.before) {
-                    return d < day.before;
+                    return (0, _DateUtils.isDayBefore)(d, day.before);
+                  }
+                  if (typeof day === 'function' && day(d)) {
+                    return true;
                   }
                   return false;
                 })
               ) {
                 modifiers.push(modifier);
               }
             } else if (
-              isRangeOfDates(value) && (0, _DateUtils.isDayInRange)(d, value)
+              isRangeOfDates(value) &&
+              (0, _DateUtils.isDayInRange)(d, value)
             ) {
               // modifier's value is a range
               modifiers.push(modifier);
-            } else if (value.after && d > value.after) {
+            } else if (
+              value.after &&
+              (0, _DateUtils.isDayAfter)(d, value.after)
+            ) {
               // modifier's value has an after date
               modifiers.push(modifier);
-            } else if (value.before && d < value.before) {
+            } else if (
+              value.before &&
+              (0, _DateUtils.isDayBefore)(d, value.before)
+            ) {
               // modifier's value has an after date
               modifiers.push(modifier);
             } else if (typeof value === 'function' && value(d)) {
@@ -1886,6 +1925,7 @@
                     classNames: this.props.classNames,
                     day: day,
                     modifiers: modifiers,
+                    modifiersStyles: this.props.modifiersStyles,
                     empty: isOutside &&
                       !this.props.enableOutsideDays &&
                       !this.props.fixedWeeks,
@@ -1990,7 +2030,7 @@
           return DayPicker;
         })(_react.Component);
 
-        DayPicker.VERSION = '5.2.3';
+        DayPicker.VERSION = '5.3.0';
         DayPicker.propTypes = {
           // Rendering months
           initialMonth: _PropTypes2.default.instanceOf(Date),
@@ -2011,7 +2051,9 @@
             _PropTypes.ModifierPropType,
             _PropTypes2.default.arrayOf(_PropTypes.ModifierPropType),
           ]),
+
           modifiers: _PropTypes2.default.object,
+          modifiersStyles: _PropTypes2.default.object,
 
           // Localization
           dir: _PropTypes2.default.string,
@@ -2258,6 +2300,7 @@
 
         function Day(_ref) {
           var classNames = _ref.classNames,
+            modifiersStyles = _ref.modifiersStyles,
             day = _ref.day,
             tabIndex = _ref.tabIndex,
             empty = _ref.empty,
@@ -2285,18 +2328,33 @@
               })
               .join('');
           }
+
+          var style = void 0;
+          if (modifiersStyles) {
+            Object.keys(modifiers)
+              .filter(function(modifier) {
+                return !!modifiersStyles[modifier];
+              })
+              .forEach(function(modifier) {
+                style = Object.assign({}, style, modifiersStyles[modifier]);
+              });
+          }
+
           if (empty) {
             return _react2.default.createElement('div', {
               role: 'gridcell',
               'aria-disabled': true,
               className: className,
+              style: style,
             });
           }
+
           return _react2.default.createElement(
             'div',
             {
               className: className,
               tabIndex: tabIndex,
+              style: style,
               role: 'gridcell',
               'aria-label': ariaLabel,
               'aria-disabled': ariaDisabled.toString(),
@@ -2326,6 +2384,7 @@
           ariaSelected: _PropTypes2.default.bool,
           empty: _PropTypes2.default.bool,
           modifiers: _PropTypes2.default.object,
+          modifiersStyles: _PropTypes2.default.object,
           onClick: _PropTypes2.default.func,
           onKeyDown: _PropTypes2.default.func,
           onMouseEnter: _PropTypes2.default.func,