Build v5.2.0

Author: gpbl

lib/daypicker.js

@@ -513,7 +513,7 @@ function Weekday(_ref) {
 
   return _react2.default.createElement(
     'div',
-    { className: className },
+    { className: className, role: 'columnheader' },
     _react2.default.createElement(
       'abbr',
       { title: title },
@@ -1154,19 +1154,19 @@ var DayPicker = function (_Component) {
         locale: locale,
         localeUtils: localeUtils
       };
-      return _react2.default.cloneElement(navbarElement, props);
+      return _react2.default.isValidElement(navbarElement) ? _react2.default.cloneElement(navbarElement, props) : _react2.default.createElement(navbarElement, props);
     }
   }, {
     key: 'renderDayInMonth',
     value: function renderDayInMonth(day, month) {
-      var dayModifiers = [];
-      if (DateUtils.isSameDay(day, new Date())) {
+      var propModifiers = Helpers.getModifiersFromProps(this.props);
+      var dayModifiers = Helpers.getModifiersForDay(day, propModifiers);
+      if (DateUtils.isSameDay(day, new Date()) && !Object.prototype.hasOwnProperty.call(propModifiers, this.props.classNames.today)) {
         dayModifiers.push(this.props.classNames.today);
       }
       if (day.getMonth() !== month.getMonth()) {
         dayModifiers.push(this.props.classNames.outside);
       }
-      dayModifiers = [].concat(_toConsumableArray(dayModifiers), _toConsumableArray(Helpers.getModifiersForDay(day, Helpers.getModifiersFromProps(this.props))));
 
       var isOutside = day.getMonth() !== month.getMonth();
       var tabIndex = null;
@@ -1228,9 +1228,7 @@ var DayPicker = function (_Component) {
             months: this.props.months,
 
             weekdayElement: this.props.weekdayElement,
-            captionElement: _react2.default.cloneElement(this.props.captionElement, {
-              classNames: this.props.classNames
-            }),
+            captionElement: this.props.captionElement,
             fixedWeeks: this.props.fixedWeeks,
 
             weekdaysShort: this.props.weekdaysShort,
@@ -1287,7 +1285,7 @@ var DayPicker = function (_Component) {
   return DayPicker;
 }(_react.Component);
 
-DayPicker.VERSION = '5.1.2';
+DayPicker.VERSION = '5.2.0';
 DayPicker.propTypes = {
 
   // Rendering months
@@ -1342,9 +1340,9 @@ DayPicker.propTypes = {
 
   // Custom elements
   renderDay: _react.PropTypes.func,
-  weekdayElement: _react.PropTypes.element,
-  navbarElement: _react.PropTypes.element,
-  captionElement: _react.PropTypes.element,
+  weekdayElement: _react.PropTypes.oneOfType([_react.PropTypes.element, _react.PropTypes.func, _react.PropTypes.instanceOf(_react.Component)]),
+  navbarElement: _react.PropTypes.oneOfType([_react.PropTypes.element, _react.PropTypes.func, _react.PropTypes.instanceOf(_react.Component)]),
+  captionElement: _react.PropTypes.oneOfType([_react.PropTypes.element, _react.PropTypes.func, _react.PropTypes.instanceOf(_react.Component)]),
 
   // Events
   onBlur: _react.PropTypes.func,
@@ -1611,18 +1609,21 @@ function Month(_ref) {
 
   var captionProps = {
     date: month,
+    classNames: classNames,
     months: months,
     localeUtils: localeUtils,
     locale: locale,
     onClick: onCaptionClick ? function (e) {
       return onCaptionClick(month, e);
     } : undefined
   };
+  var caption = _react2.default.isValidElement(captionElement) ? _react2.default.cloneElement(captionElement, captionProps) : _react2.default.createElement(captionElement, captionProps);
+
   var weeks = (0, _Helpers.getWeekArray)(month, firstDayOfWeek, fixedWeeks);
   return _react2.default.createElement(
     'div',
-    { className: classNames.month },
-    _react2.default.cloneElement(captionElement, captionProps),
+    { className: classNames.month, role: 'grid' },
+    caption,
     _react2.default.createElement(_Weekdays2.default, {
       classNames: classNames,
       weekdaysShort: weekdaysShort,
@@ -1634,7 +1635,7 @@ function Month(_ref) {
     }),
     _react2.default.createElement(
       'div',
-      { className: classNames.body, role: 'grid' },
+      { className: classNames.body, role: 'rowgroup' },
       weeks.map(function (week, j) {
         return _react2.default.createElement(
           'div',
@@ -1659,8 +1660,8 @@ Month.propTypes = {
   months: _react2.default.PropTypes.arrayOf(_react2.default.PropTypes.string),
 
   fixedWeeks: _react.PropTypes.bool,
-  captionElement: _react.PropTypes.node.isRequired,
-  weekdayElement: _react.PropTypes.element,
+  captionElement: _react.PropTypes.oneOfType([_react.PropTypes.element, _react.PropTypes.func, _react.PropTypes.instanceOf(_react2.default.Component)]).isRequired,
+  weekdayElement: _react.PropTypes.oneOfType([_react.PropTypes.element, _react.PropTypes.func, _react.PropTypes.instanceOf(_react2.default.Component)]),
 
   locale: _react.PropTypes.string.isRequired,
   localeUtils: _PropTypes2.default.localeUtils.isRequired,
@@ -1717,7 +1718,7 @@ function Weekdays(_ref) {
       localeUtils: localeUtils,
       locale: locale
     };
-    var element = _react2.default.cloneElement(weekdayElement, elementProps);
+    var element = _react2.default.isValidElement(weekdayElement) ? _react2.default.cloneElement(weekdayElement, elementProps) : _react2.default.createElement(weekdayElement, elementProps);
     days.push(element);
   }
 
@@ -1726,7 +1727,7 @@ function Weekdays(_ref) {
     { className: classNames.weekdays, role: 'rowgroup' },
     _react2.default.createElement(
       'div',
-      { className: classNames.weekdaysRow, role: 'columnheader' },
+      { className: classNames.weekdaysRow, role: 'row' },
       days
     )
   );
@@ -1745,7 +1746,7 @@ Weekdays.propTypes = {
   weekdaysShort: _react.PropTypes.arrayOf(_react.PropTypes.string),
   locale: _react.PropTypes.string.isRequired,
   localeUtils: _PropTypes2.default.localeUtils.isRequired,
-  weekdayElement: _react.PropTypes.element
+  weekdayElement: _react.PropTypes.oneOfType([_react.PropTypes.element, _react.PropTypes.func, _react.PropTypes.instanceOf(_react2.default.Component)])
 };
 //# sourceMappingURL=Weekdays.js.map