@seafile/seafile-calendar 0.0.32 → 0.0.89

package/es/date/DateTBody.js

@@ -5,7 +5,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import DateConstants from './DateConstants';
-import { getTitleString, getTodayTime, syncCurrentTime } from '../util/';
+import { getTitleString, getTodayTime } from '../util/';
+import dayjs from 'dayjs';
 
 var DATE_ROW_COLUMN_COUNT = DateConstants.DATE_ROW_COLUMN_COUNT,
     DAY_NAME_TO_INDEX = DateConstants.DAY_NAME_TO_INDEX;
@@ -121,7 +122,11 @@ var DateTBody = function (_React$Component) {
       for (jIndex = 0; jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT; jIndex++) {
         var next = null;
         var last = null;
-        current = syncCurrentTime(dateTable[passed], currentStatus);
+        if (currentStatus === 1) {
+          current = dateTable[passed].hour(dayjs().hour()).minute(dayjs().minute()).second(dayjs().second()); // eslint-disable-line max-len
+        } else {
+          current = dateTable[passed];
+        }
         if (jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT - 1) {
           next = dateTable[passed + 1];
         }
@@ -274,7 +279,7 @@ DateTBody.propTypes = {
   hoverValue: PropTypes.any,
   showWeekNumber: PropTypes.bool,
   firstDayOfWeek: PropTypes.string,
-  currentStatus: PropTypes.string
+  currentStatus: PropTypes.number
 };
 DateTBody.defaultProps = {
   hoverValue: []

package/es/util/index.js

@@ -27,18 +27,6 @@ export var DATE_FORMATS = {
   Germany_Russia_etcAndTime: 'DD.MM.YYYY HH:mm'
 };
 
-export var CALENDAR_STATUS = {
-  SPECIFIC_TIME: 'specific_time',
-  CURRENT_TIME: 'current_time'
-};
-
-export var syncCurrentTime = function syncCurrentTime(date, status) {
-  if (status === CALENDAR_STATUS.CURRENT_TIME) {
-    return date.hour(dayjs().hour()).minute(dayjs().minute()).second(dayjs().second());
-  }
-  return date;
-};
-
 var defaultDisabledTime = {
   disabledHours: function disabledHours() {
     return [];

package/lib/Calendar.js

@@ -109,7 +109,7 @@ var Calendar = function (_React$Component) {
       mode: _this.props.mode || 'date',
       value: getMomentObjectIfValid(props.value) || getMomentObjectIfValid(props.defaultValue) || (0, _dayjs2['default'])(),
       selectedValue: props.selectedValue || props.defaultSelectedValue,
-      currentStatus: _util.CALENDAR_STATUS.SPECIFIC_TIME
+      currentStatus: 0
     };
     return _this;
   }
@@ -154,7 +154,8 @@ var Calendar = function (_React$Component) {
         inputMode = props.inputMode,
         showHourAndMinute = props.showHourAndMinute,
         firstDayOfWeek = props.firstDayOfWeek,
-        showWeekNumber = props.showWeekNumber;
+        showWeekNumber = props.showWeekNumber,
+        shouldDisplayCurrent = props.shouldDisplayCurrent;
     var value = state.value,
         selectedValue = state.selectedValue,
         mode = state.mode,
@@ -183,15 +184,15 @@ var Calendar = function (_React$Component) {
       timePickerEle = _react2['default'].cloneElement(timePicker, timePickerProps);
     }
     var calendarInputPlaceholder = dateInputPlaceholder || (Array.isArray(this.getFormat()) ? this.getFormat()[0] : this.getFormat());
-    var inputFormat = Array.isArray(this.getFormat()) ? this.getFormat() : [this.getFormat()];
 
     var dateInputElement = props.showDateInput ? _react2['default'].createElement(_DateInput2['default'], {
-      format: inputFormat,
+      format: this.getFormat(),
       key: 'date-input',
       value: value,
       locale: locale,
       placeholder: calendarInputPlaceholder,
       showClear: true,
+      shouldDisplayCurrent: shouldDisplayCurrent,
       disabledTime: disabledTime,
       disabledDate: disabledDate,
       onClear: this.onClear,
@@ -284,7 +285,7 @@ var Calendar = function (_React$Component) {
           onSelect: this.onDateTableSelect,
           onClickRightPanelTime: onClickRightPanelTime,
           defaultMinutesTime: this.props.defaultMinutesTime,
-          format: inputFormat
+          format: this.getFormat()
         })
       )
     ));
@@ -332,7 +333,8 @@ Calendar.propTypes = (0, _extends3['default'])({}, _CalendarMixin.calendarMixinP
   inputMode: _propTypes2['default'].string,
   onBlur: _propTypes2['default'].func,
   onClickRightPanelTime: _propTypes2['default'].func,
-  firstDayOfWeek: _propTypes2['default'].string
+  firstDayOfWeek: _propTypes2['default'].string,
+  shouldDisplayCurrent: _propTypes2['default'].bool
 });
 Calendar.defaultProps = (0, _extends3['default'])({}, _CalendarMixin.calendarMixinDefaultProps, _CommonMixin.defaultProp, {
   showToday: true,
@@ -427,7 +429,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onClear = function () {
     _this2.onSelect(null);
     _this2.props.onClear();
-    _this2.setState({ currentStatus: _util.CALENDAR_STATUS.CURRENT_TIME });
+    _this2.setState({ currentStatus: 1 });
   };
 
   this.onOk = function () {
@@ -454,7 +456,7 @@ var _initialiseProps = function _initialiseProps() {
     var timePicker = _this2.props.timePicker;
     var selectedValue = _this2.state.selectedValue;
 
-    _this2.setState({ currentStatus: _util.CALENDAR_STATUS.SPECIFIC_TIME });
+    _this2.setState({ currentStatus: 0 });
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {

package/lib/Picker.js

@@ -232,6 +232,7 @@ var _initialiseProps = function _initialiseProps() {
       ref: _this2.saveCalendarRef,
       defaultValue: defaultValue || calendarProps.defaultValue,
       selectedValue: value,
+      shouldDisplayCurrent: calendarProps.shouldDisplayCurrent,
       onKeyDown: _this2.onCalendarKeyDown,
       onOk: (0, _createChainedFunction2['default'])(calendarProps.onOk, _this2.onCalendarOk),
       onSelect: (0, _createChainedFunction2['default'])(calendarProps.onSelect, _this2.onCalendarSelect),

package/lib/date/DateInput.js

@@ -63,7 +63,6 @@ var DateInput = function (_React$Component) {
     _this.state = {
       str: (0, _util.formatDate)(selectedValue, _this.props.format),
       hasFocus: false,
-      isInputEmpty: false,
       localFormat: _this.props.format[0]
     };
     return _this;
@@ -152,13 +151,15 @@ DateInput.propTypes = {
   onSelect: _propTypes2['default'].func,
   selectedValue: _propTypes2['default'].object,
   clearIcon: _propTypes2['default'].node,
-  inputMode: _propTypes2['default'].string
+  inputMode: _propTypes2['default'].string,
+  shouldDisplayCurrent: _propTypes2['default'].bool
 };
 
 var _initialiseProps = function _initialiseProps() {
   var _this2 = this;
 
   this.onClear = function () {
+    console.log('onClear');
     _this2.setState({ str: '' });
     _this2.props.onClear(null);
   };
@@ -170,20 +171,23 @@ var _initialiseProps = function _initialiseProps() {
         disabledDate = _props.disabledDate,
         format = _props.format,
         onChange = _props.onChange,
-        selectedValue = _props.selectedValue;
-
+        selectedValue = _props.selectedValue,
+        shouldDisplayCurrent = _props.shouldDisplayCurrent;
     // 没有内容，合法并直接退出
 
-    if (!str || !calendarStr) {
-      _this2.setState({ isInputEmpty: true });
-      _this2.onClear();
-      return;
-    }
+    console.log('str', str);
+    console.log('calendarStr', calendarStr);
 
-    if (_this2.state.isInputEmpty) {
-      _this2.setState({ isInputEmpty: false });
+    if (!str) {
+      console.log('没有内容，合法并直接退出');
+      if (shouldDisplayCurrent) {
+        _this2.setState({ str: '' });
+        onChange((0, _dayjs2['default'])());
+      } else {
+        _this2.onClear();
+      }
+      return;
     }
-
     var parsed = (0, _dayjs2['default'])(calendarStr, format[0]);
     var value = _this2.props.value.clone();
     value = value.year(parsed.year()).month(parsed.month()).date(parsed.date()).hour(parsed.hour()).minute(parsed.minute()).second(parsed.second());
@@ -222,11 +226,7 @@ var _initialiseProps = function _initialiseProps() {
     if (keyCode === _KeyCode2['default'].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
-        if (_this2.state.isInputEmpty) {
-          onSelect(null);
-        } else {
-          onSelect(value.clone());
-        }
+        onSelect(value.clone());
       }
       event.preventDefault();
     }

package/lib/date/DateTBody.js

@@ -32,6 +32,10 @@ var _DateConstants2 = _interopRequireDefault(_DateConstants);
 
 var _util = require('../util/');
 
+var _dayjs = require('dayjs');
+
+var _dayjs2 = _interopRequireDefault(_dayjs);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var DATE_ROW_COLUMN_COUNT = _DateConstants2['default'].DATE_ROW_COLUMN_COUNT,
@@ -147,7 +151,11 @@ var DateTBody = function (_React$Component) {
       for (jIndex = 0; jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT; jIndex++) {
         var next = null;
         var last = null;
-        current = (0, _util.syncCurrentTime)(dateTable[passed], currentStatus);
+        if (currentStatus === 1) {
+          current = dateTable[passed].hour((0, _dayjs2['default'])().hour()).minute((0, _dayjs2['default'])().minute()).second((0, _dayjs2['default'])().second()); // eslint-disable-line max-len
+        } else {
+          current = dateTable[passed];
+        }
         if (jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT - 1) {
           next = dateTable[passed + 1];
         }
@@ -300,7 +308,7 @@ DateTBody.propTypes = {
   hoverValue: _propTypes2['default'].any,
   showWeekNumber: _propTypes2['default'].bool,
   firstDayOfWeek: _propTypes2['default'].string,
-  currentStatus: _propTypes2['default'].string
+  currentStatus: _propTypes2['default'].number
 };
 DateTBody.defaultProps = {
   hoverValue: []

package/lib/util/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.isLeapYear = exports.syncCurrentTime = exports.CALENDAR_STATUS = exports.DATE_FORMATS = exports.getCurrentTime = exports.getCurrentYear = exports.getCurrentMonth = exports.getCurrentDate = undefined;
+exports.isLeapYear = exports.DATE_FORMATS = exports.getCurrentTime = exports.getCurrentYear = exports.getCurrentMonth = exports.getCurrentDate = undefined;
 
 var _extends2 = require('babel-runtime/helpers/extends');
 
@@ -62,18 +62,6 @@ var DATE_FORMATS = exports.DATE_FORMATS = {
   Germany_Russia_etcAndTime: 'DD.MM.YYYY HH:mm'
 };
 
-var CALENDAR_STATUS = exports.CALENDAR_STATUS = {
-  SPECIFIC_TIME: 'specific_time',
-  CURRENT_TIME: 'current_time'
-};
-
-var syncCurrentTime = exports.syncCurrentTime = function syncCurrentTime(date, status) {
-  if (status === CALENDAR_STATUS.CURRENT_TIME) {
-    return date.hour((0, _dayjs2['default'])().hour()).minute((0, _dayjs2['default'])().minute()).second((0, _dayjs2['default'])().second());
-  }
-  return date;
-};
-
 var defaultDisabledTime = {
   disabledHours: function disabledHours() {
     return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-calendar",
-  "version": "0.0.32",
+  "version": "0.0.89",
   "description": "React Calendar",
   "keywords": [
     "react",
@@ -68,7 +68,6 @@
   "devDependencies": {
     "@types/react": "^16.3.13",
     "async": "~3.1.0",
-    "chokidar": "^4.0.3",
     "dtslint": "^0.9.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",