From 4597239c4b8ca53d16a48058945b36199a78a2eb Mon Sep 17 00:00:00 2001 From: Wojciech Maj Date: Sun, 3 Sep 2017 01:21:03 +0200 Subject: [PATCH] Update compiled files --- build/Calendar.js | 14 --------- build/Calendar/Navigation.js | 59 +++++++++++++++--------------------- build/shared/dates.js | 3 +- build/shared/propTypes.js | 36 ++++++++++++++++++++-- build/shared/utils.js | 21 +++++++------ 5 files changed, 70 insertions(+), 63 deletions(-) diff --git a/build/Calendar.js b/build/Calendar.js index 951a4e9f..cf37926a 100644 --- a/build/Calendar.js +++ b/build/Calendar.js @@ -408,20 +408,6 @@ var Calendar = function (_Component) { return allValueTypes[allViews.indexOf(maxDetail)]; } - }, { - key: 'valueFrom', - get: function get() { - var value = this.props.value; - - return this.getValueFrom(value); - } - }, { - key: 'valueTo', - get: function get() { - var value = this.props.value; - - return this.getValueTo(value); - } }]); return Calendar; }(_react.Component); diff --git a/build/Calendar/Navigation.js b/build/Calendar/Navigation.js index 46a4c23e..2dbbb58a 100644 --- a/build/Calendar/Navigation.js +++ b/build/Calendar/Navigation.js @@ -36,9 +36,9 @@ var _dates = require('../shared/dates'); var _dateFormatter = require('../shared/dateFormatter'); -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var _propTypes3 = require('../shared/propTypes'); -var allViews = ['century', 'decade', 'year', 'month']; +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var Navigation = function (_Component) { (0, _inherits3.default)(Navigation, _Component); @@ -154,30 +154,21 @@ var Navigation = function (_Component) { ); } }, { - key: 'drillDownAvailable', + key: 'drillUpAvailable', get: function get() { var _props2 = this.props, view = _props2.view, views = _props2.views; - return views.indexOf(view) < views.length - 1; - } - }, { - key: 'drillUpAvailable', - get: function get() { - var _props3 = this.props, - view = _props3.view, - views = _props3.views; - return views.indexOf(view) > 0; } }, { key: 'prevButtonDisabled', get: function get() { - var _props4 = this.props, - date = _props4.activeStartDate, - minDate = _props4.minDate, - view = _props4.view; + var _props3 = this.props, + date = _props3.activeStartDate, + minDate = _props3.minDate, + view = _props3.view; var previousActiveStartDate = (0, _dates.getBeginPrevious)(view, date); if (previousActiveStartDate.getFullYear() < 1000) { @@ -189,10 +180,10 @@ var Navigation = function (_Component) { }, { key: 'prev2ButtonDisabled', get: function get() { - var _props5 = this.props, - date = _props5.activeStartDate, - minDate = _props5.minDate, - view = _props5.view; + var _props4 = this.props, + date = _props4.activeStartDate, + minDate = _props4.minDate, + view = _props4.view; var previousActiveStartDate = (0, _dates.getBeginPrevious2)(view, date); if (previousActiveStartDate.getFullYear() < 1000) { @@ -204,10 +195,10 @@ var Navigation = function (_Component) { }, { key: 'nextButtonDisabled', get: function get() { - var _props6 = this.props, - date = _props6.activeStartDate, - maxDate = _props6.maxDate, - view = _props6.view; + var _props5 = this.props, + date = _props5.activeStartDate, + maxDate = _props5.maxDate, + view = _props5.view; var nextActiveStartDate = (0, _dates.getBeginNext)(view, date); return maxDate && maxDate <= nextActiveStartDate; @@ -215,10 +206,10 @@ var Navigation = function (_Component) { }, { key: 'next2ButtonDisabled', get: function get() { - var _props7 = this.props, - date = _props7.activeStartDate, - maxDate = _props7.maxDate, - view = _props7.view; + var _props6 = this.props, + date = _props6.activeStartDate, + maxDate = _props6.maxDate, + view = _props6.view; var nextActiveStartDate = (0, _dates.getBeginNext2)(view, date); return maxDate && maxDate <= nextActiveStartDate; @@ -226,9 +217,9 @@ var Navigation = function (_Component) { }, { key: 'label', get: function get() { - var _props8 = this.props, - date = _props8.activeStartDate, - view = _props8.view; + var _props7 = this.props, + date = _props7.activeStartDate, + view = _props7.view; switch (view) { @@ -258,8 +249,6 @@ Navigation.defaultProps = { prevLabel: '‹' }; -var viewPropType = _propTypes2.default.oneOf(allViews); - Navigation.propTypes = { activeStartDate: _propTypes2.default.instanceOf(Date).isRequired, drillUp: _propTypes2.default.func.isRequired, @@ -270,6 +259,6 @@ Navigation.propTypes = { prev2Label: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.node]), prevLabel: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.node]), setActiveStartDate: _propTypes2.default.func.isRequired, - view: viewPropType.isRequired, - views: _propTypes2.default.arrayOf(viewPropType).isRequired + view: _propTypes3.isView.isRequired, + views: _propTypes3.isViews.isRequired }; \ No newline at end of file diff --git a/build/shared/dates.js b/build/shared/dates.js index aa3e960a..41938fff 100644 --- a/build/shared/dates.js +++ b/build/shared/dates.js @@ -265,7 +265,8 @@ var getWeekNumber = exports.getWeekNumber = function getWeekNumber(date) { var tempDate = new Date(+date); tempDate.setDate(getDay(tempDate) + (4 - getDayOfWeek(tempDate, calendarType))); var yearStart = getBeginOfYear(tempDate); - return Math.ceil((tempDate - yearStart) / 8.64e7 / 7); + var weekNumber = Math.ceil((tempDate - yearStart) / 8.64e7 / 7); + return weekNumber === 0 ? 52 : weekNumber; }; /** diff --git a/build/shared/propTypes.js b/build/shared/propTypes.js index 162f8c96..bb0a9fe8 100644 --- a/build/shared/propTypes.js +++ b/build/shared/propTypes.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.isValue = exports.isMaxDate = exports.isMinDate = exports.isCalendarType = undefined; +exports.isView = exports.isViews = exports.isValue = exports.isMaxDate = exports.isMinDate = exports.isCalendarType = undefined; var _typeof2 = require('babel-runtime/helpers/typeof'); @@ -15,7 +15,10 @@ var _propTypes2 = _interopRequireDefault(_propTypes); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var isCalendarType = exports.isCalendarType = _propTypes2.default.oneOf(['ISO 8601', 'US']); +var calendarTypes = ['ISO 8601', 'US']; +var allViews = ['century', 'decade', 'year', 'month']; + +var isCalendarType = exports.isCalendarType = _propTypes2.default.oneOf(calendarTypes); var isMinDate = exports.isMinDate = function isMinDate(props, propName, componentName) { var minDate = props[propName]; @@ -55,4 +58,31 @@ var isMaxDate = exports.isMaxDate = function isMaxDate(props, propName, componen return null; }; -var isValue = exports.isValue = _propTypes2.default.oneOfType([_propTypes2.default.instanceOf(Date), _propTypes2.default.arrayOf(_propTypes2.default.instanceOf(Date))]); \ No newline at end of file +var isValue = exports.isValue = _propTypes2.default.oneOfType([_propTypes2.default.instanceOf(Date), _propTypes2.default.arrayOf(_propTypes2.default.instanceOf(Date))]); + +var isViews = exports.isViews = _propTypes2.default.arrayOf(_propTypes2.default.oneOf(allViews)); + +var isView = exports.isView = function isView(props, propName, componentName) { + var view = props[propName]; + var views = props.views; + + + var allowedViews = views || allViews; + + if (!allowedViews.includes(view)) { + return new Error('Warning: Failed prop type: Invalid prop `' + propName + '` of value `' + view + '` supplied to `' + componentName + '`, expected one of [' + ['a', 'b', 'c', 'd', 'e'].map(function (a) { + return '"' + a + '"'; + }).join(', ') + '].'); + } + + // Everything is fine + return null; +}; + +isView.isRequired = function (props, propName, componentName) { + var view = props[propName]; + if (!view) { + return new Error('Warning: Failed prop type: The prop `' + propName + '` is marked as required in `' + componentName + '`, but its value is `' + view + '`.'); + } + return isView(props, propName, componentName); +}; \ No newline at end of file diff --git a/build/shared/utils.js b/build/shared/utils.js index 520f1810..c65810bd 100644 --- a/build/shared/utils.js +++ b/build/shared/utils.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.getTileActivityFlags = exports.mergeFunctions = undefined; +exports.getTileActivityFlags = exports.doRangesOverlap = exports.isRangeWithinRange = exports.isValueWithinRange = exports.mergeFunctions = undefined; var _dates = require('./dates'); @@ -31,19 +31,16 @@ var mergeFunctions = exports.mergeFunctions = function mergeFunctions() { }; }; -var isValueWithinRange = function isValueWithinRange(value, range) { +var isValueWithinRange = exports.isValueWithinRange = function isValueWithinRange(value, range) { return range[0].getTime() <= value.getTime() && range[1].getTime() >= value.getTime(); }; -var isRangeCoveringRange = function isRangeCoveringRange(valueRange, dateRange) { - return valueRange[0].getTime() <= dateRange[0].getTime() && valueRange[1].getTime() >= dateRange[1].getTime(); +var isRangeWithinRange = exports.isRangeWithinRange = function isRangeWithinRange(greaterRange, smallerRange) { + return greaterRange[0].getTime() <= smallerRange[0].getTime() && greaterRange[1].getTime() >= smallerRange[1].getTime(); }; -var doRangesOverlap = function doRangesOverlap(valueRange, dateRange) { - return isValueWithinRange(valueRange[0], dateRange) || // Value begins in date - isValueWithinRange(valueRange[1], dateRange) || // Value ends in date - isRangeCoveringRange(valueRange, dateRange) // Value covers date - ; +var doRangesOverlap = exports.doRangesOverlap = function doRangesOverlap(range1, range2) { + return isValueWithinRange(range1[0], range2) || isValueWithinRange(range1[1], range2); }; var getTileActivityFlags = exports.getTileActivityFlags = function getTileActivityFlags(value, valueType, date, dateType) { @@ -54,10 +51,14 @@ var getTileActivityFlags = exports.getTileActivityFlags = function getTileActivi return flags; } + if (!date || !(value instanceof Array) && !valueType || !(date instanceof Array) && !dateType) { + throw new Error('getTileActivityFlags(): Unable to get tile activity flags because one or more required arguments were not passed.'); + } + var valueRange = value instanceof Array ? value : (0, _dates.getRange)(valueType, value); var dateRange = date instanceof Array ? date : (0, _dates.getRange)(dateType, date); - flags.active = isRangeCoveringRange(valueRange, dateRange); + flags.active = isRangeWithinRange(valueRange, dateRange); flags.hasActive = flags.active ? false : doRangesOverlap(valueRange, dateRange); return flags;