@douyinfe/semi-ui 2.54.0-beta.0 → 2.54.1

package/dist/umd/semi-ui.js

@@ -22975,7 +22975,9 @@ class Base extends external_root_React_commonjs2_react_commonjs_react_amd_react_
         expandable,
         expandText
       } = this.getEllipsisOpt();
-      const overflowed = !expanded && (isOverflowed || isTruncated);
+      const canUseCSSEllipsis = this.canUseCSSEllipsis();
+      // If the css is truncated, use isOverflowed to judge. If the css is truncated, use isTruncated to judge.
+      const overflowed = !expanded && (canUseCSSEllipsis ? isOverflowed : isTruncated);
       const noExpandText = !expandable && isUndefined_default()(expandText);
       const show = noExpandText && overflowed && showTooltip;
       if (!show) {
@@ -23285,7 +23287,7 @@ class Base extends external_root_React_commonjs2_react_commonjs_react_amd_react_
       newState.isOverflowed = false;
       newState.ellipsisContent = props.children;
       newState.expanded = false;
-      newState.isTruncated = false;
+      newState.isTruncated = true;
     }
     return newState;
   }
@@ -26916,8 +26918,8 @@ class Avatar extends BaseComponent {
     }
   }
   render() {
-    var _a, _b;
-    const _c = this.props,
+    var _a;
+    const _b = this.props,
       {
         shape,
         children,
@@ -26936,8 +26938,8 @@ class Avatar extends BaseComponent {
         topSlot,
         border,
         contentMotion
-      } = _c,
-      others = avatar_rest(_c, ["shape", "children", "size", "color", "className", "hoverMask", "onClick", "imgAttr", "src", "srcSet", "style", "alt", "gap", "bottomSlot", "topSlot", "border", "contentMotion"]);
+      } = _b,
+      others = avatar_rest(_b, ["shape", "children", "size", "color", "className", "hoverMask", "onClick", "imgAttr", "src", "srcSet", "style", "alt", "gap", "bottomSlot", "topSlot", "border", "contentMotion"]);
     const {
       isImgExist,
       hoverContent,
@@ -26967,8 +26969,8 @@ class Avatar extends BaseComponent {
     }), this.getContent(), hoverRender);
     if (border) {
       const borderStyle = {};
-      if (border === null || border === void 0 ? void 0 : border.color) {
-        borderStyle['borderColor'] = border.color;
+      if (typeof border === 'object' && (border === null || border === void 0 ? void 0 : border.color)) {
+        borderStyle['borderColor'] = border === null || border === void 0 ? void 0 : border.color;
       }
       avatar = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement("div", {
         style: Object.assign({
@@ -26979,11 +26981,11 @@ class Avatar extends BaseComponent {
         className: classnames_default()([`${avatar_prefixCls}-additionalBorder`, `${avatar_prefixCls}-additionalBorder-${size}`, {
           [`${avatar_prefixCls}-${shape}`]: shape
         }])
-      }), ((_a = this.props.border) === null || _a === void 0 ? void 0 : _a.motion) && /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement("span", {
+      }), typeof this.props.border === 'object' && this.props.border.motion && /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement("span", {
         style: borderStyle,
         className: classnames_default()([`${avatar_prefixCls}-additionalBorder`, `${avatar_prefixCls}-additionalBorder-${size}`, {
           [`${avatar_prefixCls}-${shape}`]: shape,
-          [`${avatar_prefixCls}-additionalBorder-animated`]: (_b = this.props.border) === null || _b === void 0 ? void 0 : _b.motion
+          [`${avatar_prefixCls}-additionalBorder-animated`]: typeof this.props.border === 'object' && ((_a = this.props.border) === null || _a === void 0 ? void 0 : _a.motion)
         }])
       }));
     }
@@ -65943,7 +65945,8 @@ class NavigationFoundation extends foundation {
         items: formattedItems
       };
     } else {
-      this._adapter.updateSelectedKeys(willSelectedKeys);
+      // already include parentSelectKeys, set second parameter to false
+      this._adapter.updateSelectedKeys(willSelectedKeys, false);
       this._adapter.setItemKeysMap(itemKeysMap);
       this._adapter.updateOpenKeys(willOpenKeys);
       this._adapter.updateItems(formattedItems);
@@ -67190,24 +67193,19 @@ class Nav extends BaseComponent {
   componentDidMount() {
     // override BaseComponent
   }
-  componentDidUpdate(prevProps, prevState) {
+  componentDidUpdate(prevProps) {
     if (prevProps.items !== this.props.items || prevProps.children !== this.props.children) {
       this.foundation.init();
     } else {
       this.foundation.handleItemsChange(false);
-      const {
-        selectedKeys
-      } = this.state;
       if (this.props.selectedKeys && !isEqual_default()(prevProps.selectedKeys, this.props.selectedKeys)) {
         this.adapter.updateSelectedKeys(this.props.selectedKeys);
+        const willOpenKeys = this.foundation.getWillOpenKeys(this.state.itemKeysMap);
+        this.adapter.updateOpenKeys(willOpenKeys);
       }
       if (this.props.openKeys && !isEqual_default()(prevProps.openKeys, this.props.openKeys)) {
         this.adapter.updateOpenKeys(this.props.openKeys);
       }
-      if (!isEqual_default()(selectedKeys, prevState.selectedKeys)) {
-        const parentSelectKeys = this.foundation.selectLevelZeroParentKeys(null, ...selectedKeys);
-        this.adapter.addSelectedKeys(...parentSelectKeys);
-      }
     }
   }
   get adapter() {
@@ -67233,9 +67231,20 @@ class Nav extends BaseComponent {
       }),
       addSelectedKeys: createAddKeysFn(this, 'selectedKeys'),
       removeSelectedKeys: createRemoveKeysFn(this, 'selectedKeys'),
-      updateSelectedKeys: selectedKeys => this.setState({
-        selectedKeys: [...selectedKeys]
-      }),
+      /**
+       * when `includeParentKeys` is `true`, select a nested nav item will select parent nav sub
+       */
+      updateSelectedKeys: function (selectedKeys) {
+        let includeParentKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+        let willUpdateSelectedKeys = selectedKeys;
+        if (includeParentKeys) {
+          const parentSelectKeys = _this.foundation.selectLevelZeroParentKeys(null, selectedKeys);
+          willUpdateSelectedKeys = Array.from(new Set(selectedKeys.concat(parentSelectKeys)));
+        }
+        _this.setState({
+          selectedKeys: willUpdateSelectedKeys
+        });
+      },
       updateOpenKeys: openKeys => this.setState({
         openKeys: [...openKeys]
       }),