File tree Expand file tree Collapse file tree 1 file changed +6
-11
lines changed Expand file tree Collapse file tree 1 file changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -15,26 +15,21 @@ export default function useSearchConfig(
15
15
treeNodeFilterProp,
16
16
} = props ;
17
17
return React . useMemo < [ boolean | undefined , SearchConfig ] > ( ( ) => {
18
- const legacysearchConfig : SearchConfig = {
18
+ const searchConfig : SearchConfig = {
19
19
searchValue : searchValue ?? inputValue ,
20
20
onSearch,
21
21
autoClearSearchValue,
22
22
filterTreeNode,
23
23
treeNodeFilterProp,
24
+ ...( typeof showSearch === 'object' ? showSearch : { } ) ,
24
25
} ;
25
-
26
- if ( showSearch === undefined || showSearch === true ) {
27
- return [ showSearch as boolean , legacysearchConfig ] ;
28
- }
29
-
30
- if ( ! showSearch ) {
26
+ if ( showSearch === false ) {
31
27
return [ false , { } ] ;
32
28
}
33
29
34
- const searchConfig = {
35
- ...legacysearchConfig ,
36
- ...showSearch ,
37
- } ;
30
+ if ( showSearch === undefined ) {
31
+ return [ undefined , searchConfig ] ;
32
+ }
38
33
39
34
return [ true , searchConfig ] ;
40
35
} , [
You can’t perform that action at this time.
0 commit comments