Skip to content

Commit 2149593

Browse files
committed
feat(configprovider): update ConfigProvider ts and en locale text
1 parent 9881fba commit 2149593

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/locale/useLocale.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export interface Locale {
3232
SpreadSheet: {
3333
description: string;
3434
copy: string;
35+
copyCol: string;
3536
copyAll: string;
3637
};
3738
}
@@ -52,10 +53,8 @@ const useLocale = <C extends LocaleComponentName = LocaleComponentName>(
5253
const getLocale = useMemo(() => {
5354
const locale = defaultLocaleData[componentName] ?? {};
5455
const localeFromContext = fullLocale?.locale[componentName] ?? {};
55-
return {
56-
...(locale as unknown as object),
57-
...(localeFromContext as unknown as object),
58-
} as NonNullable<Locale[C]>;
56+
57+
return Object.assign({}, locale, localeFromContext) as NonNullable<Locale[C]>;
5958
}, [componentName, fullLocale]);
6059

6160
return getLocale;

0 commit comments

Comments
 (0)