@seafile/seafile-calendar 0.0.31 → 0.0.32-alpha.0

package/dist/rc-calendar.js

@@ -316,26 +316,28 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /* unused harmony export getCurrentYear */
 /* unused harmony export getCurrentTime */
 /* unused harmony export DATE_FORMATS */
-/* harmony export (immutable) */ __webpack_exports__["e"] = getTodayTime;
-/* harmony export (immutable) */ __webpack_exports__["d"] = getTitleString;
-/* harmony export (immutable) */ __webpack_exports__["f"] = getTodayTimeStr;
-/* harmony export (immutable) */ __webpack_exports__["b"] = getMonthName;
-/* harmony export (immutable) */ __webpack_exports__["i"] = syncTime;
-/* harmony export (immutable) */ __webpack_exports__["c"] = getTimeConfig;
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CALENDAR_STATUS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return syncCurrentTime; });
+/* harmony export (immutable) */ __webpack_exports__["f"] = getTodayTime;
+/* harmony export (immutable) */ __webpack_exports__["e"] = getTitleString;
+/* harmony export (immutable) */ __webpack_exports__["g"] = getTodayTimeStr;
+/* harmony export (immutable) */ __webpack_exports__["c"] = getMonthName;
+/* harmony export (immutable) */ __webpack_exports__["k"] = syncTime;
+/* harmony export (immutable) */ __webpack_exports__["d"] = getTimeConfig;
 /* unused harmony export isTimeValidByConfig */
 /* unused harmony export isTimeValid */
-/* harmony export (immutable) */ __webpack_exports__["h"] = isAllowedDate;
-/* harmony export (immutable) */ __webpack_exports__["a"] = formatDate;
+/* harmony export (immutable) */ __webpack_exports__["i"] = isAllowedDate;
+/* harmony export (immutable) */ __webpack_exports__["b"] = formatDate;
 /* unused harmony export isLeapYear */
 /* unused harmony export validateCalendarDay */
-/* harmony export (immutable) */ __webpack_exports__["j"] = tokenizeFormattedDate;
+/* harmony export (immutable) */ __webpack_exports__["l"] = tokenizeFormattedDate;
 /* unused harmony export hasSpecialChar */
 /* unused harmony export validateTime */
 /* unused harmony export delimate */
 /* unused harmony export validateCalendarYear */
 /* unused harmony export validateAndNormalizeDate */
 /* unused harmony export getDatePart */
-/* harmony export (immutable) */ __webpack_exports__["g"] = initializeStr;
+/* harmony export (immutable) */ __webpack_exports__["h"] = initializeStr;
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends__ = __webpack_require__(26);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_babel_runtime_helpers_extends__);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_dayjs__ = __webpack_require__(20);
@@ -371,6 +373,18 @@ var DATE_FORMATS = {
   Germany_Russia_etcAndTime: 'DD.MM.YYYY HH:mm'
 };
 
+var CALENDAR_STATUS = {
+  SPECIFIC_TIME: 'specific_time',
+  CURRENT_TIME: 'current_time'
+};
+
+var syncCurrentTime = function syncCurrentTime(date, status) {
+  if (status === CALENDAR_STATUS.CURRENT_TIME) {
+    return date.hour(__WEBPACK_IMPORTED_MODULE_1_dayjs___default()().hour()).minute(__WEBPACK_IMPORTED_MODULE_1_dayjs___default()().minute()).second(__WEBPACK_IMPORTED_MODULE_1_dayjs___default()().second());
+  }
+  return date;
+};
+
 var defaultDisabledTime = {
   disabledHours: function disabledHours() {
     return [];
@@ -822,7 +836,7 @@ function initializeStr(str, format) {
       return '' + _day10 + dateDelimater + _month10 + dateDelimater + _year10;
     } else if (inputStrLength >= 1 && inputStrLength <= 8) {
       var _dateStr6 = inputStr.slice(0, 2);
-      var _monthStr6 = inputStr.slice(2, 4);
+      var _monthStr6 = inputStr.slice(2, 4) || getCurrentMonth();
       var _yearStr6 = inputStr.slice(4, inputStr.length);
       var _validateYear11 = validateCalendarYear(_yearStr6);
 
@@ -866,7 +880,7 @@ function initializeStr(str, format) {
       return '' + _day12 + dateDelimater + _month12 + dateDelimater + _year12 + ' ' + time;
     } else if (_datePart2.length >= 1 && _datePart2.length <= 8) {
       var _dateStr7 = _datePart2.slice(0, 2);
-      var _monthStr7 = _datePart2.slice(2, 4);
+      var _monthStr7 = _datePart2.slice(2, 4) || getCurrentMonth();
       var _yearStr7 = _datePart2.slice(4, _datePart2.length);
       var _timeParts2 = tokenizeFormattedDate(inputStr, format);
       time = validateTime(_timeParts2[1] + ':' + _timeParts2[2]);
@@ -2760,7 +2774,8 @@ var Calendar = function (_React$Component) {
     _this.state = {
       mode: _this.props.mode || 'date',
       value: getMomentObjectIfValid(props.value) || getMomentObjectIfValid(props.defaultValue) || __WEBPACK_IMPORTED_MODULE_9_dayjs___default()(),
-      selectedValue: props.selectedValue || props.defaultSelectedValue
+      selectedValue: props.selectedValue || props.defaultSelectedValue,
+      currentStatus: __WEBPACK_IMPORTED_MODULE_17__util__["a" /* CALENDAR_STATUS */].SPECIFIC_TIME
     };
     return _this;
   }
@@ -2808,10 +2823,11 @@ var Calendar = function (_React$Component) {
         showWeekNumber = props.showWeekNumber;
     var value = state.value,
         selectedValue = state.selectedValue,
-        mode = state.mode;
+        mode = state.mode,
+        currentStatus = state.currentStatus;
 
     var showTimePicker = mode === 'time';
-    var disabledTimeConfig = showTimePicker && disabledTime && timePicker ? Object(__WEBPACK_IMPORTED_MODULE_17__util__["c" /* getTimeConfig */])(selectedValue, disabledTime) : null;
+    var disabledTimeConfig = showTimePicker && disabledTime && timePicker ? Object(__WEBPACK_IMPORTED_MODULE_17__util__["d" /* getTimeConfig */])(selectedValue, disabledTime) : null;
 
     var timePickerEle = null;
 
@@ -2833,9 +2849,10 @@ var Calendar = function (_React$Component) {
       timePickerEle = __WEBPACK_IMPORTED_MODULE_4_react___default.a.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 ? __WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_16__date_DateInput__["a" /* default */], {
-      format: this.getFormat(),
+      format: inputFormat,
       key: 'date-input',
       value: value,
       locale: locale,
@@ -2900,7 +2917,8 @@ var Calendar = function (_React$Component) {
               onSelect: this.onDateTableSelect,
               disabledDate: disabledDate,
               showWeekNumber: showWeekNumber,
-              firstDayOfWeek: firstDayOfWeek
+              firstDayOfWeek: firstDayOfWeek,
+              currentStatus: currentStatus
             })
           ),
           __WEBPACK_IMPORTED_MODULE_4_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_12__calendar_CalendarFooter__["a" /* default */], {
@@ -2932,7 +2950,7 @@ var Calendar = function (_React$Component) {
           onSelect: this.onDateTableSelect,
           onClickRightPanelTime: onClickRightPanelTime,
           defaultMinutesTime: this.props.defaultMinutesTime,
-          format: this.getFormat()
+          format: inputFormat
         })
       )
     ));
@@ -3075,6 +3093,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onClear = function () {
     _this2.onSelect(null);
     _this2.props.onClear();
+    _this2.setState({ currentStatus: __WEBPACK_IMPORTED_MODULE_17__util__["a" /* CALENDAR_STATUS */].CURRENT_TIME });
   };
 
   this.onOk = function () {
@@ -3101,10 +3120,11 @@ var _initialiseProps = function _initialiseProps() {
     var timePicker = _this2.props.timePicker;
     var selectedValue = _this2.state.selectedValue;
 
+    _this2.setState({ currentStatus: __WEBPACK_IMPORTED_MODULE_17__util__["a" /* CALENDAR_STATUS */].SPECIFIC_TIME });
     if (!selectedValue && timePicker) {
       var timePickerDefaultValue = timePicker.props.defaultValue;
       if (timePickerDefaultValue) {
-        Object(__WEBPACK_IMPORTED_MODULE_17__util__["i" /* syncTime */])(timePickerDefaultValue, value);
+        Object(__WEBPACK_IMPORTED_MODULE_17__util__["k" /* syncTime */])(timePickerDefaultValue, value);
       }
     }
     _this2.onSelect(value);
@@ -3113,7 +3133,7 @@ var _initialiseProps = function _initialiseProps() {
   this.onToday = function () {
     var value = _this2.state.value;
 
-    var now = Object(__WEBPACK_IMPORTED_MODULE_17__util__["e" /* getTodayTime */])(value);
+    var now = Object(__WEBPACK_IMPORTED_MODULE_17__util__["f" /* getTodayTime */])(value);
     _this2.onSelect(now, {
       source: 'todayButton'
     });
@@ -5316,13 +5336,14 @@ var DateTBody = function (_React$Component) {
         dateRender = props.dateRender,
         disabledDate = props.disabledDate,
         hoverValue = props.hoverValue,
-        firstDayOfWeek = props.firstDayOfWeek;
+        firstDayOfWeek = props.firstDayOfWeek,
+        currentStatus = props.currentStatus;
 
     var iIndex = void 0;
     var jIndex = void 0;
     var current = void 0;
     var dateTable = [];
-    var today = Object(__WEBPACK_IMPORTED_MODULE_7__util___["e" /* getTodayTime */])(value);
+    var today = Object(__WEBPACK_IMPORTED_MODULE_7__util___["f" /* getTodayTime */])(value);
     var cellClass = prefixCls + '-cell';
     var weekNumberCellClass = prefixCls + '-week-number-cell';
     var dateClass = prefixCls + '-date';
@@ -5384,7 +5405,7 @@ var DateTBody = function (_React$Component) {
       for (jIndex = 0; jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT; jIndex++) {
         var next = null;
         var last = null;
-        current = dateTable[passed];
+        current = Object(__WEBPACK_IMPORTED_MODULE_7__util___["j" /* syncCurrentTime */])(dateTable[passed], currentStatus);
         if (jIndex < DATE_ROW_COLUMN_COUNT.DATE_COL_COUNT - 1) {
           next = dateTable[passed + 1];
         }
@@ -5497,7 +5518,7 @@ var DateTBody = function (_React$Component) {
             onClick: disabled ? undefined : props.onSelect.bind(null, current),
             onMouseEnter: disabled ? undefined : props.onDayHover && props.onDayHover.bind(null, current) || undefined,
             role: 'gridcell',
-            title: Object(__WEBPACK_IMPORTED_MODULE_7__util___["d" /* getTitleString */])(current),
+            title: Object(__WEBPACK_IMPORTED_MODULE_7__util___["e" /* getTitleString */])(current),
             className: cls
           },
           dateHtml
@@ -5536,7 +5557,8 @@ DateTBody.propTypes = {
   value: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.object,
   hoverValue: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.any,
   showWeekNumber: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.bool,
-  firstDayOfWeek: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.string
+  firstDayOfWeek: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.string,
+  currentStatus: __WEBPACK_IMPORTED_MODULE_4_prop_types___default.a.string
 };
 DateTBody.defaultProps = {
   hoverValue: []
@@ -6067,7 +6089,7 @@ var MonthTable = function (_Component) {
       months[rowIndex] = [];
       for (var colIndex = 0; colIndex < COL; colIndex++) {
         current = current.month(index);
-        var content = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["b" /* getMonthName */])(current);
+        var content = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["c" /* getMonthName */])(current);
         months[rowIndex][colIndex] = {
           value: index,
           content: content,
@@ -6084,7 +6106,7 @@ var MonthTable = function (_Component) {
 
     var props = this.props;
     var value = this.state.value;
-    var today = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["e" /* getTodayTime */])(value);
+    var today = Object(__WEBPACK_IMPORTED_MODULE_6__util_index__["f" /* getTodayTime */])(value);
     var months = this.months();
     var currentMonth = value.month();
     var prefixCls = props.prefixCls,
@@ -6720,7 +6742,7 @@ function TodayButton(_ref) {
       text = _ref.text;
 
   var localeNow = (!text && timePicker ? locale.now : text) || locale.today;
-  var disabledToday = disabledDate && !Object(__WEBPACK_IMPORTED_MODULE_1__util___["h" /* isAllowedDate */])(Object(__WEBPACK_IMPORTED_MODULE_1__util___["e" /* getTodayTime */])(value), disabledDate);
+  var disabledToday = disabledDate && !Object(__WEBPACK_IMPORTED_MODULE_1__util___["i" /* isAllowedDate */])(Object(__WEBPACK_IMPORTED_MODULE_1__util___["f" /* getTodayTime */])(value), disabledDate);
   var isDisabled = disabledToday || disabled;
   var disabledTodayClass = isDisabled ? prefixCls + '-today-btn-disabled' : '';
   return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(
@@ -6729,7 +6751,7 @@ function TodayButton(_ref) {
       className: prefixCls + '-today-btn ' + disabledTodayClass,
       role: 'button',
       onClick: isDisabled ? null : onToday,
-      title: Object(__WEBPACK_IMPORTED_MODULE_1__util___["f" /* getTodayTimeStr */])(value)
+      title: Object(__WEBPACK_IMPORTED_MODULE_1__util___["g" /* getTodayTimeStr */])(value)
     },
     localeNow
   );
@@ -6913,7 +6935,7 @@ var CalendarRightPanel = function (_React$Component) {
           'ul',
           null,
           this.times.map(function (time) {
-            var parts = Object(__WEBPACK_IMPORTED_MODULE_6__util__["j" /* tokenizeFormattedDate */])(selectedDate, _this2.state.localeFormat);
+            var parts = Object(__WEBPACK_IMPORTED_MODULE_6__util__["l" /* tokenizeFormattedDate */])(selectedDate, _this2.state.localeFormat);
             var current = __WEBPACK_IMPORTED_MODULE_5_dayjs___default()(selectedDate + ' ' + time).year(parts[0]).month(parts[1] - 1).date(parts[2]); // eslint-disable-line max-len
             current = isZhcn ? current.locale('zh-cn') : current.locale('en-gb');
             return __WEBPACK_IMPORTED_MODULE_3_react___default.a.createElement(
@@ -6988,7 +7010,7 @@ function noop() {}
 function getNowByCurrentStateValue(value) {
   var ret = void 0;
   if (value) {
-    ret = Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["e" /* getTodayTime */])(value);
+    ret = Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["f" /* getTodayTime */])(value);
   } else {
     ret = __WEBPACK_IMPORTED_MODULE_6_dayjs___default()();
   }
@@ -7069,7 +7091,7 @@ var calendarMixinWrapper = function calendarMixinWrapper(ComposeComponent) {
       }, _this.isAllowedDate = function (value) {
         var disabledDate = _this.props.disabledDate;
         var disabledTime = _this.props.disabledTime;
-        return Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["h" /* isAllowedDate */])(value, disabledDate, disabledTime);
+        return Object(__WEBPACK_IMPORTED_MODULE_7__util_index__["i" /* isAllowedDate */])(value, disabledDate, disabledTime);
       }, _temp), __WEBPACK_IMPORTED_MODULE_1_babel_runtime_helpers_possibleConstructorReturn___default()(_this, _ret);
     }
 
@@ -7267,14 +7289,11 @@ var commonMixinWrapper = function commonMixinWrapper(ComposeComponent) {
 
 
 
+
 var customParseFormat = __webpack_require__(124);
 
 __WEBPACK_IMPORTED_MODULE_8_dayjs___default.a.extend(customParseFormat);
 
-var cachedSelectionStart = void 0;
-var cachedSelectionEnd = void 0;
-var dateInputInstance = void 0;
-
 var DateInput = function (_React$Component) {
   __WEBPACK_IMPORTED_MODULE_2_babel_runtime_helpers_inherits___default()(DateInput, _React$Component);
 
@@ -7288,37 +7307,49 @@ var DateInput = function (_React$Component) {
     var selectedValue = props.selectedValue;
 
     _this.state = {
-      str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["a" /* formatDate */])(selectedValue, _this.props.format),
+      str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["b" /* formatDate */])(selectedValue, _this.props.format),
       hasFocus: false,
+      isInputEmpty: false,
       localFormat: _this.props.format[0]
     };
+    _this.dateInputInstance = __WEBPACK_IMPORTED_MODULE_3_react___default.a.createRef();
+    _this.cachedSelectionStart = null;
+    _this.cachedSelectionEnd = null;
     return _this;
   }
 
+  DateInput.prototype.componentDidMount = function componentDidMount() {
+    var _this2 = this;
+
+    setTimeout(function () {
+      _this2.focus();
+    }, 1);
+  };
+
   DateInput.prototype.componentDidUpdate = function componentDidUpdate() {
-    if (dateInputInstance && this.state.hasFocus && !(cachedSelectionStart === 0 && cachedSelectionEnd === 0)) {
-      dateInputInstance.setSelectionRange(cachedSelectionStart, cachedSelectionEnd);
+    if (this.dateInputInstance.current && this.state.hasFocus && !(this.cachedSelectionStart === 0 && this.cachedSelectionEnd === 0)) {
+      this.dateInputInstance.current.setSelectionRange(this.cachedSelectionStart, this.cachedSelectionEnd);
     }
   };
 
   DateInput.getDerivedStateFromProps = function getDerivedStateFromProps(nextProps, state) {
     var newState = {};
 
-    if (dateInputInstance) {
-      cachedSelectionStart = dateInputInstance.selectionStart;
-      cachedSelectionEnd = dateInputInstance.selectionEnd;
+    if (this.dateInputInstance.current) {
+      this.cachedSelectionStart = this.dateInputInstance.current.selectionStart;
+      this.cachedSelectionEnd = this.dateInputInstance.current.selectionEnd;
     }
     // when popup show, click body will call this, bug!
     var selectedValue = nextProps.selectedValue;
     if (!state.hasFocus) {
-      newState = { str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["a" /* formatDate */])(selectedValue, nextProps.format) };
+      newState = { str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["b" /* formatDate */])(selectedValue, nextProps.format) };
     }
 
     return newState;
   };
 
   DateInput.getInstance = function getInstance() {
-    return dateInputInstance;
+    return this.dateInputInstance.current;
   };
 
   DateInput.prototype.render = function render() {
@@ -7337,7 +7368,7 @@ var DateInput = function (_React$Component) {
         'div',
         { className: prefixCls + '-date-input-wrap' },
         __WEBPACK_IMPORTED_MODULE_3_react___default.a.createElement('input', {
-          ref: this.saveDateInput,
+          ref: this.dateInputInstance,
           className: prefixCls + '-input',
           value: str,
           disabled: props.disabled,
@@ -7346,10 +7377,11 @@ var DateInput = function (_React$Component) {
           onKeyDown: this.onKeyDown,
           onFocus: this.onFocus,
           onBlur: this.onBlur,
-          inputMode: inputMode
+          inputMode: inputMode,
+          tabIndex: '0'
         })
       ),
-      props.showClear ? __WEBPACK_IMPORTED_MODULE_3_react___default.a.createElement(
+      props.showClear && __WEBPACK_IMPORTED_MODULE_3_react___default.a.createElement(
         'a',
         {
           role: 'button',
@@ -7357,7 +7389,7 @@ var DateInput = function (_React$Component) {
           onClick: this.onClear
         },
         clearIcon || __WEBPACK_IMPORTED_MODULE_3_react___default.a.createElement('span', { className: prefixCls + '-clear-btn' })
-      ) : null
+      )
     );
   };
 
@@ -7382,60 +7414,64 @@ DateInput.propTypes = {
 };
 
 var _initialiseProps = function _initialiseProps() {
-  var _this2 = this;
+  var _this3 = this;
 
   this.onClear = function () {
-    _this2.setState({ str: '' });
-    _this2.props.onClear(null);
+    _this3.setState({ str: '' });
+    _this3.props.onClear(null);
   };
 
   this.onInputChange = function (event) {
     var str = event.target.value;
-    var calendarStr = Object(__WEBPACK_IMPORTED_MODULE_9__util__["g" /* initializeStr */])(str, _this2.state.localFormat) || '';
-    var _props = _this2.props,
+    var calendarStr = Object(__WEBPACK_IMPORTED_MODULE_9__util__["h" /* initializeStr */])(str, _this3.state.localFormat) || '';
+    var _props = _this3.props,
         disabledDate = _props.disabledDate,
         format = _props.format,
         onChange = _props.onChange,
         selectedValue = _props.selectedValue;
 
-    // 没有内容，合法并直接退出
 
-    if (!calendarStr) {
-      onChange(null);
-      _this2.setState({ str: '' });
+    if (!str || !calendarStr) {
+      _this3.setState({ isInputEmpty: true });
+      _this3.onClear();
       return;
     }
+
+    if (_this3.state.isInputEmpty) {
+      _this3.setState({ isInputEmpty: false });
+    }
+
     var parsed = __WEBPACK_IMPORTED_MODULE_8_dayjs___default()(calendarStr, format[0]);
-    var value = _this2.props.value.clone();
+    var value = _this3.props.value.clone();
     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({ str: str });
+      _this3.setState({ str: str });
       return;
     }
 
     if (selectedValue !== value || selectedValue && value && !selectedValue.isSame(value)) {
-      _this2.setState({ str: str });
+      _this3.setState({ str: str });
       onChange(value);
     }
   };
 
   this.onFocus = function () {
-    _this2.setState({ hasFocus: true });
+    _this3.setState({ hasFocus: true });
   };
 
   this.onBlur = function () {
-    _this2.setState(function (prevState, prevProps) {
+    _this3.setState(function (prevState, prevProps) {
       return {
         hasFocus: false,
-        str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["a" /* formatDate */])(prevProps.value, prevProps.format)
+        str: Object(__WEBPACK_IMPORTED_MODULE_9__util__["b" /* formatDate */])(prevProps.value, prevProps.format)
       };
     });
   };
 
   this.onKeyDown = function (event) {
     var keyCode = event.keyCode;
-    var _props2 = _this2.props,
+    var _props2 = _this3.props,
         onSelect = _props2.onSelect,
         value = _props2.value,
         disabledDate = _props2.disabledDate;
@@ -7443,25 +7479,25 @@ var _initialiseProps = function _initialiseProps() {
     if (keyCode === __WEBPACK_IMPORTED_MODULE_6_rc_util_es_KeyCode__["a" /* default */].ENTER && onSelect) {
       var validateDate = !disabledDate || !disabledDate(value);
       if (validateDate) {
-        onSelect(value.clone());
+        if (_this3.state.isInputEmpty) {
+          onSelect(null);
+        } else {
+          onSelect(value.clone());
+        }
       }
       event.preventDefault();
     }
   };
 
   this.getRootDOMNode = function () {
-    return __WEBPACK_IMPORTED_MODULE_4_react_dom___default.a.findDOMNode(_this2);
+    return __WEBPACK_IMPORTED_MODULE_4_react_dom___default.a.findDOMNode(_this3);
   };
 
   this.focus = function () {
-    if (dateInputInstance) {
-      dateInputInstance.focus();
+    if (_this3.dateInputInstance.current) {
+      _this3.dateInputInstance.current.focus();
     }
   };
-
-  this.saveDateInput = function (dateInput) {
-    dateInputInstance = dateInput;
-  };
 };
 
 Object(__WEBPACK_IMPORTED_MODULE_7_react_lifecycles_compat__["a" /* polyfill */])(DateInput);