Skip to content

Commit d91b36b

Browse files
author
刘欢
committed
fix: remove omitDomProps, Transfer search props to useSearchConfig
1 parent 32444af commit d91b36b

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

src/TreeSelect.tsx

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ function isRawValue(value: SafeKey | LabeledValueType): value is SafeKey {
128128
return !value || typeof value !== 'object';
129129
}
130130

131-
const OMIT_DOM_PROPS = ['treeNodeFilterProp', 'filterTreeNode'];
132-
133131
const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref) => {
134132
const {
135133
id,
@@ -144,7 +142,12 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
144142

145143
// Search
146144
showSearch,
147-
145+
searchValue: legacySearchValue,
146+
inputValue: legacyinputValue,
147+
onSearch: legacyOnSearch,
148+
autoClearSearchValue: legacyAutoClearSearchValue,
149+
filterTreeNode: legacyFilterTreeNode,
150+
treeNodeFilterProp: legacytreeNodeFilterProp,
148151
// Selector
149152
showCheckedStrategy,
150153
treeNodeLabelProp,
@@ -204,7 +207,15 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
204207
const mergedLabelInValue = treeCheckStrictly || labelInValue;
205208
const mergedMultiple = mergedCheckable || multiple;
206209

207-
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);
208219
const {
209220
searchValue,
210221
onSearch,
@@ -745,13 +756,12 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
745756
displayValues={cachedDisplayValues}
746757
onDisplayValuesChange={onDisplayValuesChange}
747758
// >>> Search
748-
{...searchConfig}
759+
autoClearSearchValue={autoClearSearchValue}
749760
showSearch={mergedShowSearch}
750761
searchValue={mergedSearchValue}
751762
onSearch={onInternalSearch}
752763
// >>> Options
753764
OptionList={OptionList}
754-
omitDomProps={OMIT_DOM_PROPS}
755765
emptyOptions={!mergedTreeData.length}
756766
onPopupVisibleChange={onInternalPopupVisibleChange}
757767
popupMatchSelectWidth={popupMatchSelectWidth}

src/hooks/useSearchConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as React from 'react';
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)