Skip to content

Commit 9ce12c0

Browse files
committed
feat(configprovider): change ConfigProvider value and getLocale return value
1 parent 9fa760d commit 9ce12c0

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import React from 'react';
2+
23
import { LocaleContext } from '../locale/useLocale';
34

45
const ConfigProvider = ({ locale, children }) => {
5-
return <LocaleContext.Provider value={{ ...locale }}>{children}</LocaleContext.Provider>;
6+
return <LocaleContext.Provider value={{ locale }}>{children}</LocaleContext.Provider>;
67
};
78

89
export default ConfigProvider;

src/components/locale/en-US.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Locale } from './useLocale';
22

33
const localeValues: Locale = {
4-
locale: 'zh-CN',
4+
locale: 'en-US',
55
BlockHeader: {
66
expand: 'Expand',
77
collapse: 'Collapse',

src/components/locale/useLocale.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff 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;

0 commit comments

Comments
 (0)