@ucloud-fe/react-components 1.5.2 → 1.5.3

package/lib/components/TimePicker/TimePicker.js

@@ -52,11 +52,17 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var FooterWithoutMemo = function FooterWithoutMemo(_ref) {
+  var _this2 = this;
+
   (0, _newArrowCheck2.default)(this, _this);
   var onConfirm = _ref.onConfirm,
       disabled = _ref.disabled,
       _locale = _ref.locale;
   var locale = (0, _useLocale.default)(_zh_CN.default, 'DatePicker', _locale);
+  var handleConfirm = (0, _react.useCallback)(function () {
+    (0, _newArrowCheck2.default)(this, _this2);
+    onConfirm();
+  }.bind(this), [onConfirm]);
   return /*#__PURE__*/_react.default.createElement(_Box.default, {
     className: _style.footerCls,
     container: true,
@@ -65,7 +71,7 @@ var FooterWithoutMemo = function FooterWithoutMemo(_ref) {
   }, /*#__PURE__*/_react.default.createElement("span", null), /*#__PURE__*/_react.default.createElement(_Button.default, {
     styleType: "primary",
     size: "sm",
-    onClick: onConfirm,
+    onClick: handleConfirm,
     disabled: disabled
   }, locale.confirm));
 }.bind(void 0);
@@ -97,7 +103,7 @@ var formatToTimeMode = function formatToTimeMode(format) {
 var DefaultFormat = 'HH:mm:ss';
 
 var TimePicker = function TimePicker(_ref2) {
-  var _this2 = this;
+  var _this3 = this;
 
   (0, _newArrowCheck2.default)(this, _this);
 
@@ -138,19 +144,24 @@ var TimePicker = function TimePicker(_ref2) {
       setActive = _useState8[1];
 
   var defaultTime = (0, _react.useMemo)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     return (0, _moment.default)().startOf('date');
   }.bind(this), []);
   var avoidBlur = (0, _react.useCallback)(function (e) {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     return e.preventDefault();
   }.bind(this), []);
   var format = _format || DefaultFormat;
-  var handleConfirm = (0, _react.useCallback)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+  var handleConfirm = (0, _react.useCallback)(function (value) {
+    (0, _newArrowCheck2.default)(this, _this3);
     setActive(false);
     var finalValue = timeValue;
 
+    if (value !== undefined) {
+      onChange(value === null ? null : (0, _moment.default)(+value));
+      return;
+    }
+
     if (useInputValue) {
       var inputTime = inputToTime(inputValue, format);
 
@@ -166,7 +177,7 @@ var TimePicker = function TimePicker(_ref2) {
     onChange(finalValue == null ? null : (0, _moment.default)(+finalValue));
   }.bind(this), [format, inputValue, nullable, onChange, timeValue, useInputValue]);
   var handleInputChange = (0, _react.useCallback)(function (e) {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     var s = e.target.value;
     setInputValue(s);
     var inputTime = inputToTime(s, format);
@@ -174,25 +185,29 @@ var TimePicker = function TimePicker(_ref2) {
     setUseInputValue(true);
   }.bind(this), [format]);
   var handleTimeChange = (0, _react.useCallback)(function (v) {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     setTimeValue(v);
     setInputValue(timeToInput(v, format));
     setUseInputValue(false);
   }.bind(this), [format]);
   var handleInputFocus = (0, _react.useCallback)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     return setActive(true);
   }.bind(this), []);
   var handleInputBlur = (0, _react.useCallback)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     return setActive(false);
   }.bind(this), []);
+  var handleInputClear = (0, _react.useCallback)(function () {
+    (0, _newArrowCheck2.default)(this, _this3);
+    nullable && handleConfirm(null);
+  }.bind(this), [handleConfirm, nullable]);
   var formatTimeValue = (0, _react.useMemo)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     return new Date(+(timeValue == null ? defaultTime : timeValue));
   }.bind(this), [defaultTime, timeValue]);
   var isValid = (0, _react.useMemo)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
 
     if (useInputValue) {
       var inputTime = inputToTime(inputValue, format);
@@ -203,12 +218,12 @@ var TimePicker = function TimePicker(_ref2) {
     return true;
   }.bind(this), [format, inputValue, nullable, useInputValue]);
   var timeMode = (0, _react.useMemo)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
     return formatToTimeMode(format);
   }.bind(this), [format]);
   var popoverConfigProps = (0, _usePopoverConfig.default)();
   (0, _react.useEffect)(function () {
-    (0, _newArrowCheck2.default)(this, _this2);
+    (0, _newArrowCheck2.default)(this, _this3);
 
     if (!active) {
       setTimeValue(value);
@@ -240,9 +255,13 @@ var TimePicker = function TimePicker(_ref2) {
     onBlur: handleInputBlur,
     onFocus: handleInputFocus,
     onClick: handleInputFocus,
+    onClear: handleInputClear,
     size: size,
     disabled: disabled,
-    clearable: nullable,
+    clearable: nullable ? {
+      autoFocus: false,
+      callOnChange: false
+    } : false,
     prefix: /*#__PURE__*/_react.default.createElement(_SvgIcon.default, {
       type: "clock"
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucloud-fe/react-components",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "title": "UCloud react components",
   "description": "UCloud react components",
   "keywords": [