Skip to content

Commit 03dd364

Browse files
EmilyyyLiu刘欢
andauthored
fix: add omitDomProps to baseSelect (#647)
* fix: add omitDomProps to baseSelect * fix: remove omitDomProps, Transfer search props to useSearchConfig * fix: lint error --------- Co-authored-by: 刘欢 <[email protected]>
1 parent 12a763d commit 03dd364

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/TreeSelect.tsx

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,12 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
142142

143143
// Search
144144
showSearch,
145-
145+
searchValue: legacySearchValue,
146+
inputValue: legacyinputValue,
147+
onSearch: legacyOnSearch,
148+
autoClearSearchValue: legacyAutoClearSearchValue,
149+
filterTreeNode: legacyFilterTreeNode,
150+
treeNodeFilterProp: legacytreeNodeFilterProp,
146151
// Selector
147152
showCheckedStrategy,
148153
treeNodeLabelProp,
@@ -202,7 +207,15 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
202207
const mergedLabelInValue = treeCheckStrictly || labelInValue;
203208
const mergedMultiple = mergedCheckable || multiple;
204209

205-
const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, props);
210+
const searchProps = {
211+
searchValue: legacySearchValue,
212+
inputValue: legacyinputValue,
213+
onSearch: legacyOnSearch,
214+
autoClearSearchValue: legacyAutoClearSearchValue,
215+
filterTreeNode: legacyFilterTreeNode,
216+
treeNodeFilterProp: legacytreeNodeFilterProp,
217+
};
218+
const [mergedShowSearch, searchConfig] = useSearchConfig(showSearch, searchProps);
206219
const {
207220
searchValue,
208221
onSearch,
@@ -743,7 +756,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
743756
displayValues={cachedDisplayValues}
744757
onDisplayValuesChange={onDisplayValuesChange}
745758
// >>> Search
746-
{...searchConfig}
759+
autoClearSearchValue={autoClearSearchValue}
747760
showSearch={mergedShowSearch}
748761
searchValue={mergedSearchValue}
749762
onSearch={onInternalSearch}

src/hooks/useSearchConfig.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import type { SearchConfig, TreeSelectProps } from '@/TreeSelect';
1+
import type { SearchConfig } from '@/TreeSelect';
22
import * as React from 'react';
33

44
// Convert `showSearch` to unique config
55
export default function useSearchConfig(
66
showSearch: boolean | SearchConfig,
7-
props: TreeSelectProps,
7+
props: SearchConfig & { inputValue: string },
88
) {
99
const {
1010
searchValue,

0 commit comments

Comments
 (0)