@seafile/seafile-calendar 0.0.13 → 0.0.17-beta

package/lib/MonthCalendar.js

@@ -44,9 +44,9 @@ var _CalendarMixin = require('./mixin/CalendarMixin');
 
 var _CommonMixin = require('./mixin/CommonMixin');
 
-var _moment = require('moment');
+var _dayjs = require('dayjs');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _dayjs2 = _interopRequireDefault(_dayjs);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -68,26 +68,26 @@ var MonthCalendar = function (_React$Component) {
       switch (keyCode) {
         case _KeyCode2['default'].DOWN:
           value = stateValue.clone();
-          value.add(3, 'months');
+          value = value.add(3, 'months');
           break;
         case _KeyCode2['default'].UP:
           value = stateValue.clone();
-          value.add(-3, 'months');
+          value = value.add(-3, 'months');
           break;
         case _KeyCode2['default'].LEFT:
           value = stateValue.clone();
           if (ctrlKey) {
-            value.add(-1, 'years');
+            value = value.add(-1, 'years');
           } else {
-            value.add(-1, 'months');
+            value = value.add(-1, 'months');
           }
           break;
         case _KeyCode2['default'].RIGHT:
           value = stateValue.clone();
           if (ctrlKey) {
-            value.add(1, 'years');
+            value = value.add(1, 'years');
           } else {
-            value.add(1, 'months');
+            value = value.add(1, 'months');
           }
           break;
         case _KeyCode2['default'].ENTER:
@@ -114,7 +114,7 @@ var MonthCalendar = function (_React$Component) {
 
     _this.state = {
       mode: 'month',
-      value: props.value || props.defaultValue || (0, _moment2['default'])(),
+      value: props.value || props.defaultValue || (0, _dayjs2['default'])(),
       selectedValue: props.selectedValue || props.defaultSelectedValue
     };
     return _this;

package/lib/RangeCalendar.js

@@ -26,9 +26,9 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _moment = require('moment');
+var _dayjs = require('dayjs');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _dayjs2 = _interopRequireDefault(_dayjs);
 
 var _classnames2 = require('classnames');
 
@@ -103,7 +103,7 @@ function normalizeAnchor(props, init) {
   var selectedValue = props.selectedValue || init && props.defaultSelectedValue;
   var value = props.value || init && props.defaultValue;
   var normalizedValue = value ? getValueFromSelectedValue(value) : getValueFromSelectedValue(selectedValue);
-  return !isEmptyArray(normalizedValue) ? normalizedValue : init && [(0, _moment2['default'])(), (0, _moment2['default'])().add(1, 'months')];
+  return !isEmptyArray(normalizedValue) ? normalizedValue : init && [(0, _dayjs2['default'])(), (0, _dayjs2['default'])().add(1, 'months')];
 }
 
 function generateOptions(length, extraOptionGen) {
@@ -462,7 +462,7 @@ var _initialiseProps = function _initialiseProps() {
       var nextHoverValue = void 0;
 
       if (!firstSelectedValue) {
-        currentHoverTime = hoverValue[0] || selectedValue[0] || value[0] || (0, _moment2['default'])();
+        currentHoverTime = hoverValue[0] || selectedValue[0] || value[0] || (0, _dayjs2['default'])();
         nextHoverTime = func(currentHoverTime);
         nextHoverValue = [nextHoverTime];
         _this2.fireHoverValueChange(nextHoverValue);
@@ -852,7 +852,7 @@ var _initialiseProps = function _initialiseProps() {
 
     // 尚未选择过时间，直接输入的话
     if (!_this2.state.selectedValue[0] || !_this2.state.selectedValue[1]) {
-      var startValue = selectedValue[0] || (0, _moment2['default'])();
+      var startValue = selectedValue[0] || (0, _dayjs2['default'])();
       var endValue = selectedValue[1] || startValue.clone().add(1, 'months');
       _this2.setState({
         selectedValue: selectedValue,

package/lib/calendar/CalendarHeader.js

@@ -42,13 +42,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 
 function goMonth(direction) {
   var next = this.props.value.clone();
-  next.add(direction, 'months');
+  next = next.add(direction, 'months');
   this.props.onValueChange(next);
 }
 
 function goYear(direction) {
   var next = this.props.value.clone();
-  next.add(direction, 'years');
+  next = next.add(direction, 'years');
   this.props.onValueChange(next);
 }
 

package/lib/calendar/CalendarRightPanel.js

@@ -22,9 +22,9 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _moment = require('moment');
+var _dayjs = require('dayjs');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _dayjs2 = _interopRequireDefault(_dayjs);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -44,6 +44,17 @@ var CalendarRightPanel = function (_React$Component) {
       _this.props.onClickRightPanelTime();
     };
 
+    _this.getTimes = function () {
+      var times = [];
+      for (var i = 0; i < 24; i++) {
+        var str = (String(i) + ':00').padStart(5, '0');
+        var str1 = (String(i) + ':30').padStart(5, '0');
+        times.push(str);
+        times.push(str1);
+      }
+      return times;
+    };
+
     _this.scrollUp = function () {
       _this.timeRef.current.scrollBy(0, -200);
     };
@@ -56,12 +67,18 @@ var CalendarRightPanel = function (_React$Component) {
       highlightTime: _this.props.value || null
     };
     _this.timeRef = _react2['default'].createRef();
+    _this.times = _this.getTimes();
     return _this;
   }
 
   CalendarRightPanel.prototype.componentDidMount = function componentDidMount() {
-    // The default time is 8, page scroll to 08:00
-    this.timeRef.current.scrollTo(0, 34 * 16);
+    var defaultMinutesTime = this.props.defaultMinutesTime;
+
+    var showTimeIndex = this.times.findIndex(function (item) {
+      return item === defaultMinutesTime;
+    });
+    var scrollTimeIndex = showTimeIndex > -1 ? showTimeIndex : 16;
+    this.timeRef.current.scrollTo(0, 34 * scrollTimeIndex);
   };
 
   CalendarRightPanel.prototype.render = function render() {
@@ -73,13 +90,6 @@ var CalendarRightPanel = function (_React$Component) {
         locale = _props.locale;
 
     var selectedDate = value.format().slice(0, 10);
-    var times = [];
-    for (var i = 0; i < 24; i++) {
-      var str = (String(i) + ':00').padStart(5, '0');
-      var str1 = (String(i) + ':30').padStart(5, '0');
-      times.push(str);
-      times.push(str1);
-    }
     var highlight = this.state.highlightTime;
     var highlightTime = highlight ? highlight.format().slice(11, 16) : null;
     var isZhcn = locale && locale.today === '今天';
@@ -97,8 +107,8 @@ var CalendarRightPanel = function (_React$Component) {
         _react2['default'].createElement(
           'ul',
           null,
-          times.map(function (time) {
-            var current = (0, _moment2['default'])(selectedDate + ' ' + time);
+          this.times.map(function (time) {
+            var current = (0, _dayjs2['default'])(selectedDate + ' ' + time);
             current = isZhcn ? current.locale('zh-cn') : current.locale('en-gb');
             return _react2['default'].createElement(
               'li',
@@ -128,7 +138,8 @@ CalendarRightPanel.propTypes = {
   value: _propTypes2['default'].object,
   onSelect: _propTypes2['default'].func,
   onClickRightPanelTime: _propTypes2['default'].func,
-  locale: _propTypes2['default'].object
+  locale: _propTypes2['default'].object,
+  defaultMinutesTime: _propTypes2['default'].string
 };
 exports['default'] = CalendarRightPanel;
 module.exports = exports['default'];

package/lib/date/DateInput.js

@@ -32,9 +32,9 @@ var _KeyCode2 = _interopRequireDefault(_KeyCode);
 
 var _reactLifecyclesCompat = require('react-lifecycles-compat');
 
-var _moment = require('moment');
+var _dayjs = require('dayjs');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _dayjs2 = _interopRequireDefault(_dayjs);
 
 var _util = require('../util');
 
@@ -186,7 +186,7 @@ var _initialiseProps = function _initialiseProps() {
     }
 
     // 不合法直接退出
-    var parsed = (0, _moment2['default'])(str, format, true);
+    var parsed = (0, _dayjs2['default'])(str, format, true);
     if (!parsed.isValid()) {
       _this2.setState({
         invalid: true,
@@ -196,7 +196,7 @@ var _initialiseProps = function _initialiseProps() {
     }
 
     var value = _this2.props.value.clone();
-    value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
+    value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
 
     if (!value || disabledDate && disabledDate(value)) {
       _this2.setState({

package/lib/date/DateTBody.js

@@ -96,7 +96,7 @@ var DateTBody = function (_React$Component) {
     var lastDisableClass = prefixCls + '-disabled-cell-last-of-row';
     var lastDayOfMonthClass = prefixCls + '-last-day-of-month';
     var month1 = value.clone();
-    month1.date(1);
+    month1 = month1.date(1);
     var day = month1.day();
     // const firstDayOfWeek = value.localeData().firstDayOfWeek();
     // We set Sunday(7) as the first day of the week in seafile-calendar.
@@ -104,7 +104,7 @@ var DateTBody = function (_React$Component) {
     var lastMonthDiffDay = (day + 7 - firstDayOfWeek) % 7;
     // calculate last month
     var lastMonth1 = month1.clone();
-    lastMonth1.add(0 - lastMonthDiffDay, 'days');
+    lastMonth1 = lastMonth1.add(0 - lastMonthDiffDay, 'days');
     var passed = 0;
 
     for (iIndex = 0; iIndex < _DateConstants2['default'].DATE_ROW_COUNT; iIndex++) {
@@ -112,7 +112,7 @@ var DateTBody = function (_React$Component) {
         current = lastMonth1;
         if (passed) {
           current = current.clone();
-          current.add(passed, 'days');
+          current = current.add(passed, 'days');
         }
         dateTable.push(current);
         passed++;

package/lib/date/DateTHead.js

@@ -1,39 +1,31 @@
-'use strict';
+"use strict";
 
 exports.__esModule = true;
 
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
 
-var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+var _possibleConstructorReturn2 = require("babel-runtime/helpers/possibleConstructorReturn");
 
 var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
 
-var _inherits2 = require('babel-runtime/helpers/inherits');
+var _inherits2 = require("babel-runtime/helpers/inherits");
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _react = require('react');
+var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-var _DateConstants = require('./DateConstants');
-
-var _DateConstants2 = _interopRequireDefault(_DateConstants);
-
-var _moment = require('moment');
-
-var _moment2 = _interopRequireDefault(_moment);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var DateTHead = function (_React$Component) {
-  (0, _inherits3['default'])(DateTHead, _React$Component);
+  (0, _inherits3["default"])(DateTHead, _React$Component);
 
   function DateTHead() {
-    (0, _classCallCheck3['default'])(this, DateTHead);
-    return (0, _possibleConstructorReturn3['default'])(this, _React$Component.apply(this, arguments));
+    (0, _classCallCheck3["default"])(this, DateTHead);
+    return (0, _possibleConstructorReturn3["default"])(this, _React$Component.apply(this, arguments));
   }
 
   DateTHead.prototype.render = function render() {
@@ -41,56 +33,55 @@ var DateTHead = function (_React$Component) {
     var value = props.value;
     var localeData = value.localeData();
     var prefixCls = props.prefixCls;
-    var veryShortWeekdays = [];
-    var weekDays = [];
+    // const veryShortWeekdays = [];
+    // const weekDays = [];
     // const firstDayOfWeek = localeData.firstDayOfWeek();
     // We set Sunday(7) as the first day of the week in seafile-calendar.
-    var firstDayOfWeek = 7;
     var showWeekNumberEl = void 0;
-    var now = (0, _moment2['default'])();
-    for (var dateColIndex = 0; dateColIndex < _DateConstants2['default'].DATE_COL_COUNT; dateColIndex++) {
-      var index = (firstDayOfWeek + dateColIndex) % _DateConstants2['default'].DATE_COL_COUNT;
-      now.day(index);
-      veryShortWeekdays[dateColIndex] = localeData.weekdaysMin(now);
-      weekDays[dateColIndex] = localeData.weekdaysShort(now);
-    }
-
+    // for (let dateColIndex = 0; dateColIndex < DateConstants.DATE_COL_COUNT; dateColIndex++) {
+    //   const index = (firstDayOfWeek + dateColIndex) % DateConstants.DATE_COL_COUNT;
+    //   now.day(index);
+    //   veryShortWeekdays[dateColIndex] = localeData.weekdaysMin();
+    //   weekDays[dateColIndex] = localeData.weekdaysShort();
+    // }
+    var veryShortWeekdays = localeData.weekdaysMin();
+    var weekDays = localeData.weekdaysShort();
     if (props.showWeekNumber) {
-      showWeekNumberEl = _react2['default'].createElement(
-        'th',
+      showWeekNumberEl = _react2["default"].createElement(
+        "th",
         {
-          role: 'columnheader',
-          className: prefixCls + '-column-header ' + prefixCls + '-week-number-header'
+          role: "columnheader",
+          className: prefixCls + "-column-header " + prefixCls + "-week-number-header"
         },
-        _react2['default'].createElement(
-          'span',
-          { className: prefixCls + '-column-header-inner' },
-          'x'
+        _react2["default"].createElement(
+          "span",
+          { className: prefixCls + "-column-header-inner" },
+          "x"
         )
       );
     }
     var weekDaysEls = weekDays.map(function (day, xindex) {
-      return _react2['default'].createElement(
-        'th',
+      return _react2["default"].createElement(
+        "th",
         {
           key: xindex,
-          role: 'columnheader',
+          role: "columnheader",
           title: day,
-          className: prefixCls + '-column-header'
+          className: prefixCls + "-column-header"
         },
-        _react2['default'].createElement(
-          'span',
-          { className: prefixCls + '-column-header-inner' },
+        _react2["default"].createElement(
+          "span",
+          { className: prefixCls + "-column-header-inner" },
           veryShortWeekdays[xindex]
         )
       );
     });
-    return _react2['default'].createElement(
-      'thead',
+    return _react2["default"].createElement(
+      "thead",
       null,
-      _react2['default'].createElement(
-        'tr',
-        { role: 'row' },
+      _react2["default"].createElement(
+        "tr",
+        { role: "row" },
         showWeekNumberEl,
         weekDaysEls
       )
@@ -98,7 +89,7 @@ var DateTHead = function (_React$Component) {
   };
 
   return DateTHead;
-}(_react2['default'].Component);
+}(_react2["default"].Component);
 
-exports['default'] = DateTHead;
+exports["default"] = DateTHead;
 module.exports = exports['default'];

package/lib/decade/DecadePanel.js

@@ -34,7 +34,7 @@ var COL = 3;
 
 function goYear(direction) {
   var next = this.state.value.clone();
-  next.add(direction, 'years');
+  next = next.add(direction, 'years');
   this.setState({
     value: next
   });
@@ -42,8 +42,8 @@ function goYear(direction) {
 
 function chooseDecade(year, event) {
   var next = this.state.value.clone();
-  next.year(year);
-  next.month(this.state.value.month());
+  next = next.year(year);
+  next = next.month(this.state.value.month());
   this.props.onSelect(next);
   event.preventDefault();
 }

package/lib/full-calendar/CalendarHeader.js

@@ -38,13 +38,13 @@ var CalendarHeader = function (_Component) {
 
   CalendarHeader.prototype.onYearChange = function onYearChange(year) {
     var newValue = this.props.value.clone();
-    newValue.year(parseInt(year, 10));
+    newValue = newValue.year(parseInt(year, 10));
     this.props.onValueChange(newValue);
   };
 
   CalendarHeader.prototype.onMonthChange = function onMonthChange(month) {
     var newValue = this.props.value.clone();
-    newValue.month(parseInt(month, 10));
+    newValue = newValue.month(parseInt(month, 10));
     this.props.onValueChange(newValue);
   };
 
@@ -90,7 +90,7 @@ var CalendarHeader = function (_Component) {
     var Select = props.Select;
 
     for (var index = 0; index < 12; index++) {
-      t.month(index);
+      t = t.month(index);
       options.push(_react2['default'].createElement(
         Select.Option,
         { key: '' + index },

package/lib/mixin/CalendarMixin.js

@@ -29,9 +29,9 @@ var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _moment = require('moment');
+var _dayjs = require('dayjs');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _dayjs2 = _interopRequireDefault(_dayjs);
 
 var _index = require('../util/index');
 
@@ -44,7 +44,7 @@ function getNowByCurrentStateValue(value) {
   if (value) {
     ret = (0, _index.getTodayTime)(value);
   } else {
-    ret = (0, _moment2['default'])();
+    ret = (0, _dayjs2['default'])();
   }
   return ret;
 }

package/lib/month/MonthTable.js

@@ -35,7 +35,7 @@ var COL = 3;
 
 function chooseMonth(month) {
   var next = this.state.value.clone();
-  next.month(month);
+  next = next.month(month);
   this.setAndSelectValue(next);
 }
 
@@ -78,7 +78,7 @@ var MonthTable = function (_Component) {
     for (var rowIndex = 0; rowIndex < ROW; rowIndex++) {
       months[rowIndex] = [];
       for (var colIndex = 0; colIndex < COL; colIndex++) {
-        current.month(index);
+        current = current.month(index);
         var content = (0, _index.getMonthName)(current);
         months[rowIndex][colIndex] = {
           value: index,
@@ -111,20 +111,20 @@ var MonthTable = function (_Component) {
         var disabled = false;
         if (props.disabledDate) {
           var testValue = value.clone();
-          testValue.month(monthData.value);
+          testValue = testValue.month(monthData.value);
           disabled = props.disabledDate(testValue);
         }
         var classNameMap = (_classNameMap = {}, _classNameMap[prefixCls + '-cell'] = 1, _classNameMap[prefixCls + '-cell-disabled'] = disabled, _classNameMap[prefixCls + '-selected-cell'] = monthData.value === currentMonth, _classNameMap[prefixCls + '-current-cell'] = today.year() === value.year() && monthData.value === today.month(), _classNameMap);
         var cellEl = void 0;
         if (cellRender) {
           var currentValue = value.clone();
-          currentValue.month(monthData.value);
+          currentValue = currentValue.month(monthData.value);
           cellEl = cellRender(currentValue, locale);
         } else {
           var content = void 0;
           if (contentRender) {
             var _currentValue = value.clone();
-            _currentValue.month(monthData.value);
+            _currentValue = _currentValue.month(monthData.value);
             content = contentRender(_currentValue, locale);
           } else {
             content = monthData.content;

package/lib/util/index.js

@@ -17,12 +17,18 @@ exports.isTimeValid = isTimeValid;
 exports.isAllowedDate = isAllowedDate;
 exports.formatDate = formatDate;
 
-var _moment = require('moment');
+var _dayjs = require('dayjs');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _dayjs2 = _interopRequireDefault(_dayjs);
+
+var _utc = require('dayjs/plugin/utc');
+
+var _utc2 = _interopRequireDefault(_utc);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+_dayjs2['default'].extend(_utc2['default']);
+
 var defaultDisabledTime = {
   disabledHours: function disabledHours() {
     return [];
@@ -36,8 +42,8 @@ var defaultDisabledTime = {
 };
 
 function getTodayTime(value) {
-  var today = (0, _moment2['default'])();
-  today.locale(value.locale()).utcOffset(value.utcOffset());
+  var today = (0, _dayjs2['default'])();
+  today = today.locale(value.locale()).utcOffset(value.utcOffset());
   return today;
 }
 
@@ -57,11 +63,11 @@ function getMonthName(month) {
 }
 
 function syncTime(from, to) {
-  if (!_moment2['default'].isMoment(from) || !_moment2['default'].isMoment(to)) return;
-  to.hour(from.hour());
-  to.minute(from.minute());
-  to.second(from.second());
-  to.millisecond(from.millisecond());
+  if (!_dayjs2['default'].isDayjs(from) || !_dayjs2['default'].isDayjs(to)) return;
+  to = to.hour(from.hour());
+  to = to.minute(from.minute());
+  to = to.second(from.second());
+  to = to.millisecond(from.millisecond());
 }
 
 function getTimeConfig(value, disabledTime) {

package/lib/year/YearPanel.js

@@ -33,7 +33,7 @@ var COL = 3;
 
 function goYear(direction) {
   var value = this.state.value.clone();
-  value.add(direction, 'year');
+  value = value.add(direction, 'year');
   this.setState({
     value: value
   });
@@ -41,8 +41,8 @@ function goYear(direction) {
 
 function chooseYear(year) {
   var value = this.state.value.clone();
-  value.year(year);
-  value.month(this.state.value.month());
+  value = value.year(year);
+  value = value.month(this.state.value.month());
   this.setState({
     value: value
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-calendar",
-  "version": "0.0.13",
+  "version": "0.0.17beta",
   "description": "React Calendar",
   "keywords": [
     "react",
@@ -91,7 +91,7 @@
   "dependencies": {
     "babel-runtime": "6.x",
     "classnames": "2.x",
-    "moment": "2.x",
+    "dayjs": "1.10.7",
     "prop-types": "^15.5.8",
     "rc-trigger": "^2.2.0",
     "rc-util": "^4.1.1",