@douyinfe/semi-ui 2.48.0 → 2.49.0

package/lib/cjs/image/previewInner.js

@@ -21,14 +21,6 @@ var _previewContext = require("./previewContext");
 var _utils = require("../_utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const prefixCls = _constants.cssClasses.PREFIX;
-let startMouseDown = {
-  x: 0,
-  y: 0
-};
-let mouseActiveTime = null;
-let stopTiming = false;
-let timer = null;
-// let bodyOverflowValue = document.body.style.overflow;
 class PreviewInner extends _baseComponent.default {
   get adapter() {
     return Object.assign(Object.assign({}, super.adapter), {
@@ -112,30 +104,22 @@ class PreviewInner extends _baseComponent.default {
       unregisterKeyDownListener: () => {
         window && window.removeEventListener("keydown", this.handleKeyDown);
       },
-      getMouseActiveTime: () => {
-        return mouseActiveTime;
-      },
-      getStopTiming: () => {
-        return stopTiming;
-      },
-      setStopTiming: value => {
-        stopTiming = value;
-      },
-      getStartMouseDown: () => {
-        return startMouseDown;
-      },
-      setStartMouseDown: (x, y) => {
-        startMouseDown = {
-          x,
-          y
-        };
-      },
-      setMouseActiveTime: time => {
-        mouseActiveTime = time;
-      },
       getSetDownloadFunc: () => {
         var _a, _b;
         return (_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.setDownloadName) !== null && _b !== void 0 ? _b : this.props.setDownloadName;
+      },
+      isValidTarget: e => {
+        const headerDom = this.headerRef && this.headerRef.current;
+        const footerDom = this.footerRef && this.footerRef.current;
+        const leftIconDom = this.leftIconRef && this.leftIconRef.current;
+        const rightIconDom = this.rightIconRef && this.rightIconRef.current;
+        const target = e.target;
+        if (headerDom && headerDom.contains(target) || footerDom && footerDom.contains(target) || leftIconDom && leftIconDom.contains(target) || rightIconDom && rightIconDom.contains(target)) {
+          // Move in the operation area, return false
+          return false;
+        }
+        // Move in the preview area except the operation area, return true
+        return true;
       }
     });
   }
@@ -168,9 +152,6 @@ class PreviewInner extends _baseComponent.default {
     this.handleMouseMove = e => {
       this.foundation.handleMouseMove(e);
     };
-    this.handleMouseEvent = (e, event) => {
-      this.foundation.handleMouseMoveEvent(e, event);
-    };
     this.handleKeyDown = e => {
       this.foundation.handleKeyDown(e);
     };
@@ -183,6 +164,31 @@ class PreviewInner extends _baseComponent.default {
     this.handleMouseDown = e => {
       this.foundation.handleMouseDown(e);
     };
+    this.handleWheel = e => {
+      this.foundation.handleWheel(e);
+    };
+    // 为什么通过 addEventListener 注册 wheel 事件而不是使用 onWheel 事件？
+    // 因为 Passive Event Listeners（https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#improving_scrolling_performance_with_passive_listeners）
+    // Passive Event Listeners 是一种优化技术，用于提高滚动性能。在默认情况下，浏览器会假设事件的监听器不会调用 
+    // preventDefault() 方法来阻止事件的默认行为，从而允许进行一些优化操作，例如滚动平滑。
+    // 对于 Image 而言，如果使用触控板，双指朝不同方向分开放大图片，则需要  preventDefault 防止页面整体放大。
+    // Why register wheel event through addEventListener instead of using onWheel event？
+    // Because of Passive Event Listeners(an optimization technique used to improve scrolling performance. By default, 
+    // the browser will assume that event listeners will not call preventDefault() method to prevent the default behavior of the event, 
+    // allowing some optimization operations such as scroll smoothing.)
+    // For Image, if we use the trackpad and spread your fingers in different directions to enlarge the image, we need to preventDefault
+    // to prevent the page from being enlarged as a whole.
+    this.registryImageWrapRef = ref => {
+      if (this.imageWrapRef) {
+        this.imageWrapRef.removeEventListener("wheel", this.handleWheel);
+      }
+      if (ref) {
+        ref.addEventListener("wheel", this.handleWheel, {
+          passive: false
+        });
+      }
+      this.imageWrapRef = ref;
+    };
     this.state = {
       imgSrc: [],
       imgLoadStatus: new Map(),
@@ -199,6 +205,11 @@ class PreviewInner extends _baseComponent.default {
     this.bodyOverflow = '';
     this.originBodyWidth = '100%';
     this.scrollBarWidth = 0;
+    this.imageWrapRef = null;
+    this.headerRef = /*#__PURE__*/_react.default.createRef();
+    this.footerRef = /*#__PURE__*/_react.default.createRef();
+    this.leftIconRef = /*#__PURE__*/_react.default.createRef();
+    this.rightIconRef = /*#__PURE__*/_react.default.createRef();
   }
   static getDerivedStateFromProps(props, state) {
     const willUpdateStates = {};
@@ -214,6 +225,9 @@ class PreviewInner extends _baseComponent.default {
       willUpdateStates.visible = props.visible;
       if (props.visible) {
         willUpdateStates.preloadAfterVisibleChange = true;
+        willUpdateStates.viewerVisible = true;
+        willUpdateStates.rotation = 0;
+        willUpdateStates.ratio = 'adaptation';
       }
     }
     if ("currentIndex" in props && props.currentIndex !== state.currentIndex) {
@@ -232,10 +246,8 @@ class PreviewInner extends _baseComponent.default {
     }
   }
   componentDidUpdate(prevProps, prevState) {
-    if (prevState.visible !== this.props.visible && this.props.visible) {
-      mouseActiveTime = new Date().getTime();
-      timer && clearInterval(timer);
-      timer = setInterval(this.viewVisibleChange, 1000);
+    if (prevProps.src !== this.props.src) {
+      this.foundation.updateTimer();
     }
     // hide => show
     if (!prevProps.visible && this.props.visible) {
@@ -247,7 +259,7 @@ class PreviewInner extends _baseComponent.default {
     }
   }
   componentWillUnmount() {
-    timer && clearInterval(timer);
+    this.foundation.clearTimer();
   }
   isInGroup() {
     return Boolean(this.context && this.context.isGroup);
@@ -312,10 +324,10 @@ class PreviewInner extends _baseComponent.default {
       style: style,
       onMouseDown: this.handleMouseDown,
       onMouseUp: this.handleMouseUp,
-      onMouseMove: this.handleMouseMove,
-      onMouseOver: e => this.handleMouseEvent(e.nativeEvent, "over"),
-      onMouseOut: e => this.handleMouseEvent(e.nativeEvent, "out")
+      ref: this.registryImageWrapRef,
+      onMouseMove: this.handleMouseMove
     }, /*#__PURE__*/_react.default.createElement(_previewHeader.default, {
+      ref: this.headerRef,
       className: (0, _classnames.default)(hideViewerCls),
       onClose: this.handlePreviewClose,
       renderHeader: renderHeader
@@ -326,7 +338,6 @@ class PreviewInner extends _baseComponent.default {
       setRatio: this.handleAdjustRatio,
       zoom: zoom,
       ratio: ratio,
-      zoomStep: zoomStep,
       rotation: rotation,
       crossOrigin: crossOrigin,
       onError: this.onImageError,
@@ -335,6 +346,7 @@ class PreviewInner extends _baseComponent.default {
     /*#__PURE__*/
     // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
     _react.default.createElement("div", {
+      ref: this.leftIconRef,
       className: (0, _classnames.default)(`${previewPrefixCls}-icon`, `${previewPrefixCls}-prev`, hideViewerCls),
       onClick: () => this.handleSwitchImage("prev")
     }, /*#__PURE__*/_react.default.createElement(_semiIcons.IconArrowLeft, {
@@ -343,11 +355,13 @@ class PreviewInner extends _baseComponent.default {
     /*#__PURE__*/
     // eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions
     _react.default.createElement("div", {
+      ref: this.rightIconRef,
       className: (0, _classnames.default)(`${previewPrefixCls}-icon`, `${previewPrefixCls}-next`, hideViewerCls),
       onClick: () => this.handleSwitchImage("next")
     }, /*#__PURE__*/_react.default.createElement(_semiIcons.IconArrowRight, {
       size: "large"
     })), /*#__PURE__*/_react.default.createElement(_previewFooter.default, {
+      forwardRef: this.footerRef,
       className: hideViewerCls,
       totalNum: total,
       curPage: currentIndex + 1,
@@ -406,6 +420,8 @@ PreviewInner.propTypes = {
   disableDownload: _propTypes.default.bool,
   viewerVisibleDelay: _propTypes.default.number,
   zIndex: _propTypes.default.number,
+  maxZoom: _propTypes.default.number,
+  minZoom: _propTypes.default.number,
   renderHeader: _propTypes.default.func,
   renderPreviewMenu: _propTypes.default.func,
   getPopupContainer: _propTypes.default.func,
@@ -430,5 +446,7 @@ PreviewInner.defaultProps = {
   preLoadGap: 2,
   zIndex: 1000,
   maskClosable: true,
-  viewerVisibleDelay: 10000
+  viewerVisibleDelay: 10000,
+  maxZoom: 5,
+  minZoom: 0.1
 };

package/lib/cjs/modal/Modal.d.ts

@@ -59,7 +59,7 @@ declare class Modal extends BaseComponent<ModalReactProps, ModalState> {
         getPopupContainer: PropTypes.Requireable<(...args: any[]) => any>;
         getContainerContext: PropTypes.Requireable<(...args: any[]) => any>;
         maskFixed: PropTypes.Requireable<boolean>;
-        closeIcon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        closeIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         closeOnEsc: PropTypes.Requireable<boolean>;
         size: PropTypes.Requireable<string>;
         keepDOM: PropTypes.Requireable<boolean>;

package/lib/cjs/modal/Modal.js

@@ -303,7 +303,7 @@ Modal.propTypes = {
   getPopupContainer: _propTypes.default.func,
   getContainerContext: _propTypes.default.func,
   maskFixed: _propTypes.default.bool,
-  closeIcon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  closeIcon: _propTypes.default.node,
   closeOnEsc: _propTypes.default.bool,
   size: _propTypes.default.oneOf(_constants.strings.SIZE),
   keepDOM: _propTypes.default.bool,

package/lib/cjs/navigation/SubNav.d.ts

@@ -53,7 +53,7 @@ export default class SubNav extends BaseComponent<SubNavProps, SubNavState> {
         /**
          * Icon name on the left
          */
-        icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        icon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         /**
          * Maximum height (for animation)
          */

package/lib/cjs/navigation/SubNav.js

@@ -354,7 +354,7 @@ SubNav.propTypes = {
   /**
    * Icon name on the left
    */
-  icon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  icon: _propTypes.default.node,
   /**
    * Maximum height (for animation)
    */

package/lib/cjs/popconfirm/index.d.ts

@@ -46,7 +46,7 @@ export default class Popconfirm extends BaseComponent<PopconfirmProps, Popconfir
         prefixCls: PropTypes.Requireable<string>;
         className: PropTypes.Requireable<string>;
         style: PropTypes.Requireable<object>;
-        icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        icon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         okText: PropTypes.Requireable<string>;
         okType: PropTypes.Requireable<string>;
         cancelText: PropTypes.Requireable<string>;

package/lib/cjs/popconfirm/index.js

@@ -241,7 +241,7 @@ Popconfirm.propTypes = {
   prefixCls: _propTypes.default.string,
   className: _propTypes.default.string,
   style: _propTypes.default.object,
-  icon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  icon: _propTypes.default.node,
   okText: _propTypes.default.string,
   okType: _propTypes.default.string,
   cancelText: _propTypes.default.string,

package/lib/cjs/sideSheet/SideSheetContent.d.ts

@@ -1,8 +1,9 @@
-import React, { CSSProperties } from 'react';
+import React, { CSSProperties, ReactNode } from 'react';
 import PropTypes from 'prop-types';
 import { SideSheetProps } from '@douyinfe/semi-foundation/lib/cjs/sideSheet/sideSheetFoundation';
 export interface SideSheetContentProps {
     onClose?: (e: React.MouseEvent) => void;
+    closeIcon?: ReactNode;
     mask?: boolean;
     maskStyle?: CSSProperties;
     maskClosable?: boolean;
@@ -30,6 +31,7 @@ export interface SideSheetContentProps {
 export default class SideSheetContent extends React.PureComponent<SideSheetContentProps> {
     static propTypes: {
         onClose: PropTypes.Requireable<(...args: any[]) => any>;
+        closeIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
     };
     static defaultProps: {
         onClose: (...args: any[]) => void;

package/lib/cjs/sideSheet/SideSheetContent.js

@@ -66,7 +66,8 @@ class SideSheetContent extends _react.default.PureComponent {
     const {
       title,
       closable,
-      headerStyle
+      headerStyle,
+      closeIcon
     } = this.props;
     let header, closer;
     if (title) {
@@ -76,12 +77,13 @@ class SideSheetContent extends _react.default.PureComponent {
       }, this.props.title);
     }
     if (closable) {
+      const iconType = closeIcon || /*#__PURE__*/_react.default.createElement(_semiIcons.IconClose, null);
       closer = /*#__PURE__*/_react.default.createElement(_iconButton.default, {
         className: `${prefixCls}-close`,
         key: "close-btn",
         onClick: this.close,
         type: "tertiary",
-        icon: /*#__PURE__*/_react.default.createElement(_semiIcons.IconClose, null),
+        icon: iconType,
         theme: "borderless",
         size: "small"
       });
@@ -168,7 +170,8 @@ class SideSheetContent extends _react.default.PureComponent {
 }
 exports.default = SideSheetContent;
 SideSheetContent.propTypes = {
-  onClose: _propTypes.default.func
+  onClose: _propTypes.default.func,
+  closeIcon: _propTypes.default.node
 };
 SideSheetContent.defaultProps = {
   onClose: _noop2.default

package/lib/cjs/table/Body/BaseRow.d.ts

@@ -43,6 +43,8 @@ export interface BaseRowProps {
     style?: React.CSSProperties;
     virtualized?: Virtualized;
     visible: boolean;
+    /** whether display none */
+    displayNone?: boolean;
 }
 export default class TableRow extends BaseComponent<BaseRowProps, Record<string, any>> {
     static propTypes: {
@@ -55,6 +57,7 @@ export default class TableRow extends BaseComponent<BaseRowProps, Record<string,
         expandIcon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike | ((...args: any[]) => any)>>;
         expandableRow: PropTypes.Requireable<boolean>;
         expanded: PropTypes.Requireable<boolean>;
+        displayNone: PropTypes.Requireable<boolean>;
         expandedRow: PropTypes.Requireable<boolean>;
         fixed: PropTypes.Requireable<NonNullable<string | boolean>>;
         height: PropTypes.Requireable<NonNullable<string | number>>;

package/lib/cjs/table/Body/BaseRow.js

@@ -221,6 +221,7 @@ class TableRow extends _baseComponent.default {
       record,
       hovered,
       expanded,
+      displayNone,
       expandableRow,
       level,
       expandedRow,
@@ -238,7 +239,8 @@ class TableRow extends _baseComponent.default {
     const rowCls = typeof replaceClassName === 'string' && replaceClassName.length ? replaceClassName : (0, _classnames.default)(className, `${prefixCls}-row`, {
       [`${prefixCls}-row-selected`]: selected,
       [`${prefixCls}-row-expanded`]: expanded,
-      [`${prefixCls}-row-hovered`]: hovered
+      [`${prefixCls}-row-hovered`]: hovered,
+      [`${prefixCls}-row-hidden`]: displayNone
     }, customClassName);
     const ariaProps = {};
     if (typeof index === 'number') {
@@ -280,6 +282,7 @@ TableRow.propTypes = {
   expandIcon: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.func, _propTypes.default.node]),
   expandableRow: _propTypes.default.bool,
   expanded: _propTypes.default.bool,
+  displayNone: _propTypes.default.bool,
   expandedRow: _propTypes.default.bool,
   fixed: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.bool]),
   height: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),

package/lib/cjs/table/Body/ExpandedRow.d.ts

@@ -23,6 +23,7 @@ export interface TableExpandedRowProps {
     store?: Store;
     style?: React.CSSProperties;
     virtualized?: Virtualized;
+    displayNone?: boolean;
 }
 /**
  * Render expanded row

package/lib/cjs/table/Body/ExpandedRow.js

@@ -45,7 +45,8 @@ class TableExpandedRow extends _react.PureComponent {
       style,
       virtualized,
       indentSize,
-      cellWidths
+      cellWidths,
+      displayNone
     } = this.props;
     const {
       tableWidth,
@@ -104,7 +105,8 @@ class TableExpandedRow extends _react.PureComponent {
       store: store,
       virtualized: virtualized,
       indentSize: indentSize,
-      cellWidths: baseRowCellWidths
+      cellWidths: baseRowCellWidths,
+      displayNone: displayNone
     });
   }
 }

package/lib/cjs/table/Body/index.d.ts

@@ -32,6 +32,7 @@ export interface BodyProps extends BaseProps {
     renderExpandIcon: (record: Record<string, any>, isNested: boolean) => ReactNode | null;
     headerRef?: React.MutableRefObject<HTMLDivElement> | ((instance: any) => void);
     onScroll?: VirtualizedOnScroll;
+    keepDOM?: boolean;
 }
 export interface BodyState {
     virtualizedData?: Array<FlattenData | GroupFlattenData>;
@@ -61,6 +62,8 @@ export interface RenderExpandedRowProps {
     rowKey?: RowKey<Record<string, any>>;
     virtualized?: Virtualized;
     level?: number;
+    keepDOM?: boolean;
+    displayNone?: boolean;
 }
 export interface RenderSectionRowProps {
     dataSource?: Record<string, any>[];

package/lib/cjs/table/Body/index.js

@@ -308,7 +308,8 @@ class Body extends _baseComponent.default {
         expanded,
         index,
         rowKey,
-        virtualized
+        virtualized,
+        displayNone
       } = props;
       let key = (0, _utils.getRecordKey)(record, rowKey);
       if (key == null) {
@@ -334,7 +335,8 @@ class Body extends _baseComponent.default {
         index: index,
         virtualized: virtualized,
         key: (0, _utils.genExpandedRowKey)(key),
-        cellWidths: _this.cellWidths
+        cellWidths: _this.cellWidths,
+        displayNone: displayNone
       });
     };
     /**
@@ -346,7 +348,8 @@ class Body extends _baseComponent.default {
         groups,
         dataSource: data,
         rowKey,
-        expandedRowKeys
+        expandedRowKeys,
+        keepDOM
       } = this.props;
       const {
         flattenedColumns
@@ -381,7 +384,7 @@ class Body extends _baseComponent.default {
           expanded
         })));
         // Render the grouped content when the group is expanded
-        if (expanded) {
+        if (expanded || keepDOM) {
           const dataInGroup = [];
           group.forEach(recordKey => {
             const record = (0, _utils.getRecord)(data, recordKey, rowKey);
@@ -392,7 +395,7 @@ class Body extends _baseComponent.default {
           /**
            * Render the contents of the group row
            */
-          renderedRows.push(this.renderBodyRows(dataInGroup));
+          renderedRows.push(this.renderBodyRows(dataInGroup, undefined, [], !expanded));
         }
       });
       return renderedRows;
@@ -636,12 +639,14 @@ class Body extends _baseComponent.default {
     let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     let level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
     let renderedRows = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    let displayNone = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     const {
       rowKey,
       expandedRowRender,
       expandedRowKeys,
       childrenRecordName,
-      rowExpandable
+      rowExpandable,
+      keepDOM
     } = this.props;
     const hasExpandedRowRender = typeof expandedRowRender === 'function';
     const expandBtnShouldInRow = this.state.cachedExpandBtnShouldInRow;
@@ -658,6 +663,7 @@ class Body extends _baseComponent.default {
       renderedRows.push(this.renderBaseRow(Object.assign(Object.assign({}, this.props), {
         columns: flattenedColumns,
         expandBtnShouldInRow,
+        displayNone,
         record,
         key,
         level,
@@ -665,13 +671,15 @@ class Body extends _baseComponent.default {
       })));
       // render expand row
       const expanded = (0, _utils.isExpanded)(expandedRowKeys, key);
-      if (hasExpandedRowRender && rowExpandable && rowExpandable(record) && expanded) {
+      const shouldRenderExpandedRows = expanded || keepDOM;
+      if (hasExpandedRowRender && rowExpandable && rowExpandable(record) && shouldRenderExpandedRows) {
         const currentExpandRow = this.renderExpandedRow(Object.assign(Object.assign({}, this.props), {
           columns: flattenedColumns,
           level,
           index,
           record,
-          expanded
+          expanded,
+          displayNone: displayNone || !expanded
         }));
         /**
           * If expandedRowRender returns falsy, this expanded row will not be rendered
@@ -682,8 +690,8 @@ class Body extends _baseComponent.default {
         }
       }
       // render tree data
-      if (recordHasChildren && expanded) {
-        const nestedRows = this.renderBodyRows(recordChildren, level + 1);
+      if (recordHasChildren && shouldRenderExpandedRows) {
+        const nestedRows = this.renderBodyRows(recordChildren, level + 1, [], displayNone || !expanded);
         renderedRows.push(...nestedRows);
       }
     });

package/lib/cjs/table/interface.d.ts

@@ -34,6 +34,7 @@ export interface TableProps<RecordType extends Record<string, any> = any> extend
     hideExpandedColumn?: boolean;
     id?: string;
     indentSize?: number;
+    keepDOM?: boolean;
     loading?: boolean;
     pagination?: TablePagination;
     prefixCls?: string;

package/lib/cjs/timePicker/TimePicker.d.ts

@@ -63,6 +63,7 @@ export type TimePickerProps = {
     secondStep?: number;
     showClear?: boolean;
     size?: InputSize;
+    stopPropagation: boolean;
     style?: React.CSSProperties;
     timeZone?: string | number;
     triggerRender?: (props?: any) => React.ReactNode;
@@ -133,6 +134,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
         focusOnOpen: PropTypes.Requireable<boolean>;
         autoFocus: PropTypes.Requireable<boolean>;
         size: PropTypes.Requireable<"default" | "small" | "large">;
+        stopPropagation: PropTypes.Requireable<boolean>;
         panels: PropTypes.Requireable<PropTypes.InferProps<{
             panelHeader: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
             panelFooter: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
@@ -166,6 +168,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
         prefixCls: string;
         inputReadOnly: boolean;
         style: {};
+        stopPropagation: boolean;
         className: string;
         popupClassName: string;
         popupStyle: {

package/lib/cjs/timePicker/TimePicker.js

@@ -269,9 +269,10 @@ class TimePicker extends _baseComponent.default {
         scrollItemProps,
         triggerRender,
         motion,
-        autoAdjustOverflow
+        autoAdjustOverflow,
+        stopPropagation
       } = _a,
-      rest = __rest(_a, ["prefixCls", "placeholder", "disabled", "defaultValue", "dropdownMargin", "className", "popupStyle", "size", "style", "locale", "localeCode", "zIndex", "getPopupContainer", "insetLabel", "insetLabelId", "inputStyle", "showClear", "panelHeader", "panelFooter", "rangeSeparator", "onOpenChange", "onChangeWithDateFirst", "popupClassName", "hideDisabledOptions", "use12Hours", "minuteStep", "hourStep", "secondStep", "scrollItemProps", "triggerRender", "motion", "autoAdjustOverflow"]);
+      rest = __rest(_a, ["prefixCls", "placeholder", "disabled", "defaultValue", "dropdownMargin", "className", "popupStyle", "size", "style", "locale", "localeCode", "zIndex", "getPopupContainer", "insetLabel", "insetLabelId", "inputStyle", "showClear", "panelHeader", "panelFooter", "rangeSeparator", "onOpenChange", "onChangeWithDateFirst", "popupClassName", "hideDisabledOptions", "use12Hours", "minuteStep", "hourStep", "secondStep", "scrollItemProps", "triggerRender", "motion", "autoAdjustOverflow", "stopPropagation"]);
     const format = this.foundation.getDefaultFormatIfNeed();
     const position = this.foundation.getPosition();
     const useCustomTrigger = typeof triggerRender === 'function';
@@ -329,7 +330,8 @@ class TimePicker extends _baseComponent.default {
       visible: disabled ? false : Boolean(open),
       motion: motion,
       margin: dropdownMargin,
-      autoAdjustOverflow: autoAdjustOverflow
+      autoAdjustOverflow: autoAdjustOverflow,
+      stopPropagation: stopPropagation
     }, useCustomTrigger ? /*#__PURE__*/_react.default.createElement(_trigger.default, {
       triggerRender: triggerRender,
       disabled: disabled,
@@ -385,6 +387,7 @@ TimePicker.propTypes = Object.assign(Object.assign({
   focusOnOpen: _propTypes.default.bool,
   autoFocus: _propTypes.default.bool,
   size: _propTypes.default.oneOf(_constants.strings.SIZE),
+  stopPropagation: _propTypes.default.bool,
   panels: _propTypes.default.arrayOf(_propTypes.default.shape(_PanelShape.PanelShape)),
   onFocus: _propTypes.default.func,
   onBlur: _propTypes.default.func,
@@ -418,6 +421,7 @@ TimePicker.defaultProps = Object.assign({
   prefixCls: _constants.cssClasses.PREFIX,
   inputReadOnly: false,
   style: {},
+  stopPropagation: true,
   className: '',
   popupClassName: '',
   popupStyle: {

package/lib/cjs/timePicker/index.d.ts

@@ -50,6 +50,7 @@ export default class LocaleTimePicker extends React.PureComponent<LocalePickerPr
         focusOnOpen: import("prop-types").Requireable<boolean>;
         autoFocus: import("prop-types").Requireable<boolean>;
         size: import("prop-types").Requireable<"default" | "small" | "large">;
+        stopPropagation: import("prop-types").Requireable<boolean>;
         panels: import("prop-types").Requireable<import("prop-types").InferProps<{
             panelHeader: import("prop-types").Requireable<NonNullable<import("prop-types").ReactNodeLike>>;
             panelFooter: import("prop-types").Requireable<NonNullable<import("prop-types").ReactNodeLike>>;
@@ -83,6 +84,7 @@ export default class LocaleTimePicker extends React.PureComponent<LocalePickerPr
         prefixCls: string;
         inputReadOnly: boolean;
         style: {};
+        stopPropagation: boolean;
         className: string;
         popupClassName: string;
         popupStyle: {

package/lib/cjs/toast/toast.d.ts

@@ -32,7 +32,7 @@ declare class Toast extends BaseComponent<ToastReactProps, ToastState> {
         showClose: PropTypes.Requireable<boolean>;
         stack: PropTypes.Requireable<boolean>;
         stackExpanded: PropTypes.Requireable<boolean>;
-        icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        icon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         direction: PropTypes.Requireable<string>;
     };
     static defaultProps: {

package/lib/cjs/toast/toast.js

@@ -157,7 +157,7 @@ Toast.propTypes = {
   showClose: _propTypes.default.bool,
   stack: _propTypes.default.bool,
   stackExpanded: _propTypes.default.bool,
-  icon: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  icon: _propTypes.default.node,
   direction: _propTypes.default.oneOf(_constants.strings.directions)
 };
 Toast.defaultProps = {

package/lib/cjs/typography/util.js

@@ -49,7 +49,6 @@ const getRenderText = function (originEle, rows) {
   const lineHeight = pxToNumber(originStyle.lineHeight);
   const maxHeight = Math.round(lineHeight * (rows + 1) + pxToNumber(originStyle.paddingTop) + pxToNumber(originStyle.paddingBottom));
   // Set shadow
-  const maxWidth = parseInt(originStyle.width);
   ellipsisContainer.setAttribute('style', originCSS);
   ellipsisContainer.style.position = 'fixed';
   ellipsisContainer.style.left = '0';
@@ -61,12 +60,12 @@ const getRenderText = function (originEle, rows) {
   ellipsisContainer.style.webkitLineClamp = 'none';
   // Render fake container
   _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), ellipsisContainer);
-  // Check if ellipsis in measure div is height enough for content
+  // Check if ellipsis in measure div is enough for content
   function inRange() {
-    if (originStyle.whiteSpace === 'nowrap') {
-      return ellipsisContainer.scrollWidth <= maxWidth;
-    }
-    return ellipsisContainer.scrollHeight < maxHeight;
+    // If content does not wrap due to line break strategy, width should be judged to determine whether it's in range
+    const widthInRange = ellipsisContainer.scrollWidth <= ellipsisContainer.offsetWidth;
+    const heightInRange = ellipsisContainer.scrollHeight < maxHeight;
+    return rows === 1 ? widthInRange && heightInRange : heightInRange;
   }
   // ========================= Find match ellipsis content =========================
   // Create origin content holder

package/lib/es/banner/index.d.ts

@@ -26,8 +26,8 @@ export default class Banner extends BaseComponent<BannerProps, BannerState> {
         type: PropTypes.Requireable<string>;
         title: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         description: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-        icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
-        closeIcon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
+        icon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        closeIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         children: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;