github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: ConfigProvider error for style, close #6368

pull/6382/head
tangjinzhou 2023-03-21 15:08:16 +08:00
parent 4d2a37fcd3
commit bfcbd5bdef
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/config-provider/index.tsx
View File

@ -27,8 +27,7 @@ import {
import { useProviderSize } from './SizeContext'; import { useProviderSize } from './SizeContext';
import { useProviderDisabled } from './DisabledContext'; import { useProviderDisabled } from './DisabledContext';
import { createTheme } from '../_util/cssinjs'; import { createTheme } from '../_util/cssinjs';
import { useDesignTokenProvider } from '../theme/internal'; import { DesignTokenProvider } from '../theme/internal';
import { toReactive } from '../_util/toReactive';
export type { export type {
ConfigProviderProps, ConfigProviderProps,
@ -235,7 +234,6 @@ const ConfigProvider = defineComponent({
}, },
}; };
}); });
useDesignTokenProvider(toReactive(memoTheme));
const validateMessagesRef = computed(() => { const validateMessagesRef = computed(() => {
// Additional Form provider // Additional Form provider
let validateMessages: ValidateMessages = {}; let validateMessages: ValidateMessages = {};
@ -257,9 +255,12 @@ const ConfigProvider = defineComponent({
useProviderDisabled(componentDisabled); useProviderDisabled(componentDisabled);
const renderProvider = (legacyLocale: Locale) => { const renderProvider = (legacyLocale: Locale) => {
let childNode = shouldWrapSSR.value ? wrapSSR(slots.default?.()) : slots.default?.();
if (props.theme)
childNode = <DesignTokenProvider value={memoTheme.value}>{childNode}</DesignTokenProvider>;
return ( return (
<LocaleProvider locale={locale.value || legacyLocale} ANT_MARK__={ANT_MARK}> <LocaleProvider locale={locale.value || legacyLocale} ANT_MARK__={ANT_MARK}>
{shouldWrapSSR.value ? wrapSSR(slots.default?.()) : slots.default?.()} {childNode}
</LocaleProvider> </LocaleProvider>
); );
}; };