mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-18 14:13:37 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

chore: Fix LocaleReceiver ts define

Browse Source
This commit is contained in:
zombiej 2020-08-22 22:31:20 +08:00
parent 5a3bceea28
commit 40473cfa19
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/locale-provider/LocaleReceiver.tsx
View File

@ -61,8 +61,9 @@ export function useLocaleReceiver<T extends LocaleComponent>(
const componentLocale = React.useMemo(() => {
const locale = defaultLocale || defaultLocaleData[componentName || 'global'];
const localeFromContext = componentName && antLocale ? antLocale[componentName] : {};
return {
...(typeof locale === 'function' ? locale() : locale),
...(typeof locale === 'function' ? (locale as Function)() : locale),
...(localeFromContext || {}),
};
}, [componentName, defaultLocale, antLocale]);