@titaui/pc 1.11.34 → 1.11.35

package/lib/components/time-picker/time-picker.js

@@ -79,49 +79,46 @@ var TimePicker = function TimePicker(props) {
   var mInputRef = (0, _react.useRef)();
   var minuteRef = (0, _react.useRef)((0, _moment["default"])(value || '00:00', timeFormat).format('mm'));
   var triggerRef = (0, _react.useRef)();
-  var timerRef = (0, _react.useRef)();
   var hours = (0, _utils.getHours)(hourStep);
   var minutes = (0, _utils.getMinutes)(minuteStep);
 
   var onTimeChange = function onTimeChange() {
-    onChange === null || onChange === void 0 ? void 0 : onChange("".concat(hourRef.current, ":").concat(minuteRef.current));
-  }; // const onInputClick = (type) => {
-  //   clearTimeout(timerRef.current)
-  //   timerRef.current = setTimeout(() => {
-  //     if (type === 'hour') {
-  //       hInputRef.current?.focus()
-  //     } else {
-  //       mInputRef.current?.focus()
-  //     }
-  //     setTimeSettingType(() => type)
-  //   }, 0)
-  // }
-
+    return onChange === null || onChange === void 0 ? void 0 : onChange("".concat(hourRef.current, ":").concat(minuteRef.current));
+  };
 
-  var showSelectorPop = function showSelectorPop() {
-    return setVisible(true);
+  var onBlurHandler = function onBlurHandler() {
+    return setTimeSettingType('');
   };
 
   var onFocusHandler = function onFocusHandler(type) {
-    setTimeSettingType(function () {
+    return setTimeSettingType(function () {
       return type;
     });
   };
 
-  var onHourInputBlur = function onHourInputBlur() {
-    // setHour((prevHour) => {
-    // const prevHour = hourRef.current;
-    // let nextHour = (Array(2).join("0") + prevHour).slice(-2);
-    // if (Number(prevHour) > Number(hours[hours.length - 1])) {
-    //   nextHour = `0${prevHour.slice(0, 1)}`;
-    // }
-    // hourRef.current = nextHour;
-    // });
-    // if (timeSetType === "hour" && hInputRef.current) {
-    //   hInputRef.current.focus();
-    // }
-    // onTimeChange();
-    setTimeSettingType('');
+  var onKeyDownHandler = function onKeyDownHandler(e) {
+    var keyCode = e.keyCode;
+
+    if ([_utils.KEYCODE.directionLeft, _utils.KEYCODE.directionRight].includes(keyCode)) {
+      setTimeSettingType(_utils.TargetMapByKeyCode[keyCode]);
+    }
+
+    if ([_utils.KEYCODE.directionUp, _utils.KEYCODE.directionDown].includes(keyCode)) {
+      switch (timeSetingtType) {
+        case 'hour':
+          hourRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'hour', hourRef.current);
+          break;
+
+        case 'minute':
+          minuteRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'minute', minuteRef.current);
+          break;
+
+        default:
+          break;
+      }
+
+      onTimeChange();
+    }
   };
 
   var onHourInputChange = function onHourInputChange(e) {
@@ -139,32 +136,6 @@ var TimePicker = function TimePicker(props) {
     }
   };
 
-  var onMinuteInputBlur = function onMinuteInputBlur() {
-    // setMinute((prevMinute) => {
-    // let nextMinute = minuteRef.current;
-    // minutes.forEach((m, i) => {
-    //   const mNum = Number(m);
-    //   const nextMinuteNum = Number(nextMinute);
-    //   if (mNum === nextMinuteNum) {
-    //     nextMinute = m;
-    //   } else if (
-    //     mNum < nextMinuteNum
-    //     && Number(minutes[i + 1]) > nextMinuteNum
-    //   ) {
-    //     nextMinute = m;
-    //   } else if (nextMinuteNum > Number(minutes[minutes.length - 1])) {
-    //     nextMinute = "00";
-    //   }
-    // });
-    // minuteRef.current = nextMinute;
-    // });
-    // if (timeSetType === "minute" && mInputRef.current) {
-    //   mInputRef.current.focus();
-    // }
-    // onTimeChange();
-    setTimeSettingType('');
-  };
-
   var onMinuteInputChange = function onMinuteInputChange(e) {
     var v = e.target.value;
 
@@ -225,39 +196,10 @@ var TimePicker = function TimePicker(props) {
     return currTime;
   };
 
-  var handleKeyDown = function handleKeyDown(e) {
-    var keyCode = e.keyCode;
-
-    if ([_utils.KEYCODE.directionLeft, _utils.KEYCODE.directionRight].includes(keyCode)) {
-      setTimeSettingType(_utils.TargetMapByKeyCode[keyCode]);
-    }
-
-    if ([_utils.KEYCODE.directionUp, _utils.KEYCODE.directionDown].includes(keyCode)) {
-      switch (timeSetingtType) {
-        case 'hour':
-          hourRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'hour', hourRef.current);
-          break;
-
-        case 'minute':
-          minuteRef.current = setTimeOnKeyboardDirectionChange(keyCode, 'minute', minuteRef.current);
-          break;
-
-        default:
-          break;
-      }
-
-      onTimeChange();
-    }
+  var showSelectorPop = function showSelectorPop() {
+    return setVisible(true);
   };
 
-  (0, _react.useEffect)(function () {
-    document.removeEventListener('keydown', handleKeyDown);
-    enableKeyBoard && timeSetingtType && document.addEventListener('keydown', handleKeyDown);
-    return function () {
-      clearTimeout(timerRef.current);
-      document.removeEventListener('keydown', handleKeyDown);
-    };
-  }, [timeSetingtType]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _utils.TimePickerClass
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -268,13 +210,13 @@ var TimePicker = function TimePicker(props) {
     onClick: function onClick() {
       return !enableKeyBoard && showSelectorPop();
     }
-  }, /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], _extends({
     className: (0, _classnames["default"])("".concat(_utils.TimePickerClass, "-input"), {
       active: enableKeyBoard && timeSetingtType === 'hour'
     }),
     disabled: disabled,
     maxLength: 2,
-    onBlur: onHourInputBlur,
+    onBlur: onBlurHandler,
     onChange: onHourInputChange,
     onClick: function onClick() {
       return !enableKeyBoard && showSelectorPop();
@@ -282,15 +224,16 @@ var TimePicker = function TimePicker(props) {
     onFocus: function onFocus() {
       return onFocusHandler('hour');
     },
+    onKeyDown: onKeyDownHandler,
     ref: hInputRef,
     value: hourRef.current
-  }), /*#__PURE__*/_react["default"].createElement("span", null, ":"), /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], {
+  }, restProps)), /*#__PURE__*/_react["default"].createElement("span", null, ":"), /*#__PURE__*/_react["default"].createElement(_timerPickerInput["default"], _extends({
     className: (0, _classnames["default"])("".concat(_utils.TimePickerClass, "-input"), {
       active: enableKeyBoard && timeSetingtType === 'minute'
     }),
     disabled: disabled,
     maxLength: 2,
-    onBlur: onMinuteInputBlur,
+    onBlur: onBlurHandler,
     onChange: onMinuteInputChange,
     onClick: function onClick() {
       return !enableKeyBoard && showSelectorPop();
@@ -298,9 +241,10 @@ var TimePicker = function TimePicker(props) {
     onFocus: function onFocus() {
       return onFocusHandler('minute');
     },
+    onKeyDown: onKeyDownHandler,
     ref: mInputRef,
     value: minuteRef.current
-  })), !disabled && /*#__PURE__*/_react["default"].createElement(_timePickerSelector["default"], _extends({
+  }, restProps))), !disabled && /*#__PURE__*/_react["default"].createElement(_timePickerSelector["default"], _extends({
     popupAlign: {
       offset: [12, 8],
       overflow: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.34",
+  "version": "1.11.35",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",