File tree Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Expand file tree Collapse file tree 3 files changed +6
-7
lines changed Original file line number Diff line number Diff line change 1
1
import React from 'react' ;
2
+
2
3
import { LocaleContext } from '../locale/useLocale' ;
3
4
4
5
const ConfigProvider = ( { locale, children } ) => {
5
- return < LocaleContext . Provider value = { { ... locale } } > { children } </ LocaleContext . Provider > ;
6
+ return < LocaleContext . Provider value = { { locale } } > { children } </ LocaleContext . Provider > ;
6
7
} ;
7
8
8
9
export default ConfigProvider ;
Original file line number Diff line number Diff line change 1
1
import { Locale } from './useLocale' ;
2
2
3
3
const localeValues : Locale = {
4
- locale : 'zh-CN ' ,
4
+ locale : 'en-US ' ,
5
5
BlockHeader : {
6
6
expand : 'Expand' ,
7
7
collapse : 'Collapse' ,
Original file line number Diff line number Diff line change @@ -74,11 +74,9 @@ const useLocale = <C extends LocaleComponentName = LocaleComponentName>(
74
74
75
75
const getLocale = useMemo ( ( ) => {
76
76
const locale = defaultLocaleData [ componentName ] ?? { } ;
77
- const localeFromContext = fullLocale ?. [ componentName as keyof LocaleContextProps ] ?? { } ;
78
- return {
79
- ...locale ,
80
- ...localeFromContext ,
81
- } as NonNullable < Locale [ C ] > ;
77
+ const localeFromContext = fullLocale ?. locale [ componentName ] ?? { } ;
78
+
79
+ return Object . assign ( { } , locale , localeFromContext ) as NonNullable < Locale [ C ] > ;
82
80
} , [ componentName , fullLocale ] ) ;
83
81
84
82
return getLocale ;
You can’t perform that action at this time.
0 commit comments