@douyinfe/semi-foundation 2.49.1 → 2.49.2

package/lib/cjs/select/foundation.js

@@ -328,6 +328,9 @@ class SelectFoundation extends _foundation.default {
       const newOptions = this._filterOption(options, sugInput).filter(item => !item._inputCreateOnly);
       this._adapter.updateOptions(newOptions);
       this.toggle2SearchInput(true);
+    } else {
+      // whether it is a filter or not, isFocus is guaranteed to be true when open
+      this._adapter.updateFocusState(true);
     }
     this._adapter.openMenu();
     this._setDropdownWidth();
@@ -337,7 +340,6 @@ class SelectFoundation extends _foundation.default {
       this.close(e);
       this._notifyBlur(e);
       this._adapter.updateFocusState(false);
-      this._adapter.unregisterClickOutsideHandler();
     });
   }
   toggle2SearchInput(isShow) {
@@ -356,6 +358,7 @@ class SelectFoundation extends _foundation.default {
     // this.unBindKeyBoardEvent();
     // this._notifyBlur(e);
     // this._adapter.updateFocusState(false);
+    this._adapter.unregisterClickOutsideHandler();
     const isFilterable = this._isFilterable();
     if (isFilterable) {
       this.toggle2SearchInput(false);
@@ -1042,7 +1045,6 @@ class SelectFoundation extends _foundation.default {
     this._adapter.setIsFocusInContainer(false);
   }
   handleTriggerBlur(e) {
-    this._adapter.updateFocusState(false);
     const {
       filter,
       autoFocus
@@ -1055,6 +1057,7 @@ class SelectFoundation extends _foundation.default {
     // But when autoFocus or the panel is close, because clickOutsideHandler is not register or unregister, you need to listen for the trigger's blur and trigger the notify callback
     if (isFocus && !isOpen) {
       this._notifyBlur(e);
+      this._adapter.updateFocusState(false);
     }
   }
   handleInputBlur(e) {

package/lib/cjs/steps/bacisSteps.scss

@@ -84,6 +84,10 @@ $basicType: #{$module}-basic;
         display: flex;
         flex-flow: column nowrap;
 
+        .#{$item}-icon {
+            box-sizing: content-box;
+        }
+
         &.#{$module}-small {
             .#{$item} {
                 .#{$item}-content {

package/lib/cjs/steps/steps.css

@@ -204,6 +204,9 @@
   display: flex;
   flex-flow: column nowrap;
 }
+.semi-steps-basic.semi-steps-vertical .semi-steps-item-icon {
+  box-sizing: content-box;
+}
 .semi-steps-basic.semi-steps-vertical.semi-steps-small .semi-steps-item .semi-steps-item-content {
   min-height: 40px;
 }

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

@@ -75,7 +75,7 @@ export interface BasicTreeSelectProps extends Pick<BasicTreeProps, 'virtualize'
     onVisibleChange?: (isVisible: boolean) => void;
     onLoad?: (keys: Set<string>, data: BasicTreeNodeData) => void;
 }
-export interface BasicTreeSelectInnerData extends Pick<BasicTreeInnerData, 'keyEntities' | 'treeData' | 'flattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
+export interface BasicTreeSelectInnerData extends Pick<BasicTreeInnerData, 'keyEntities' | 'treeData' | 'flattenNodes' | 'cachedFlattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
     inputTriggerFocus: boolean;
     isOpen: boolean;
     rePosKey: number;
@@ -135,6 +135,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
     _notifyMultipleChange(key: string[], e: any): void;
     _notifyChange(key: any, e: any): void;
     _registerClickOutsideHandler: (e: any) => void;
+    clearInputValue: () => void;
     _notifyFocus(e: any): void;
     handleTriggerFocus(e: any): void;
     _notifyBlur(e: any): void;

package/lib/cjs/treeSelect/foundation.js

@@ -26,6 +26,12 @@ class TreeSelectFoundation extends _foundation.default {
         this.close(e);
       });
     };
+    this.clearInputValue = () => {
+      const {
+        inputValue
+      } = this.getStates();
+      inputValue && this._adapter.updateInputValue('');
+    };
   }
   init() {
     const {
@@ -177,7 +183,7 @@ class TreeSelectFoundation extends _foundation.default {
     const isSearching = Boolean(inputValue);
     const treeNodeProps = {
       eventKey: key,
-      expanded: isSearching && !this._isExpandControlled() ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
+      expanded: isSearching ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
       selected: selectedKeys.includes(key),
       checked: realChecked,
       halfChecked: realHalfChecked,
@@ -450,8 +456,8 @@ class TreeSelectFoundation extends _foundation.default {
     expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
     const newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, newExpandedKeys, keyMaps);
     this._adapter.updateState({
-      expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
-      flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
+      expandedKeys: newExpandedKeys,
+      flattenNodes: newFlattenNodes,
       inputValue: '',
       motionKeys: new Set([]),
       filteredKeys: new Set([]),
@@ -500,8 +506,8 @@ class TreeSelectFoundation extends _foundation.default {
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
     this._adapter.updateState({
-      expandedKeys: this._isExpandControlled() ? expandedKeys : newExpandedKeys,
-      flattenNodes: this._isExpandControlled() ? flattenNodes : newFlattenNodes,
+      expandedKeys: newExpandedKeys,
+      flattenNodes: newFlattenNodes,
       motionKeys: new Set([]),
       filteredKeys: new Set(filteredOptsKeys),
       filteredExpandedKeys: newFilteredExpandedKeys,
@@ -709,7 +715,7 @@ class TreeSelectFoundation extends _foundation.default {
       return;
     }
     const isExpandControlled = this._isExpandControlled();
-    if (isSearching && !isExpandControlled) {
+    if (isSearching) {
       this.handleNodeExpandInSearch(e, treeNode);
       return;
     }

package/lib/es/select/foundation.js

@@ -319,6 +319,9 @@ export default class SelectFoundation extends BaseFoundation {
       const newOptions = this._filterOption(options, sugInput).filter(item => !item._inputCreateOnly);
       this._adapter.updateOptions(newOptions);
       this.toggle2SearchInput(true);
+    } else {
+      // whether it is a filter or not, isFocus is guaranteed to be true when open
+      this._adapter.updateFocusState(true);
     }
     this._adapter.openMenu();
     this._setDropdownWidth();
@@ -328,7 +331,6 @@ export default class SelectFoundation extends BaseFoundation {
       this.close(e);
       this._notifyBlur(e);
       this._adapter.updateFocusState(false);
-      this._adapter.unregisterClickOutsideHandler();
     });
   }
   toggle2SearchInput(isShow) {
@@ -347,6 +349,7 @@ export default class SelectFoundation extends BaseFoundation {
     // this.unBindKeyBoardEvent();
     // this._notifyBlur(e);
     // this._adapter.updateFocusState(false);
+    this._adapter.unregisterClickOutsideHandler();
     const isFilterable = this._isFilterable();
     if (isFilterable) {
       this.toggle2SearchInput(false);
@@ -1033,7 +1036,6 @@ export default class SelectFoundation extends BaseFoundation {
     this._adapter.setIsFocusInContainer(false);
   }
   handleTriggerBlur(e) {
-    this._adapter.updateFocusState(false);
     const {
       filter,
       autoFocus
@@ -1046,6 +1048,7 @@ export default class SelectFoundation extends BaseFoundation {
     // But when autoFocus or the panel is close, because clickOutsideHandler is not register or unregister, you need to listen for the trigger's blur and trigger the notify callback
     if (isFocus && !isOpen) {
       this._notifyBlur(e);
+      this._adapter.updateFocusState(false);
     }
   }
   handleInputBlur(e) {

package/lib/es/steps/bacisSteps.scss

@@ -84,6 +84,10 @@ $basicType: #{$module}-basic;
         display: flex;
         flex-flow: column nowrap;
 
+        .#{$item}-icon {
+            box-sizing: content-box;
+        }
+
         &.#{$module}-small {
             .#{$item} {
                 .#{$item}-content {

package/lib/es/steps/steps.css

@@ -204,6 +204,9 @@
   display: flex;
   flex-flow: column nowrap;
 }
+.semi-steps-basic.semi-steps-vertical .semi-steps-item-icon {
+  box-sizing: content-box;
+}
 .semi-steps-basic.semi-steps-vertical.semi-steps-small .semi-steps-item .semi-steps-item-content {
   min-height: 40px;
 }

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

@@ -75,7 +75,7 @@ export interface BasicTreeSelectProps extends Pick<BasicTreeProps, 'virtualize'
     onVisibleChange?: (isVisible: boolean) => void;
     onLoad?: (keys: Set<string>, data: BasicTreeNodeData) => void;
 }
-export interface BasicTreeSelectInnerData extends Pick<BasicTreeInnerData, 'keyEntities' | 'treeData' | 'flattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
+export interface BasicTreeSelectInnerData extends Pick<BasicTreeInnerData, 'keyEntities' | 'treeData' | 'flattenNodes' | 'cachedFlattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
     inputTriggerFocus: boolean;
     isOpen: boolean;
     rePosKey: number;
@@ -135,6 +135,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
     _notifyMultipleChange(key: string[], e: any): void;
     _notifyChange(key: any, e: any): void;
     _registerClickOutsideHandler: (e: any) => void;
+    clearInputValue: () => void;
     _notifyFocus(e: any): void;
     handleTriggerFocus(e: any): void;
     _notifyBlur(e: any): void;

package/lib/es/treeSelect/foundation.js

@@ -19,6 +19,12 @@ export default class TreeSelectFoundation extends BaseFoundation {
         this.close(e);
       });
     };
+    this.clearInputValue = () => {
+      const {
+        inputValue
+      } = this.getStates();
+      inputValue && this._adapter.updateInputValue('');
+    };
   }
   init() {
     const {
@@ -170,7 +176,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
     const isSearching = Boolean(inputValue);
     const treeNodeProps = {
       eventKey: key,
-      expanded: isSearching && !this._isExpandControlled() ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
+      expanded: isSearching ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
       selected: selectedKeys.includes(key),
       checked: realChecked,
       halfChecked: realHalfChecked,
@@ -443,8 +449,8 @@ export default class TreeSelectFoundation extends BaseFoundation {
     expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
     const newFlattenNodes = flattenTreeData(treeData, newExpandedKeys, keyMaps);
     this._adapter.updateState({
-      expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
-      flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
+      expandedKeys: newExpandedKeys,
+      flattenNodes: newFlattenNodes,
       inputValue: '',
       motionKeys: new Set([]),
       filteredKeys: new Set([]),
@@ -493,8 +499,8 @@ export default class TreeSelectFoundation extends BaseFoundation {
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
     this._adapter.updateState({
-      expandedKeys: this._isExpandControlled() ? expandedKeys : newExpandedKeys,
-      flattenNodes: this._isExpandControlled() ? flattenNodes : newFlattenNodes,
+      expandedKeys: newExpandedKeys,
+      flattenNodes: newFlattenNodes,
       motionKeys: new Set([]),
       filteredKeys: new Set(filteredOptsKeys),
       filteredExpandedKeys: newFilteredExpandedKeys,
@@ -702,7 +708,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
       return;
     }
     const isExpandControlled = this._isExpandControlled();
-    if (isSearching && !isExpandControlled) {
+    if (isSearching) {
       this.handleNodeExpandInSearch(e, treeNode);
       return;
     }

package/package.json

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

package/select/foundation.ts

@@ -352,6 +352,9 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
             const newOptions = this._filterOption(options, sugInput).filter(item => !item._inputCreateOnly);
             this._adapter.updateOptions(newOptions);
             this.toggle2SearchInput(true);
+        } else {
+            // whether it is a filter or not, isFocus is guaranteed to be true when open
+            this._adapter.updateFocusState(true);
         }
         this._adapter.openMenu();
         this._setDropdownWidth();
@@ -363,7 +366,6 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
             this.close(e);
             this._notifyBlur(e);
             this._adapter.updateFocusState(false);
-            this._adapter.unregisterClickOutsideHandler();
         });
     }
 
@@ -385,6 +387,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
         // this.unBindKeyBoardEvent();
         // this._notifyBlur(e);
         // this._adapter.updateFocusState(false);
+        this._adapter.unregisterClickOutsideHandler();
 
         const isFilterable = this._isFilterable();
         if (isFilterable) {
@@ -1053,13 +1056,13 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
     }
 
     handleTriggerBlur(e: FocusEvent) {
-        this._adapter.updateFocusState(false);
         const { filter, autoFocus } = this.getProps();
         const { isOpen, isFocus } = this.getStates();
         // Under normal circumstances, blur will be accompanied by clickOutsideHandler, so the notify of blur can be called uniformly in clickOutsideHandler
         // But when autoFocus or the panel is close, because clickOutsideHandler is not register or unregister, you need to listen for the trigger's blur and trigger the notify callback
         if (isFocus && !isOpen) {
             this._notifyBlur(e);
+            this._adapter.updateFocusState(false);
         }
     }
 

package/steps/bacisSteps.scss

@@ -84,6 +84,10 @@ $basicType: #{$module}-basic;
         display: flex;
         flex-flow: column nowrap;
 
+        .#{$item}-icon {
+            box-sizing: content-box;
+        }
+
         &.#{$module}-small {
             .#{$item} {
                 .#{$item}-content {

package/treeSelect/foundation.ts

@@ -150,6 +150,7 @@ export interface BasicTreeSelectInnerData extends Pick<BasicTreeInnerData,
 'keyEntities'
 | 'treeData'
 | 'flattenNodes'
+| 'cachedFlattenNodes'
 | 'selectedKeys'
 | 'checkedKeys'
 | 'halfCheckedKeys'
@@ -346,9 +347,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
         const isSearching = Boolean(inputValue);
         const treeNodeProps: BasicTreeNodeProps = {
             eventKey: key,
-            expanded: isSearching && !this._isExpandControlled()
-                ? filteredExpandedKeys.has(key)
-                : expandedKeys.has(key),
+            expanded: isSearching ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
             selected: selectedKeys.includes(key),
             checked: realChecked,
             halfChecked: realHalfChecked,
@@ -444,6 +443,11 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
         });
     }
 
+    clearInputValue = () => {
+        const { inputValue } = this.getStates();
+        inputValue && this._adapter.updateInputValue('');
+    }
+
     // Scenes that may trigger focus:
     //  1、click selection
     _notifyFocus(e: any) {
@@ -597,8 +601,8 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
         const newFlattenNodes = flattenTreeData(treeData, newExpandedKeys, keyMaps);
 
         this._adapter.updateState({
-            expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
-            flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
+            expandedKeys: newExpandedKeys,
+            flattenNodes: newFlattenNodes,
             inputValue: '',
             motionKeys: new Set([]),
             filteredKeys: new Set([]),
@@ -637,8 +641,8 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
         const newFilteredExpandedKeys = new Set(expandedOptsKeys);
         this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
         this._adapter.updateState({
-            expandedKeys: this._isExpandControlled() ? expandedKeys : newExpandedKeys,
-            flattenNodes: this._isExpandControlled() ? flattenNodes : newFlattenNodes,
+            expandedKeys: newExpandedKeys,
+            flattenNodes: newFlattenNodes,
             motionKeys: new Set([]),
             filteredKeys: new Set(filteredOptsKeys),
             filteredExpandedKeys: newFilteredExpandedKeys,
@@ -808,7 +812,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
         }
 
         const isExpandControlled = this._isExpandControlled();
-        if (isSearching && !isExpandControlled) {
+        if (isSearching) {
             this.handleNodeExpandInSearch(e, treeNode);
             return;
         }