@douyinfe/semi-foundation 2.45.2 → 2.45.3-alpha.1

package/cascader/foundation.ts

@@ -230,7 +230,11 @@ export interface CascaderAdapter extends DefaultAdapter<BasicCascaderProps, Basi
     notifyListScroll: (e: any, panel: BasicScrollPanelProps) => void;
     notifyOnExceed: (data: BasicEntity[]) => void;
     toggleInputShow: (show: boolean, cb: () => void) => void;
-    updateFocusState: (focus: boolean) => void
+    updateFocusState: (focus: boolean) => void;
+    updateLoadingKeyRefValue: (keys: Set<string>) => void;
+    getLoadingKeyRefValue: () => Set<string>;
+    updateLoadedKeyRefValue: (keys: Set<string>) => void;
+    getLoadedKeyRefValue: () => Set<string>
 }
 
 export default class CascaderFoundation extends BaseFoundation<CascaderAdapter, BasicCascaderProps, BasicCascaderInnerData> {
@@ -242,6 +246,8 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
     init() {
         const isOpen = this.getProp('open') || this.getProp('defaultOpen');
         this.collectOptions(true);
+        this._adapter.updateLoadingKeyRefValue(new Set());
+        this._adapter.updateLoadedKeyRefValue(new Set());
 
         if (isOpen && !this._isDisabled()) {
             this.open();
@@ -426,11 +432,11 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
         const { changeOnSelect, onChangeWithObject, multiple } = this.getProps();
         const {
             activeKeys,
-            loadingKeys,
             loading,
             keyEntities: keyEntityState,
             selectedKeys: selectedKeysState
         } = this.getStates();
+        const loadingKeys = this._adapter.getLoadingKeyRefValue();
         const filterable = this._isFilterable();
         const loadingActive = [...activeKeys].filter(i => loadingKeys.has(i));
 
@@ -672,18 +678,19 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
 
     handleNodeLoad(item: BasicEntity | BasicData) {
         const { data, key } = item;
-        const {
-            loadedKeys: prevLoadedKeys,
-            loadingKeys: prevLoadingKeys
-        } = this.getCopyFromState(['loadedKeys', 'loadingKeys']);
+        const prevLoadingKeys = cloneDeep(this._adapter.getLoadingKeyRefValue());
+        const prevLoadedKeys = cloneDeep(this._adapter.getLoadedKeyRefValue());
         const newLoadedKeys = prevLoadedKeys.add(key);
         const newLoadingKeys = new Set([...prevLoadingKeys]);
         newLoadingKeys.delete(key);
 
         // onLoad should trigger before internal setState to avoid `loadData` trigger twice.
         this._adapter.notifyOnLoad(newLoadedKeys, data);
+        this._adapter.updateLoadingKeyRefValue(newLoadingKeys);
+        this._adapter.updateLoadedKeyRefValue(newLoadedKeys);
         this._adapter.updateStates({
             loadingKeys: newLoadingKeys,
+            loadedKeys: newLoadedKeys
         });
     }
 
@@ -691,14 +698,17 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
         const { data, key } = item;
         this._adapter.updateStates({ loading: false });
         if (!data.isLeaf && !data.children && this.getProp('loadData')) {
-            const { loadedKeys, loadingKeys } = this.getCopyFromState(['loadedKeys', 'loadingKeys']);
+            const loadedKeys = this._adapter.getLoadedKeyRefValue();
+            const loadingKeys = cloneDeep(this._adapter.getLoadingKeyRefValue());
             if (loadedKeys.has(key) || loadingKeys.has(key)) {
                 return;
             }
             this._adapter.updateStates({ loading: true });
             const { keyEntities } = this.getStates();
             const optionPath = this.getItemPropPath(key, [], keyEntities);
-            this._adapter.updateStates({ loadingKeys: loadingKeys.add(key) });
+            const newLoadingKeys = loadingKeys.add(key);
+            this._adapter.updateLoadingKeyRefValue(newLoadingKeys);
+            this._adapter.updateStates({ loadingKeys: newLoadingKeys });
             this._adapter.notifyLoadData(optionPath, this.handleNodeLoad.bind(this, item));
         }
     }

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

@@ -176,6 +176,10 @@ export interface CascaderAdapter extends DefaultAdapter<BasicCascaderProps, Basi
     notifyOnExceed: (data: BasicEntity[]) => void;
     toggleInputShow: (show: boolean, cb: () => void) => void;
     updateFocusState: (focus: boolean) => void;
+    updateLoadingKeyRefValue: (keys: Set<string>) => void;
+    getLoadingKeyRefValue: () => Set<string>;
+    updateLoadedKeyRefValue: (keys: Set<string>) => void;
+    getLoadedKeyRefValue: () => Set<string>;
 }
 export default class CascaderFoundation extends BaseFoundation<CascaderAdapter, BasicCascaderProps, BasicCascaderInnerData> {
     constructor(adapter: CascaderAdapter);
@@ -235,7 +239,10 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
      * @param {boolean} curCheckedStatus checked status of node
      */
     calcCheckedKeys(key: string, curCheckedStatus: boolean): {
-        checkedKeys: Set<string>;
+        checkedKeys: Set<string>; /**
+         * When changeOnSelect is turned on, or the target option is a leaf option,
+         * the option is considered to be selected, even if the option is disabled
+         */
         halfCheckedKeys: Set<string>;
     };
     handleInputChange(sugInput: string): void;

package/lib/cjs/cascader/foundation.js

@@ -32,6 +32,8 @@ class CascaderFoundation extends _foundation.default {
   init() {
     const isOpen = this.getProp('open') || this.getProp('defaultOpen');
     this.collectOptions(true);
+    this._adapter.updateLoadingKeyRefValue(new Set());
+    this._adapter.updateLoadedKeyRefValue(new Set());
     if (isOpen && !this._isDisabled()) {
       this.open();
     }
@@ -218,11 +220,11 @@ class CascaderFoundation extends _foundation.default {
     } = this.getProps();
     const {
       activeKeys,
-      loadingKeys,
       loading,
       keyEntities: keyEntityState,
       selectedKeys: selectedKeysState
     } = this.getStates();
+    const loadingKeys = this._adapter.getLoadingKeyRefValue();
     const filterable = this._isFilterable();
     const loadingActive = [...activeKeys].filter(i => loadingKeys.has(i));
     const valuePath = onChangeWithObject ? (0, _util.normalizedArr)(value).map(i => i.value) : (0, _util.normalizedArr)(value);
@@ -470,17 +472,18 @@ class CascaderFoundation extends _foundation.default {
       data,
       key
     } = item;
-    const {
-      loadedKeys: prevLoadedKeys,
-      loadingKeys: prevLoadingKeys
-    } = this.getCopyFromState(['loadedKeys', 'loadingKeys']);
+    const prevLoadingKeys = (0, _cloneDeep2.default)(this._adapter.getLoadingKeyRefValue());
+    const prevLoadedKeys = (0, _cloneDeep2.default)(this._adapter.getLoadedKeyRefValue());
     const newLoadedKeys = prevLoadedKeys.add(key);
     const newLoadingKeys = new Set([...prevLoadingKeys]);
     newLoadingKeys.delete(key);
     // onLoad should trigger before internal setState to avoid `loadData` trigger twice.
     this._adapter.notifyOnLoad(newLoadedKeys, data);
+    this._adapter.updateLoadingKeyRefValue(newLoadingKeys);
+    this._adapter.updateLoadedKeyRefValue(newLoadedKeys);
     this._adapter.updateStates({
-      loadingKeys: newLoadingKeys
+      loadingKeys: newLoadingKeys,
+      loadedKeys: newLoadedKeys
     });
   }
   notifyIfLoadData(item) {
@@ -492,10 +495,8 @@ class CascaderFoundation extends _foundation.default {
       loading: false
     });
     if (!data.isLeaf && !data.children && this.getProp('loadData')) {
-      const {
-        loadedKeys,
-        loadingKeys
-      } = this.getCopyFromState(['loadedKeys', 'loadingKeys']);
+      const loadedKeys = this._adapter.getLoadedKeyRefValue();
+      const loadingKeys = (0, _cloneDeep2.default)(this._adapter.getLoadingKeyRefValue());
       if (loadedKeys.has(key) || loadingKeys.has(key)) {
         return;
       }
@@ -506,8 +507,10 @@ class CascaderFoundation extends _foundation.default {
         keyEntities
       } = this.getStates();
       const optionPath = this.getItemPropPath(key, [], keyEntities);
+      const newLoadingKeys = loadingKeys.add(key);
+      this._adapter.updateLoadingKeyRefValue(newLoadingKeys);
       this._adapter.updateStates({
-        loadingKeys: loadingKeys.add(key)
+        loadingKeys: newLoadingKeys
       });
       this._adapter.notifyLoadData(optionPath, this.handleNodeLoad.bind(this, item));
     }

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

@@ -176,6 +176,10 @@ export interface CascaderAdapter extends DefaultAdapter<BasicCascaderProps, Basi
     notifyOnExceed: (data: BasicEntity[]) => void;
     toggleInputShow: (show: boolean, cb: () => void) => void;
     updateFocusState: (focus: boolean) => void;
+    updateLoadingKeyRefValue: (keys: Set<string>) => void;
+    getLoadingKeyRefValue: () => Set<string>;
+    updateLoadedKeyRefValue: (keys: Set<string>) => void;
+    getLoadedKeyRefValue: () => Set<string>;
 }
 export default class CascaderFoundation extends BaseFoundation<CascaderAdapter, BasicCascaderProps, BasicCascaderInnerData> {
     constructor(adapter: CascaderAdapter);
@@ -235,7 +239,10 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
      * @param {boolean} curCheckedStatus checked status of node
      */
     calcCheckedKeys(key: string, curCheckedStatus: boolean): {
-        checkedKeys: Set<string>;
+        checkedKeys: Set<string>; /**
+         * When changeOnSelect is turned on, or the target option is a leaf option,
+         * the option is considered to be selected, even if the option is disabled
+         */
         halfCheckedKeys: Set<string>;
     };
     handleInputChange(sugInput: string): void;

package/lib/es/cascader/foundation.js

@@ -25,6 +25,8 @@ export default class CascaderFoundation extends BaseFoundation {
   init() {
     const isOpen = this.getProp('open') || this.getProp('defaultOpen');
     this.collectOptions(true);
+    this._adapter.updateLoadingKeyRefValue(new Set());
+    this._adapter.updateLoadedKeyRefValue(new Set());
     if (isOpen && !this._isDisabled()) {
       this.open();
     }
@@ -211,11 +213,11 @@ export default class CascaderFoundation extends BaseFoundation {
     } = this.getProps();
     const {
       activeKeys,
-      loadingKeys,
       loading,
       keyEntities: keyEntityState,
       selectedKeys: selectedKeysState
     } = this.getStates();
+    const loadingKeys = this._adapter.getLoadingKeyRefValue();
     const filterable = this._isFilterable();
     const loadingActive = [...activeKeys].filter(i => loadingKeys.has(i));
     const valuePath = onChangeWithObject ? normalizedArr(value).map(i => i.value) : normalizedArr(value);
@@ -463,17 +465,18 @@ export default class CascaderFoundation extends BaseFoundation {
       data,
       key
     } = item;
-    const {
-      loadedKeys: prevLoadedKeys,
-      loadingKeys: prevLoadingKeys
-    } = this.getCopyFromState(['loadedKeys', 'loadingKeys']);
+    const prevLoadingKeys = _cloneDeep(this._adapter.getLoadingKeyRefValue());
+    const prevLoadedKeys = _cloneDeep(this._adapter.getLoadedKeyRefValue());
     const newLoadedKeys = prevLoadedKeys.add(key);
     const newLoadingKeys = new Set([...prevLoadingKeys]);
     newLoadingKeys.delete(key);
     // onLoad should trigger before internal setState to avoid `loadData` trigger twice.
     this._adapter.notifyOnLoad(newLoadedKeys, data);
+    this._adapter.updateLoadingKeyRefValue(newLoadingKeys);
+    this._adapter.updateLoadedKeyRefValue(newLoadedKeys);
     this._adapter.updateStates({
-      loadingKeys: newLoadingKeys
+      loadingKeys: newLoadingKeys,
+      loadedKeys: newLoadedKeys
     });
   }
   notifyIfLoadData(item) {
@@ -485,10 +488,8 @@ export default class CascaderFoundation extends BaseFoundation {
       loading: false
     });
     if (!data.isLeaf && !data.children && this.getProp('loadData')) {
-      const {
-        loadedKeys,
-        loadingKeys
-      } = this.getCopyFromState(['loadedKeys', 'loadingKeys']);
+      const loadedKeys = this._adapter.getLoadedKeyRefValue();
+      const loadingKeys = _cloneDeep(this._adapter.getLoadingKeyRefValue());
       if (loadedKeys.has(key) || loadingKeys.has(key)) {
         return;
       }
@@ -499,8 +500,10 @@ export default class CascaderFoundation extends BaseFoundation {
         keyEntities
       } = this.getStates();
       const optionPath = this.getItemPropPath(key, [], keyEntities);
+      const newLoadingKeys = loadingKeys.add(key);
+      this._adapter.updateLoadingKeyRefValue(newLoadingKeys);
       this._adapter.updateStates({
-        loadingKeys: loadingKeys.add(key)
+        loadingKeys: newLoadingKeys
       });
       this._adapter.notifyLoadData(optionPath, this.handleNodeLoad.bind(this, item));
     }

package/package.json

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