refactor: adjust useCSSVars scoped usage

diff --git a/packages/runtime-dom/__tests__/helpers/useCssVars.spec.ts b/packages/runtime-dom/__tests__/helpers/useCssVars.spec.ts
index b3407b3468a2cb5ca508dd720efc8415385e7694..6c4176864b93c29d064f8456c8b14f83059cfad3 100644 (file)
--- a/packages/runtime-dom/__tests__/helpers/useCssVars.spec.ts
+++ b/packages/runtime-dom/__tests__/helpers/useCssVars.spec.ts
@@ -64,13 +64,14 @@ describe('useCssVars', () => {
     }))
   })
 
-  test('with scopeId', async () => {
+  test('with <style scoped>', async () => {
     const id = 'v-12345'
 
     await assertCssVars(
       state => ({
+        __scopeId: id,
         setup() {
-          useCSSVars(() => state, id)
+          useCSSVars(() => state, true)
           return () => h('div')
         }
       }),

diff --git a/packages/runtime-dom/src/helpers/useCssVars.ts b/packages/runtime-dom/src/helpers/useCssVars.ts
index 480598ae844234dc163f15bfc0b466e12b2b8e38..631cb20b7e9455e7977c30ed252591a58d215015 100644 (file)
--- a/packages/runtime-dom/src/helpers/useCssVars.ts
+++ b/packages/runtime-dom/src/helpers/useCssVars.ts
@@ -5,13 +5,14 @@ import {
   watchEffect,
   warn,
   VNode,
-  Fragment
+  Fragment,
+  ComponentInternalInstance
 } from '@vue/runtime-core'
 import { ShapeFlags } from '@vue/shared/src'
 
 export function useCSSVars(
   getter: (ctx: ComponentPublicInstance) => Record<string, string>,
-  scopeId?: string
+  scoped = false
 ) {
   const instance = getCurrentInstance()
   if (!instance) {
@@ -21,7 +22,12 @@ export function useCSSVars(
   }
   onMounted(() => {
     watchEffect(() => {
-      setVarsOnVNode(instance.vnode, getter(instance.proxy!), scopeId)
+      setVarsOnVNode(
+        instance.subTree,
+        getter(instance.proxy!),
+        instance,
+        scoped
+      )
     })
   })
 }
@@ -29,7 +35,8 @@ export function useCSSVars(
 function setVarsOnVNode(
   vnode: VNode,
   vars: Record<string, string>,
-  scopeId?: string
+  owner: ComponentInternalInstance,
+  scoped: boolean
 ) {
   // drill down HOCs until it's a non-component vnode
   while (vnode.component) {
@@ -37,11 +44,14 @@ function setVarsOnVNode(
   }
   if (vnode.shapeFlag & ShapeFlags.ELEMENT && vnode.el) {
     const style = vnode.el.style
-    const prefix = scopeId ? scopeId + '-' : ''
+    const prefix =
+      scoped && owner.type.__scopeId ? `${owner.type.__scopeId}-` : ``
     for (const key in vars) {
       style.setProperty(`--${prefix}${key}`, vars[key])
     }
   } else if (vnode.type === Fragment) {
-    ;(vnode.children as VNode[]).forEach(c => setVarsOnVNode(c, vars, scopeId))
+    ;(vnode.children as VNode[]).forEach(c =>
+      setVarsOnVNode(c, vars, owner, scoped)
+    )
   }
 }