@douyinfe/semi-foundation 2.54.1 → 2.55.0-beta.0

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

@@ -48,7 +48,7 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
      * @param {*} lifecycle
      * @returns
      */
-    init(lifecycle: string): {
+    init(lifecycle?: string): {
         selectedKeys: any;
         itemKeysMap: {};
         openKeys: any[];
@@ -74,9 +74,9 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
      * @param {*} itemKeysMap
      */
     getWillOpenKeys(itemKeysMap: ItemKey2ParentKeysMap): any[];
-    getShouldOpenKeys(itemKeysMap?: ItemKey2ParentKeysMap, selectedKeys?: string | number[]): unknown[];
+    getShouldOpenKeys(itemKeysMap?: ItemKey2ParentKeysMap, selectedKeys?: (string | number)[]): unknown[];
     destroy(): void;
-    selectLevelZeroParentKeys(itemKeysMap: ItemKey2ParentKeysMap, ...itemKeys: (string | number)[]): any[];
+    selectLevelZeroParentKeys(itemKeysMap: ItemKey2ParentKeysMap, itemKeys: (string | number)[]): any[];
     formatItems(items?: ItemProps[]): any[];
     handleSelect(data: OnSelectData): void;
     judgeIfOpen(openKeys: (string | number)[], items: NavItemType[]): boolean;

package/lib/cjs/navigation/foundation.js

@@ -141,10 +141,14 @@ class NavigationFoundation extends _foundation.default {
       selectedKeys,
       mode
     } = this.getProps();
+    const {
+      openKeys: stateOpenKeys = []
+    } = this.getStates();
     let willOpenKeys = openKeys || defaultOpenKeys || [];
     if (!(Array.isArray(defaultOpenKeys) || Array.isArray(openKeys)) && mode === _constants.strings.MODE_VERTICAL && (Array.isArray(defaultSelectedKeys) || Array.isArray(selectedKeys))) {
       const currentSelectedKeys = Array.isArray(selectedKeys) ? selectedKeys : defaultSelectedKeys;
-      willOpenKeys = this.getShouldOpenKeys(itemKeysMap, currentSelectedKeys);
+      willOpenKeys = stateOpenKeys.concat(this.getShouldOpenKeys(itemKeysMap, currentSelectedKeys));
+      willOpenKeys = Array.from(new Set(willOpenKeys));
     }
     return [...willOpenKeys];
   }
@@ -165,13 +169,10 @@ class NavigationFoundation extends _foundation.default {
     return [...willOpenKeySet];
   }
   destroy() {}
-  selectLevelZeroParentKeys(itemKeysMap) {
+  selectLevelZeroParentKeys(itemKeysMap, itemKeys) {
     const _itemKeysMap = (0, _isNullOrUndefined.default)(itemKeysMap) ? this.getState('itemKeysMap') : itemKeysMap;
     // console.log(itemKeysMap);
     const willAddKeys = [];
-    for (var _len2 = arguments.length, itemKeys = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-      itemKeys[_key2 - 1] = arguments[_key2];
-    }
     if (itemKeys.length) {
       for (const itemKey of itemKeys) {
         if (Array.isArray(_itemKeysMap[itemKey]) && _itemKeysMap[itemKey].length) {

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

@@ -48,7 +48,7 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
      * @param {*} lifecycle
      * @returns
      */
-    init(lifecycle: string): {
+    init(lifecycle?: string): {
         selectedKeys: any;
         itemKeysMap: {};
         openKeys: any[];
@@ -74,9 +74,9 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
      * @param {*} itemKeysMap
      */
     getWillOpenKeys(itemKeysMap: ItemKey2ParentKeysMap): any[];
-    getShouldOpenKeys(itemKeysMap?: ItemKey2ParentKeysMap, selectedKeys?: string | number[]): unknown[];
+    getShouldOpenKeys(itemKeysMap?: ItemKey2ParentKeysMap, selectedKeys?: (string | number)[]): unknown[];
     destroy(): void;
-    selectLevelZeroParentKeys(itemKeysMap: ItemKey2ParentKeysMap, ...itemKeys: (string | number)[]): any[];
+    selectLevelZeroParentKeys(itemKeysMap: ItemKey2ParentKeysMap, itemKeys: (string | number)[]): any[];
     formatItems(items?: ItemProps[]): any[];
     handleSelect(data: OnSelectData): void;
     judgeIfOpen(openKeys: (string | number)[], items: NavItemType[]): boolean;

package/lib/es/navigation/foundation.js

@@ -134,10 +134,14 @@ export default class NavigationFoundation extends BaseFoundation {
       selectedKeys,
       mode
     } = this.getProps();
+    const {
+      openKeys: stateOpenKeys = []
+    } = this.getStates();
     let willOpenKeys = openKeys || defaultOpenKeys || [];
     if (!(Array.isArray(defaultOpenKeys) || Array.isArray(openKeys)) && mode === strings.MODE_VERTICAL && (Array.isArray(defaultSelectedKeys) || Array.isArray(selectedKeys))) {
       const currentSelectedKeys = Array.isArray(selectedKeys) ? selectedKeys : defaultSelectedKeys;
-      willOpenKeys = this.getShouldOpenKeys(itemKeysMap, currentSelectedKeys);
+      willOpenKeys = stateOpenKeys.concat(this.getShouldOpenKeys(itemKeysMap, currentSelectedKeys));
+      willOpenKeys = Array.from(new Set(willOpenKeys));
     }
     return [...willOpenKeys];
   }
@@ -158,13 +162,10 @@ export default class NavigationFoundation extends BaseFoundation {
     return [...willOpenKeySet];
   }
   destroy() {}
-  selectLevelZeroParentKeys(itemKeysMap) {
+  selectLevelZeroParentKeys(itemKeysMap, itemKeys) {
     const _itemKeysMap = isNullOrUndefined(itemKeysMap) ? this.getState('itemKeysMap') : itemKeysMap;
     // console.log(itemKeysMap);
     const willAddKeys = [];
-    for (var _len2 = arguments.length, itemKeys = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-      itemKeys[_key2 - 1] = arguments[_key2];
-    }
     if (itemKeys.length) {
       for (const itemKey of itemKeys) {
         if (Array.isArray(_itemKeysMap[itemKey]) && _itemKeysMap[itemKey].length) {

package/navigation/foundation.ts

@@ -114,7 +114,7 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
      * @param {*} lifecycle
      * @returns
      */
-    init(lifecycle: string) {
+    init(lifecycle?: string) {
         const { defaultSelectedKeys, selectedKeys } = this.getProps();
         let willSelectedKeys = selectedKeys || defaultSelectedKeys || [];
         const { itemKeysMap, willOpenKeys, formattedItems } = this.getCalcState();
@@ -168,6 +168,7 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
      */
     getWillOpenKeys(itemKeysMap: ItemKey2ParentKeysMap) {
         const { defaultOpenKeys, openKeys, defaultSelectedKeys, selectedKeys, mode } = this.getProps();
+        const { openKeys: stateOpenKeys = [] } = this.getStates();
 
         let willOpenKeys = openKeys || defaultOpenKeys || [];
         if (
@@ -175,12 +176,13 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
             Array.isArray(openKeys)) && mode === strings.MODE_VERTICAL && (Array.isArray(defaultSelectedKeys) || Array.isArray(selectedKeys))
         ) {
             const currentSelectedKeys = Array.isArray(selectedKeys) ? selectedKeys : defaultSelectedKeys;
-            willOpenKeys = this.getShouldOpenKeys(itemKeysMap, currentSelectedKeys);
+            willOpenKeys = stateOpenKeys.concat(this.getShouldOpenKeys(itemKeysMap, currentSelectedKeys));
+            willOpenKeys = Array.from(new Set(willOpenKeys));
         }
         return [...willOpenKeys];
     }
 
-    getShouldOpenKeys(itemKeysMap: ItemKey2ParentKeysMap = {}, selectedKeys: string | number[]= []) {
+    getShouldOpenKeys(itemKeysMap: ItemKey2ParentKeysMap = {}, selectedKeys: (string | number)[] = []) {
         const willOpenKeySet = new Set();
 
         if (Array.isArray(selectedKeys) && selectedKeys.length) {
@@ -200,7 +202,7 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
 
     destroy() {}
 
-    selectLevelZeroParentKeys(itemKeysMap: ItemKey2ParentKeysMap, ...itemKeys: (string | number)[]) {
+    selectLevelZeroParentKeys(itemKeysMap: ItemKey2ParentKeysMap, itemKeys: (string | number)[]) {
         const _itemKeysMap = isNullOrUndefined(itemKeysMap) ? this.getState('itemKeysMap') : itemKeysMap;
         // console.log(itemKeysMap);
 

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.54.1",
+    "version": "2.55.0-beta.0",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.54.1",
+        "@douyinfe/semi-animation": "2.55.0-beta.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.29.3",
@@ -24,7 +24,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "29a9d7e115640dd1e9d8559609d9e4ee44dcfd12",
+    "gitHead": "1b20ba60f41785e247a71987235b5f3bbd577ff0",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",