@douyinfe/semi-foundation 2.48.0-alpha.0 → 2.48.0

package/avatar/foundation.ts

@@ -5,7 +5,9 @@ export interface AvatarAdapter<P = Record<string, any>, S = Record<string, any>>
     notifyImgState(isImgExist: boolean): void;
     notifyLeave(event: any): void;
     notifyEnter(event: any): void;
-    setFocusVisible: (focusVisible: boolean) => void
+    setFocusVisible: (focusVisible: boolean) => void;
+    setScale: (scale: number) => void;
+    getAvatarNode: () => HTMLSpanElement
 }
 
 export default class AvatarFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<AvatarAdapter<P, S>, P, S> {
@@ -14,7 +16,12 @@ export default class AvatarFoundation<P = Record<string, any>, S = Record<string
         super({ ...adapter });
     }
 
-    init() { }
+    init() {
+        const { children } = this.getProps();
+        if (typeof children === "string") {
+            this.changeScale();
+        }
+    }
 
     destroy() { }
 
@@ -49,4 +56,14 @@ export default class AvatarFoundation<P = Record<string, any>, S = Record<string
         this._adapter.setFocusVisible(false);
     }
 
+    changeScale = () => {
+        const { gap } = this.getProps();
+        const node = this._adapter.getAvatarNode();
+        const stringNode = node?.firstChild as HTMLSpanElement;
+        const [nodeWidth, stringNodeWidth] = [node?.offsetWidth || 0, stringNode?.offsetWidth || 0];
+        if (nodeWidth !== 0 && stringNodeWidth !== 0 && gap * 2 < nodeWidth) {
+            const scale = nodeWidth - gap * 2 > stringNodeWidth ? 1 : (nodeWidth - gap * 2) / stringNodeWidth;
+            this._adapter.setScale(scale);
+        }
+    }
 }

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

@@ -4,6 +4,8 @@ export interface AvatarAdapter<P = Record<string, any>, S = Record<string, any>>
     notifyLeave(event: any): void;
     notifyEnter(event: any): void;
     setFocusVisible: (focusVisible: boolean) => void;
+    setScale: (scale: number) => void;
+    getAvatarNode: () => HTMLSpanElement;
 }
 export default class AvatarFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<AvatarAdapter<P, S>, P, S> {
     constructor(adapter: AvatarAdapter<P, S>);
@@ -14,4 +16,5 @@ export default class AvatarFoundation<P = Record<string, any>, S = Record<string
     handleLeave(e: any): void;
     handleFocusVisible: (event: any) => void;
     handleBlur: () => void;
+    changeScale: () => void;
 }

package/lib/cjs/avatar/foundation.js

@@ -25,8 +25,27 @@ class AvatarFoundation extends _foundation.default {
     this.handleBlur = () => {
       this._adapter.setFocusVisible(false);
     };
+    this.changeScale = () => {
+      const {
+        gap
+      } = this.getProps();
+      const node = this._adapter.getAvatarNode();
+      const stringNode = node === null || node === void 0 ? void 0 : node.firstChild;
+      const [nodeWidth, stringNodeWidth] = [(node === null || node === void 0 ? void 0 : node.offsetWidth) || 0, (stringNode === null || stringNode === void 0 ? void 0 : stringNode.offsetWidth) || 0];
+      if (nodeWidth !== 0 && stringNodeWidth !== 0 && gap * 2 < nodeWidth) {
+        const scale = nodeWidth - gap * 2 > stringNodeWidth ? 1 : (nodeWidth - gap * 2) / stringNodeWidth;
+        this._adapter.setScale(scale);
+      }
+    };
+  }
+  init() {
+    const {
+      children
+    } = this.getProps();
+    if (typeof children === "string") {
+      this.changeScale();
+    }
   }
-  init() {}
   destroy() {}
   handleImgLoadError() {
     const {

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

@@ -6,6 +6,7 @@ export type tipFormatterBasicType = string | number | boolean | null;
 export interface SliderProps {
     defaultValue?: number | number[];
     disabled?: boolean;
+    showMarkLabel?: boolean;
     included?: boolean;
     marks?: Marks;
     max?: number;
@@ -18,8 +19,10 @@ export interface SliderProps {
     onAfterChange?: (value: SliderProps['value']) => void;
     onChange?: (value: SliderProps['value']) => void;
     onMouseUp?: (e: any) => void;
+    tooltipOnMark?: boolean;
     tooltipVisible?: boolean;
     style?: Record<string, any>;
+    showArrow?: boolean;
     className?: string;
     showBoundary?: boolean;
     railStyle?: Record<string, any>;

package/lib/cjs/timePicker/utils/index.js

@@ -22,7 +22,7 @@ const parseToDate = function (input) {
   let dateFnsLocale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _locale.zhCN;
   if (input instanceof Date) {
     return input;
-  } else if (typeof input === 'number' || !isNaN(Number(input))) {
+  } else if (typeof input === 'number') {
     return new Date((0, _toNumber2.default)(input));
   } else if (typeof input === 'string') {
     let curDate = new Date();

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

@@ -3,7 +3,8 @@
  * https://github.com/react-component/tree
  */
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
-export { KeyMapProps } from './treeUtil';
+import type { KeyMapProps } from './treeUtil';
+export type { KeyMapProps };
 export interface BasicTreeNodeProps {
     [x: string]: any;
     expanded?: boolean;

package/lib/cjs/tree/treeUtil.d.ts

@@ -84,6 +84,6 @@ export declare function getValueOrKey(data: any, keyMaps?: KeyMapProps): any;
 export declare function normalizeValue(value: any, withObject: boolean, keyMaps?: KeyMapProps): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities, keyMaps?: KeyMapProps): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

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' | 'cachedFlattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
+export interface BasicTreeSelectInnerData extends Pick<BasicTreeInnerData, 'keyEntities' | 'treeData' | 'flattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
     inputTriggerFocus: boolean;
     isOpen: boolean;
     rePosKey: number;
@@ -135,7 +135,6 @@ 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,12 +26,6 @@ class TreeSelectFoundation extends _foundation.default {
         this.close(e);
       });
     };
-    this.clearInputValue = () => {
-      const {
-        inputValue
-      } = this.getStates();
-      inputValue && this._adapter.updateInputValue('');
-    };
   }
   init() {
     const {
@@ -183,7 +177,7 @@ class TreeSelectFoundation extends _foundation.default {
     const isSearching = Boolean(inputValue);
     const treeNodeProps = {
       eventKey: key,
-      expanded: isSearching ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
+      expanded: isSearching && !this._isExpandControlled() ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
       selected: selectedKeys.includes(key),
       checked: realChecked,
       halfChecked: realHalfChecked,
@@ -456,8 +450,8 @@ class TreeSelectFoundation extends _foundation.default {
     expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
     const newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, newExpandedKeys, keyMaps);
     this._adapter.updateState({
-      expandedKeys: newExpandedKeys,
-      flattenNodes: newFlattenNodes,
+      expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
+      flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
       inputValue: '',
       motionKeys: new Set([]),
       filteredKeys: new Set([]),
@@ -506,8 +500,8 @@ class TreeSelectFoundation extends _foundation.default {
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
     this._adapter.updateState({
-      expandedKeys: newExpandedKeys,
-      flattenNodes: newFlattenNodes,
+      expandedKeys: this._isExpandControlled() ? expandedKeys : newExpandedKeys,
+      flattenNodes: this._isExpandControlled() ? flattenNodes : newFlattenNodes,
       motionKeys: new Set([]),
       filteredKeys: new Set(filteredOptsKeys),
       filteredExpandedKeys: newFilteredExpandedKeys,
@@ -715,7 +709,7 @@ class TreeSelectFoundation extends _foundation.default {
       return;
     }
     const isExpandControlled = this._isExpandControlled();
-    if (isSearching) {
+    if (isSearching && !isExpandControlled) {
       this.handleNodeExpandInSearch(e, treeNode);
       return;
     }

package/lib/cjs/upload/constants.d.ts

@@ -18,7 +18,7 @@ declare const strings: {
     DRAG_AREA_ILLEGAL: string;
     TRIGGER_AUTO: "auto";
     TRIGGER_CUSTOM: "custom";
-    UPLOAD_TRIGGER: ("custom" | "auto")[];
+    UPLOAD_TRIGGER: ("auto" | "custom")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

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

@@ -4,6 +4,8 @@ export interface AvatarAdapter<P = Record<string, any>, S = Record<string, any>>
     notifyLeave(event: any): void;
     notifyEnter(event: any): void;
     setFocusVisible: (focusVisible: boolean) => void;
+    setScale: (scale: number) => void;
+    getAvatarNode: () => HTMLSpanElement;
 }
 export default class AvatarFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<AvatarAdapter<P, S>, P, S> {
     constructor(adapter: AvatarAdapter<P, S>);
@@ -14,4 +16,5 @@ export default class AvatarFoundation<P = Record<string, any>, S = Record<string
     handleLeave(e: any): void;
     handleFocusVisible: (event: any) => void;
     handleBlur: () => void;
+    changeScale: () => void;
 }

package/lib/es/avatar/foundation.js

@@ -18,8 +18,27 @@ export default class AvatarFoundation extends BaseFoundation {
     this.handleBlur = () => {
       this._adapter.setFocusVisible(false);
     };
+    this.changeScale = () => {
+      const {
+        gap
+      } = this.getProps();
+      const node = this._adapter.getAvatarNode();
+      const stringNode = node === null || node === void 0 ? void 0 : node.firstChild;
+      const [nodeWidth, stringNodeWidth] = [(node === null || node === void 0 ? void 0 : node.offsetWidth) || 0, (stringNode === null || stringNode === void 0 ? void 0 : stringNode.offsetWidth) || 0];
+      if (nodeWidth !== 0 && stringNodeWidth !== 0 && gap * 2 < nodeWidth) {
+        const scale = nodeWidth - gap * 2 > stringNodeWidth ? 1 : (nodeWidth - gap * 2) / stringNodeWidth;
+        this._adapter.setScale(scale);
+      }
+    };
+  }
+  init() {
+    const {
+      children
+    } = this.getProps();
+    if (typeof children === "string") {
+      this.changeScale();
+    }
   }
-  init() {}
   destroy() {}
   handleImgLoadError() {
     const {

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

@@ -6,6 +6,7 @@ export type tipFormatterBasicType = string | number | boolean | null;
 export interface SliderProps {
     defaultValue?: number | number[];
     disabled?: boolean;
+    showMarkLabel?: boolean;
     included?: boolean;
     marks?: Marks;
     max?: number;
@@ -18,8 +19,10 @@ export interface SliderProps {
     onAfterChange?: (value: SliderProps['value']) => void;
     onChange?: (value: SliderProps['value']) => void;
     onMouseUp?: (e: any) => void;
+    tooltipOnMark?: boolean;
     tooltipVisible?: boolean;
     style?: Record<string, any>;
+    showArrow?: boolean;
     className?: string;
     showBoundary?: boolean;
     railStyle?: Record<string, any>;

package/lib/es/timePicker/utils/index.js

@@ -15,7 +15,7 @@ export const parseToDate = function (input) {
   let dateFnsLocale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultLocale;
   if (input instanceof Date) {
     return input;
-  } else if (typeof input === 'number' || !isNaN(Number(input))) {
+  } else if (typeof input === 'number') {
     return new Date(_toNumber(input));
   } else if (typeof input === 'string') {
     let curDate = new Date();

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

@@ -3,7 +3,8 @@
  * https://github.com/react-component/tree
  */
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
-export { KeyMapProps } from './treeUtil';
+import type { KeyMapProps } from './treeUtil';
+export type { KeyMapProps };
 export interface BasicTreeNodeProps {
     [x: string]: any;
     expanded?: boolean;

package/lib/es/tree/treeUtil.d.ts

@@ -84,6 +84,6 @@ export declare function getValueOrKey(data: any, keyMaps?: KeyMapProps): any;
 export declare function normalizeValue(value: any, withObject: boolean, keyMaps?: KeyMapProps): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities, keyMaps?: KeyMapProps): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

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' | 'cachedFlattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
+export interface BasicTreeSelectInnerData extends Pick<BasicTreeInnerData, 'keyEntities' | 'treeData' | 'flattenNodes' | 'selectedKeys' | 'checkedKeys' | 'halfCheckedKeys' | 'motionKeys' | 'motionType' | 'expandedKeys' | 'filteredKeys' | 'filteredExpandedKeys' | 'filteredShownKeys' | 'cachedKeyValuePairs' | 'inputValue' | 'disabledKeys' | 'loadedKeys' | 'loadingKeys' | 'realCheckedKeys'> {
     inputTriggerFocus: boolean;
     isOpen: boolean;
     rePosKey: number;
@@ -135,7 +135,6 @@ 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,12 +19,6 @@ export default class TreeSelectFoundation extends BaseFoundation {
         this.close(e);
       });
     };
-    this.clearInputValue = () => {
-      const {
-        inputValue
-      } = this.getStates();
-      inputValue && this._adapter.updateInputValue('');
-    };
   }
   init() {
     const {
@@ -176,7 +170,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
     const isSearching = Boolean(inputValue);
     const treeNodeProps = {
       eventKey: key,
-      expanded: isSearching ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
+      expanded: isSearching && !this._isExpandControlled() ? filteredExpandedKeys.has(key) : expandedKeys.has(key),
       selected: selectedKeys.includes(key),
       checked: realChecked,
       halfChecked: realHalfChecked,
@@ -449,8 +443,8 @@ export default class TreeSelectFoundation extends BaseFoundation {
     expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
     const newFlattenNodes = flattenTreeData(treeData, newExpandedKeys, keyMaps);
     this._adapter.updateState({
-      expandedKeys: newExpandedKeys,
-      flattenNodes: newFlattenNodes,
+      expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
+      flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
       inputValue: '',
       motionKeys: new Set([]),
       filteredKeys: new Set([]),
@@ -499,8 +493,8 @@ export default class TreeSelectFoundation extends BaseFoundation {
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
     this._adapter.updateState({
-      expandedKeys: newExpandedKeys,
-      flattenNodes: newFlattenNodes,
+      expandedKeys: this._isExpandControlled() ? expandedKeys : newExpandedKeys,
+      flattenNodes: this._isExpandControlled() ? flattenNodes : newFlattenNodes,
       motionKeys: new Set([]),
       filteredKeys: new Set(filteredOptsKeys),
       filteredExpandedKeys: newFilteredExpandedKeys,
@@ -708,7 +702,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
       return;
     }
     const isExpandControlled = this._isExpandControlled();
-    if (isSearching) {
+    if (isSearching && !isExpandControlled) {
       this.handleNodeExpandInSearch(e, treeNode);
       return;
     }

package/lib/es/upload/constants.d.ts

@@ -18,7 +18,7 @@ declare const strings: {
     DRAG_AREA_ILLEGAL: string;
     TRIGGER_AUTO: "auto";
     TRIGGER_CUSTOM: "custom";
-    UPLOAD_TRIGGER: ("custom" | "auto")[];
+    UPLOAD_TRIGGER: ("auto" | "custom")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

package/package.json

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

package/slider/foundation.ts

@@ -12,6 +12,7 @@ export type tipFormatterBasicType = string | number | boolean | null;
 export interface SliderProps{
     defaultValue?: number | number[];
     disabled?: boolean;
+    showMarkLabel?: boolean;
     included?: boolean; // Whether to juxtapose. Allow dragging
     marks?: Marks; // Scale
     max?: number;
@@ -24,8 +25,10 @@ export interface SliderProps{
     onAfterChange?: (value: SliderProps['value']) => void; // triggered when mouse up and clicked
     onChange?: (value: SliderProps['value']) => void;
     onMouseUp?: (e: any) => void;
+    tooltipOnMark?: boolean;
     tooltipVisible?: boolean;
     style?: Record<string, any>;
+    showArrow?: boolean; 
     className?: string;
     showBoundary?: boolean;
     railStyle?: Record<string, any>;

package/timePicker/utils/index.ts

@@ -14,7 +14,7 @@ import { zhCN as defaultLocale } from 'date-fns/locale';
 export const parseToDate = (input: string | Date | number, formatToken = strings.DEFAULT_FORMAT, dateFnsLocale = defaultLocale) => {
     if (input instanceof Date) {
         return input;
-    } else if (typeof input === 'number' || !isNaN(Number(input))) {
+    } else if (typeof input === 'number') {
         return new Date(toNumber(input));
     } else if (typeof input === 'string') {
         let curDate = new Date();

package/tree/foundation.ts

@@ -22,7 +22,8 @@ import {
     calcDropActualPosition
 } from './treeUtil';
 
-export { KeyMapProps } from './treeUtil';
+import type { KeyMapProps } from './treeUtil';
+export type { KeyMapProps };
 
 export interface BasicTreeNodeProps {
     [x: string]: any;

package/treeSelect/foundation.ts

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