blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

chore(ConfigProvider): update var name and init execute the sync function twice (#12248)

Browse Source
This commit is contained in:
ShuGang Zhou 2023-09-04 22:21:56 +08:00 committed by GitHub
parent 91a92b2b06
commit f553a87037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/vant/src/config-provider/ConfigProvider.tsx
View File

@ -113,25 +113,19 @@ export default defineComponent({
onDeactivated(removeTheme); onDeactivated(removeTheme);
onBeforeUnmount(removeTheme); onBeforeUnmount(removeTheme);
watch( watch(style, (newStyle, oldStyle) => {
style, if (props.themeVarsScope === 'global') {
(newStyle, oldStyle) => { syncThemeVarsOnRoot(
if (props.themeVarsScope === 'global') { newStyle as Record<string, Numeric>,
syncThemeVarsOnRoot( oldStyle as Record<string, Numeric>,
newStyle as Record<string, Numeric>, );
oldStyle as Record<string, Numeric>, }
); });
}
},
{
immediate: true,
},
);
watch( watch(
() => props.themeVarsScope, () => props.themeVarsScope,
(newScope, oldStyle) => { (newScope, oldScope) => {
if (oldStyle === 'global') { if (oldScope === 'global') {
// remove on Root // remove on Root
syncThemeVarsOnRoot({}, style.value as Record<string, Numeric>); syncThemeVarsOnRoot({}, style.value as Record<string, Numeric>);
} }
@ -140,10 +134,12 @@ export default defineComponent({
syncThemeVarsOnRoot(style.value as Record<string, Numeric>, {}); syncThemeVarsOnRoot(style.value as Record<string, Numeric>, {});
} }
}, },
{
immediate: true,
},
); );
if (props.themeVarsScope === 'global') {
// add on root
syncThemeVarsOnRoot(style.value as Record<string, Numeric>, {});
}
} }
provide(CONFIG_PROVIDER_KEY, props); provide(CONFIG_PROVIDER_KEY, props);