@douyinfe/semi-ui 2.54.0 → 2.54.1

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

@@ -125,7 +125,7 @@ declare class Nav extends BaseComponent<NavProps, NavState> {
     constructor(props: NavProps);
     static getDerivedStateFromProps(props: NavProps, state: NavState): Partial<NavState>;
     componentDidMount(): void;
-    componentDidUpdate(prevProps: NavProps, prevState: NavState): void;
+    componentDidUpdate(prevProps: NavProps): void;
     get adapter(): NavigationAdapter<NavProps, NavState>;
     /**
      * Render navigation items recursively

package/lib/cjs/navigation/index.js

@@ -97,24 +97,19 @@ class Nav extends _baseComponent.default {
   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 && !(0, _isEqual2.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 && !(0, _isEqual2.default)(prevProps.openKeys, this.props.openKeys)) {
         this.adapter.updateOpenKeys(this.props.openKeys);
       }
-      if (!(0, _isEqual2.default)(selectedKeys, prevState.selectedKeys)) {
-        const parentSelectKeys = this.foundation.selectLevelZeroParentKeys(null, ...selectedKeys);
-        this.adapter.addSelectedKeys(...parentSelectKeys);
-      }
     }
   }
   get adapter() {
@@ -140,9 +135,20 @@ class Nav extends _baseComponent.default {
       }),
       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]
       }),

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

@@ -125,7 +125,7 @@ declare class Nav extends BaseComponent<NavProps, NavState> {
     constructor(props: NavProps);
     static getDerivedStateFromProps(props: NavProps, state: NavState): Partial<NavState>;
     componentDidMount(): void;
-    componentDidUpdate(prevProps: NavProps, prevState: NavState): void;
+    componentDidUpdate(prevProps: NavProps): void;
     get adapter(): NavigationAdapter<NavProps, NavState>;
     /**
      * Render navigation items recursively

package/lib/es/navigation/index.js

@@ -88,24 +88,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(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(prevProps.openKeys, this.props.openKeys)) {
         this.adapter.updateOpenKeys(this.props.openKeys);
       }
-      if (!_isEqual(selectedKeys, prevState.selectedKeys)) {
-        const parentSelectKeys = this.foundation.selectLevelZeroParentKeys(null, ...selectedKeys);
-        this.adapter.addSelectedKeys(...parentSelectKeys);
-      }
     }
   }
   get adapter() {
@@ -131,9 +126,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]
       }),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.54.0",
+    "version": "2.54.1",
     "description": "A modern, comprehensive, flexible design system and UI library. Connect DesignOps & DevOps. Quickly build beautiful React apps. Maintained by Douyin-fe team.",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -20,12 +20,12 @@
         "@dnd-kit/core": "^6.0.8",
         "@dnd-kit/sortable": "^7.0.2",
         "@dnd-kit/utilities": "^3.2.1",
-        "@douyinfe/semi-animation": "2.54.0",
-        "@douyinfe/semi-animation-react": "2.54.0",
-        "@douyinfe/semi-foundation": "2.54.0",
-        "@douyinfe/semi-icons": "2.54.0",
-        "@douyinfe/semi-illustrations": "2.54.0",
-        "@douyinfe/semi-theme-default": "2.54.0",
+        "@douyinfe/semi-animation": "2.54.1",
+        "@douyinfe/semi-animation-react": "2.54.1",
+        "@douyinfe/semi-foundation": "2.54.1",
+        "@douyinfe/semi-icons": "2.54.1",
+        "@douyinfe/semi-illustrations": "2.54.1",
+        "@douyinfe/semi-theme-default": "2.54.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -75,7 +75,7 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "30c24d26549ecb166625ef4f0a731235b71968fc",
+    "gitHead": "29a9d7e115640dd1e9d8559609d9e4ee44dcfd12",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",