Skip to content

Commit bfcbd5b

Browse files
committed
fix: ConfigProvider error for style, close #6368
1 parent 4d2a37f commit bfcbd5b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

components/config-provider/index.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import {
2727
import { useProviderSize } from './SizeContext';
2828
import { useProviderDisabled } from './DisabledContext';
2929
import { createTheme } from '../_util/cssinjs';
30-
import { useDesignTokenProvider } from '../theme/internal';
31-
import { toReactive } from '../_util/toReactive';
30+
import { DesignTokenProvider } from '../theme/internal';
3231

3332
export type {
3433
ConfigProviderProps,
@@ -235,7 +234,6 @@ const ConfigProvider = defineComponent({
235234
},
236235
};
237236
});
238-
useDesignTokenProvider(toReactive(memoTheme));
239237
const validateMessagesRef = computed(() => {
240238
// Additional Form provider
241239
let validateMessages: ValidateMessages = {};
@@ -257,9 +255,12 @@ const ConfigProvider = defineComponent({
257255
useProviderDisabled(componentDisabled);
258256

259257
const renderProvider = (legacyLocale: Locale) => {
258+
let childNode = shouldWrapSSR.value ? wrapSSR(slots.default?.()) : slots.default?.();
259+
if (props.theme)
260+
childNode = <DesignTokenProvider value={memoTheme.value}>{childNode}</DesignTokenProvider>;
260261
return (
261262
<LocaleProvider locale={locale.value || legacyLocale} ANT_MARK__={ANT_MARK}>
262-
{shouldWrapSSR.value ? wrapSSR(slots.default?.()) : slots.default?.()}
263+
{childNode}
263264
</LocaleProvider>
264265
);
265266
};

0 commit comments

Comments
 (0)