diff --git a/src/TreeSelect.tsx b/src/TreeSelect.tsx index df71504b..5402608f 100644 --- a/src/TreeSelect.tsx +++ b/src/TreeSelect.tsx @@ -142,7 +142,12 @@ const TreeSelect = React.forwardRef((props, ref) // Search showSearch, - + searchValue: legacySearchValue, + inputValue: legacyinputValue, + onSearch: legacyOnSearch, + autoClearSearchValue: legacyAutoClearSearchValue, + filterTreeNode: legacyFilterTreeNode, + treeNodeFilterProp: legacytreeNodeFilterProp, // Selector showCheckedStrategy, treeNodeLabelProp, @@ -202,7 +207,15 @@ const TreeSelect = React.forwardRef((props, ref) const mergedLabelInValue = treeCheckStrictly || labelInValue; const mergedMultiple = mergedCheckable || multiple; - const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, props); + const searchProps = { + searchValue: legacySearchValue, + inputValue: legacyinputValue, + onSearch: legacyOnSearch, + autoClearSearchValue: legacyAutoClearSearchValue, + filterTreeNode: legacyFilterTreeNode, + treeNodeFilterProp: legacytreeNodeFilterProp, + }; + const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, searchProps); const { searchValue, onSearch, @@ -743,7 +756,7 @@ const TreeSelect = React.forwardRef((props, ref) displayValues={cachedDisplayValues} onDisplayValuesChange={onDisplayValuesChange} // >>> Search - {...searchConfig} + autoClearSearchValue={autoClearSearchValue} showSearch={mergedShowSearch} searchValue={mergedSearchValue} onSearch={onInternalSearch} diff --git a/src/hooks/useSearchConfig.ts b/src/hooks/useSearchConfig.ts index 3d30fd9e..e38e7350 100644 --- a/src/hooks/useSearchConfig.ts +++ b/src/hooks/useSearchConfig.ts @@ -1,10 +1,10 @@ -import type { SearchConfig, TreeSelectProps } from '@/TreeSelect'; +import type { SearchConfig } from '@/TreeSelect'; import * as React from 'react'; // Convert `showSearch` to unique config export default function useSearchConfig( showSearch: boolean | SearchConfig, - props: TreeSelectProps, + props: SearchConfig & { inputValue: string }, ) { const { searchValue,