@seafile/seafile-calendar 0.0.8882 → 0.0.88881

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: 0
+      currentStatus: 'selectDateTime'
     };
     return _this;
   }
@@ -154,8 +154,7 @@ var Calendar = function (_React$Component) {
         inputMode = props.inputMode,
         showHourAndMinute = props.showHourAndMinute,
         firstDayOfWeek = props.firstDayOfWeek,
-        showWeekNumber = props.showWeekNumber,
-        shouldDisplayCurrent = props.shouldDisplayCurrent;
+        showWeekNumber = props.showWeekNumber;
     var value = state.value,
         selectedValue = state.selectedValue,
         mode = state.mode,
@@ -184,7 +183,8 @@ 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 = dateInputPlaceholder || (Array.isArray(this.getFormat()) ? this.getFormat() : [this.getFormat()]);
+    var inputFormat = Array.isArray(this.getFormat()) ? this.getFormat() : [this.getFormat()];
+
     var dateInputElement = props.showDateInput ? _react2['default'].createElement(_DateInput2['default'], {
       format: inputFormat,
       key: 'date-input',
@@ -192,7 +192,6 @@ var Calendar = function (_React$Component) {
       locale: locale,
       placeholder: calendarInputPlaceholder,
       showClear: true,
-      shouldDisplayCurrent: shouldDisplayCurrent,
       disabledTime: disabledTime,
       disabledDate: disabledDate,
       onClear: this.onClear,
@@ -333,8 +332,7 @@ Calendar.propTypes = (0, _extends3['default'])({}, _CalendarMixin.calendarMixinP
   inputMode: _propTypes2['default'].string,
   onBlur: _propTypes2['default'].func,
   onClickRightPanelTime: _propTypes2['default'].func,
-  firstDayOfWeek: _propTypes2['default'].string,
-  shouldDisplayCurrent: _propTypes2['default'].bool
+  firstDayOfWeek: _propTypes2['default'].string
 });
 Calendar.defaultProps = (0, _extends3['default'])({}, _CalendarMixin.calendarMixinDefaultProps, _CommonMixin.defaultProp, {
   showToday: true,
@@ -366,6 +364,7 @@ var _initialiseProps = function _initialiseProps() {
       return undefined;
     }
     var keyCode = event.keyCode;
+    console.log('keyCode', keyCode);
     // mac
     var ctrlKey = event.ctrlKey || event.metaKey;
     var disabledDate = _this2.props.disabledDate;
@@ -429,7 +428,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onClear = function () {
     _this2.onSelect(null);
     _this2.props.onClear();
-    _this2.setState({ currentStatus: 1 });
+    _this2.setState({ currentStatus: 'todayTime' });
   };
 
   this.onOk = function () {
@@ -456,7 +455,7 @@ var _initialiseProps = function _initialiseProps() {
     var timePicker = _this2.props.timePicker;
     var selectedValue = _this2.state.selectedValue;
 
-    _this2.setState({ currentStatus: 0 });
+    _this2.setState({ currentStatus: 'selectDateTime' });
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {

package/lib/Picker.js

@@ -232,7 +232,6 @@ 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,6 +63,7 @@ var DateInput = function (_React$Component) {
     _this.state = {
       str: (0, _util.formatDate)(selectedValue, _this.props.format),
       hasFocus: false,
+      emptyValue: false,
       localFormat: _this.props.format[0]
     };
     return _this;
@@ -151,8 +152,7 @@ DateInput.propTypes = {
   onSelect: _propTypes2['default'].func,
   selectedValue: _propTypes2['default'].object,
   clearIcon: _propTypes2['default'].node,
-  inputMode: _propTypes2['default'].string,
-  shouldDisplayCurrent: _propTypes2['default'].bool
+  inputMode: _propTypes2['default'].string
 };
 
 var _initialiseProps = function _initialiseProps() {
@@ -170,19 +170,15 @@ var _initialiseProps = function _initialiseProps() {
         disabledDate = _props.disabledDate,
         format = _props.format,
         onChange = _props.onChange,
-        selectedValue = _props.selectedValue,
-        shouldDisplayCurrent = _props.shouldDisplayCurrent;
+        selectedValue = _props.selectedValue;
     // 没有内容，合法并直接退出
 
     if (!str || !calendarStr) {
-      if (shouldDisplayCurrent) {
-        _this2.setState({ str: '' });
-        onChange((0, _dayjs2['default'])());
-      } else {
-        _this2.onClear();
-      }
+      _this2.setState({ emptyValue: true });
+      _this2.onClear();
       return;
     }
+    if (emptyValue) _this2.setState({ emptyValue: false });
     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());
@@ -218,9 +214,13 @@ var _initialiseProps = function _initialiseProps() {
         value = _props2.value,
         disabledDate = _props2.disabledDate;
 
+    console.log('keyCode', keyCode, value);
     if (keyCode === _KeyCode2['default'].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
+        if (emptyValue) {
+          onSelect(null);
+        }
         onSelect(value.clone());
       }
       event.preventDefault();

package/lib/date/DateTBody.js

@@ -151,7 +151,7 @@ var DateTBody = function (_React$Component) {
       for (jIndex = 0; jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT; jIndex++) {
         var next = null;
         var last = null;
-        if (currentStatus === 1) {
+        if (currentStatus === 'todayTime') {
           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];
@@ -308,7 +308,7 @@ DateTBody.propTypes = {
   hoverValue: _propTypes2['default'].any,
   showWeekNumber: _propTypes2['default'].bool,
   firstDayOfWeek: _propTypes2['default'].string,
-  currentStatus: _propTypes2['default'].number
+  currentStatus: _propTypes2['default'].string
 };
 DateTBody.defaultProps = {
   hoverValue: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-calendar",
-  "version": "0.0.8882",
+  "version": "0.0.88881",
   "description": "React Calendar",
   "keywords": [
     "react",