@hi-ui/time-picker 4.1.0 → 4.1.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @hi-ui/time-picker
 
+## 4.1.2
+
+### Patch Changes
+
+- [#3307](https://github.com/XiaoMi/hiui/pull/3307) [`7211244`](https://github.com/XiaoMi/hiui/commit/7211244c035ec21966c42eb5e58134348d97bd2f) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(date-picker&time-picker): 修复在日期时间范围选择模式下，disabledHours 回调参数总数返回 single 的问题 (#3289)
+
+- [#3306](https://github.com/XiaoMi/hiui/pull/3306) [`0eaaf1375`](https://github.com/XiaoMi/hiui/commit/0eaaf137524a58744c280c6b462ef9ea43fccd0a) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(time-picker): 优化默认值处理逻辑，确保在没有传值时使用默认值 (#3302)
+
+## 4.1.1
+
+### Patch Changes
+
+- [#3107](https://github.com/XiaoMi/hiui/pull/3107) [`e9bcdb9`](https://github.com/XiaoMi/hiui/commit/e9bcdb9fbfdb8085a57b76a30bc9d8fd3ca8b923) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(time-picker): 修复点击叉号关闭弹窗时没有触发 onChange 事件问题 (#3106)
+
 ## 4.1.0
 
 ### Minor Changes

package/lib/cjs/PopContent.js

@@ -37,6 +37,7 @@ var PopContent = function PopContent(props) {
     _onChange = props.onChange,
     format = props.format,
     type = props.type,
+    panelType = props.panelType,
     hourStep = props.hourStep,
     minuteStep = props.minuteStep,
     secondStep = props.secondStep,
@@ -170,17 +171,14 @@ var PopContent = function PopContent(props) {
       prefix: prefix,
       format: format,
       value: value[index],
-      panel: type === 'single' ? 'single' : index === 0 ? 'range-start' : 'range-end',
+      panel: panelType !== null && panelType !== void 0 ? panelType : type === 'single' ? 'single' : index === 0 ? 'range-start' : 'range-end',
       onChange: function onChange(e) {
         var result = [].concat(value);
         result[index] = e;
         _onChange(result);
       }
     }));
-  }, [hourStep, minuteStep, secondStep, customDisabledHours, customDisabledMinute, customDisabledSeconds, format, prefix, type, value, _onChange,
-  // fullDisplayItemNumber,
-  // itemHeight,
-  componentClass]);
+  }, [componentClass, hourStep, secondStep, minuteStep, customDisabledHours, customDisabledMinute, customDisabledSeconds, prefix, format, value, panelType, type, _onChange]);
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: componentClass,
     style: style

package/lib/cjs/TimePicker.js

@@ -73,8 +73,7 @@ var TimePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     type = _ref$type === void 0 ? 'single' : _ref$type,
     _ref$appearance = _ref.appearance,
     appearance = _ref$appearance === void 0 ? 'line' : _ref$appearance,
-    _ref$defaultValue = _ref.defaultValue,
-    uncontrolledValue = _ref$defaultValue === void 0 ? DefaultValue : _ref$defaultValue,
+    uncontrolledValue = _ref.defaultValue,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     _ref$disabledHours = _ref.disabledHours,
@@ -101,7 +100,7 @@ var TimePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     attachEl = _useState[0],
     setAttachEl = _useState[1];
   var formatUncontrolledValue = React.useMemo(function () {
-    return getValueMatchString(uncontrolledValue, format);
+    return getValueMatchString(uncontrolledValue || DefaultValue, format);
   }, [format, uncontrolledValue]);
   var formatControlledValue = React.useMemo(function () {
     return getValueMatchString(controlledValue, format);
@@ -208,6 +207,16 @@ var TimePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         if (validChecker(cacheValue)) {
           if (cacheValue.join('') !== value.join('')) {
             onChange([].concat(cacheValue));
+          } else if ((controlledValue === undefined || controlledValue === null) && (uncontrolledValue === undefined || uncontrolledValue === null)) {
+            var defaultValue;
+            if (['HH', 'mm', 'ss'].includes(format)) {
+              defaultValue = ['00'];
+            } else if (['HH:mm', 'mm:ss'].includes(format)) {
+              defaultValue = ['00:00'];
+            } else {
+              defaultValue = ['00:00:00'];
+            }
+            onChange(type === 'single' ? defaultValue : [defaultValue[0], defaultValue[0]]);
           }
         }
         showPopperRef.current = false;
@@ -224,7 +233,7 @@ var TimePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         setShowPopper(false);
       }
     }, nowText)));
-  }, [prefixCls, isInputValid, confirmText, type, isInSingleValueFormat, nowText, validChecker, cacheValue, value, onChange, onCacheChange, format]);
+  }, [prefixCls, isInputValid, confirmText, type, isInSingleValueFormat, nowText, validChecker, cacheValue, value, controlledValue, uncontrolledValue, onChange, onCacheChange, format]);
   return /*#__PURE__*/React__default["default"].createElement("div", {
     ref: ref,
     role: role,
@@ -268,6 +277,7 @@ var TimePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     className: prefixCls + "__close-button",
     onClick: function onClick() {
       onCacheChange(type === 'single' ? [''] : ['', '']);
+      onChange(['', '']);
     }
   })) : ( /*#__PURE__*/React__default["default"].createElement(icons.TimeOutlined, null)))), /*#__PURE__*/React__default["default"].createElement(popper.Popper, Object.assign({}, overlay || {}, {
     unmountOnClose: false,

package/lib/esm/PopContent.js

@@ -25,6 +25,7 @@ var PopContent = function PopContent(props) {
     _onChange = props.onChange,
     format = props.format,
     type = props.type,
+    panelType = props.panelType,
     hourStep = props.hourStep,
     minuteStep = props.minuteStep,
     secondStep = props.secondStep,
@@ -158,17 +159,14 @@ var PopContent = function PopContent(props) {
       prefix: prefix,
       format: format,
       value: value[index],
-      panel: type === 'single' ? 'single' : index === 0 ? 'range-start' : 'range-end',
+      panel: panelType !== null && panelType !== void 0 ? panelType : type === 'single' ? 'single' : index === 0 ? 'range-start' : 'range-end',
       onChange: function onChange(e) {
         var result = [].concat(value);
         result[index] = e;
         _onChange(result);
       }
     }));
-  }, [hourStep, minuteStep, secondStep, customDisabledHours, customDisabledMinute, customDisabledSeconds, format, prefix, type, value, _onChange,
-  // fullDisplayItemNumber,
-  // itemHeight,
-  componentClass]);
+  }, [componentClass, hourStep, secondStep, minuteStep, customDisabledHours, customDisabledMinute, customDisabledSeconds, prefix, format, value, panelType, type, _onChange]);
   return /*#__PURE__*/React.createElement("div", {
     className: componentClass,
     style: style

package/lib/esm/TimePicker.js

@@ -60,8 +60,7 @@ var TimePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
     type = _ref$type === void 0 ? 'single' : _ref$type,
     _ref$appearance = _ref.appearance,
     appearance = _ref$appearance === void 0 ? 'line' : _ref$appearance,
-    _ref$defaultValue = _ref.defaultValue,
-    uncontrolledValue = _ref$defaultValue === void 0 ? DefaultValue : _ref$defaultValue,
+    uncontrolledValue = _ref.defaultValue,
     _ref$disabled = _ref.disabled,
     disabled = _ref$disabled === void 0 ? false : _ref$disabled,
     _ref$disabledHours = _ref.disabledHours,
@@ -88,7 +87,7 @@ var TimePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
     attachEl = _useState[0],
     setAttachEl = _useState[1];
   var formatUncontrolledValue = useMemo(function () {
-    return getValueMatchString(uncontrolledValue, format);
+    return getValueMatchString(uncontrolledValue || DefaultValue, format);
   }, [format, uncontrolledValue]);
   var formatControlledValue = useMemo(function () {
     return getValueMatchString(controlledValue, format);
@@ -195,6 +194,16 @@ var TimePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
         if (validChecker(cacheValue)) {
           if (cacheValue.join('') !== value.join('')) {
             onChange([].concat(cacheValue));
+          } else if ((controlledValue === undefined || controlledValue === null) && (uncontrolledValue === undefined || uncontrolledValue === null)) {
+            var defaultValue;
+            if (['HH', 'mm', 'ss'].includes(format)) {
+              defaultValue = ['00'];
+            } else if (['HH:mm', 'mm:ss'].includes(format)) {
+              defaultValue = ['00:00'];
+            } else {
+              defaultValue = ['00:00:00'];
+            }
+            onChange(type === 'single' ? defaultValue : [defaultValue[0], defaultValue[0]]);
           }
         }
         showPopperRef.current = false;
@@ -211,7 +220,7 @@ var TimePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
         setShowPopper(false);
       }
     }, nowText)));
-  }, [prefixCls, isInputValid, confirmText, type, isInSingleValueFormat, nowText, validChecker, cacheValue, value, onChange, onCacheChange, format]);
+  }, [prefixCls, isInputValid, confirmText, type, isInSingleValueFormat, nowText, validChecker, cacheValue, value, controlledValue, uncontrolledValue, onChange, onCacheChange, format]);
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     role: role,
@@ -255,6 +264,7 @@ var TimePicker = /*#__PURE__*/forwardRef(function (_ref, ref) {
     className: prefixCls + "__close-button",
     onClick: function onClick() {
       onCacheChange(type === 'single' ? [''] : ['', '']);
+      onChange(['', '']);
     }
   })) : ( /*#__PURE__*/React.createElement(TimeOutlined, null)))), /*#__PURE__*/React.createElement(Popper, Object.assign({}, overlay || {}, {
     unmountOnClose: false,

package/lib/types/PopContent.d.ts

@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-import { TimePickerFilterProps, TimePickerFormat, TimePickerStep, TimePickerType } from './@types';
+import { TimePickerFilterProps, TimePickerFormat, TimePickerPanelType, TimePickerStep, TimePickerType } from './@types';
 declare type ExtendType = Partial<TimePickerFilterProps> & Required<TimePickerStep>;
 interface PopContentProps extends ExtendType {
     prefix?: string;
@@ -7,6 +7,7 @@ interface PopContentProps extends ExtendType {
     onChange: (value: string[]) => void;
     format: TimePickerFormat;
     type: TimePickerType;
+    panelType?: TimePickerPanelType;
     style?: React.CSSProperties;
 }
 export declare const PopContent: FC<PopContentProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/time-picker",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",