File tree Expand file tree Collapse file tree 2 files changed +27
-11
lines changed Expand file tree Collapse file tree 2 files changed +27
-11
lines changed Original file line number Diff line number Diff line change @@ -16,10 +16,18 @@ export type GetConfigProviderContext = () => [React.Context<DefaultConfigConsume
16
16
17
17
export function useMergedConfigContext ( getConfigProviderContext ?: GetConfigProviderContext ) {
18
18
19
- const [ ConfigProviderContext = { } ] = getConfigProviderContext ?.( ) ?? [ ] ;
19
+ const [ ConfigProviderContext ] = getConfigProviderContext ?.( ) ?? [ ] ;
20
20
21
- return React . useContext ( {
22
- ...DefaultConfigProviderContext ,
23
- ...ConfigProviderContext ,
24
- } )
25
- }
21
+ const defaultContext = React . useContext ( DefaultConfigProviderContext ) ;
22
+
23
+ const context = React . useContext < DefaultConfigConsumerProps > ( ConfigProviderContext ) ;
24
+
25
+ const mergedContext = React . useMemo ( ( ) => {
26
+ return {
27
+ ...defaultContext ,
28
+ ...context
29
+ } ;
30
+ } , [ context , defaultContext ] ) ;
31
+
32
+ return mergedContext ;
33
+ }
Original file line number Diff line number Diff line change @@ -56,11 +56,19 @@ export function useMergedThemeContext<
56
56
hashed : true ,
57
57
} ) ;
58
58
59
- const [ ThemeProviderContext = { } ] = getThemeProviderContext ?.( ) ?? [ ] ;
59
+ const [ ThemeProviderContext ] = getThemeProviderContext ?.( ) ?? [ ] ;
60
60
61
- return React . useContext ( {
62
- ...DefaultThemeProviderContext ,
63
- ...ThemeProviderContext ,
64
- } ) ;
61
+ const defaultContext = React . useContext ( DefaultThemeProviderContext ) ;
62
+
63
+ const context = React . useContext ( ThemeProviderContext ) ;
64
+
65
+ const mergedContext = React . useMemo ( ( ) => {
66
+ return {
67
+ ...defaultContext ,
68
+ ...context
69
+ } ;
70
+ } , [ context , defaultContext ] ) ;
71
+
72
+ return mergedContext ;
65
73
}
66
74
You can’t perform that action at this time.
0 commit comments