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 11import React from 'react' ;
2+
23import { LocaleContext } from '../locale/useLocale' ;
34
45const ConfigProvider = ( { locale, children } ) => {
5- return < LocaleContext . Provider value = { { ... locale } } > { children } </ LocaleContext . Provider > ;
6+ return < LocaleContext . Provider value = { { locale } } > { children } </ LocaleContext . Provider > ;
67} ;
78
89export default ConfigProvider ;
Original file line number Diff line number Diff line change 11import { Locale } from './useLocale' ;
22
33const localeValues : Locale = {
4- locale : 'zh-CN ' ,
4+ locale : 'en-US ' ,
55 BlockHeader : {
66 expand : 'Expand' ,
77 collapse : 'Collapse' ,
Original file line number Diff line number Diff line change @@ -74,11 +74,9 @@ const useLocale = <C extends LocaleComponentName = LocaleComponentName>(
7474
7575 const getLocale = useMemo ( ( ) => {
7676 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 ] > ;
8280 } , [ componentName , fullLocale ] ) ;
8381
8482 return getLocale ;
You can’t perform that action at this time.
0 commit comments