Skip to content

Commit

Permalink
fix(runtime-dom): useCssVars work with createStaticVNode
Browse files Browse the repository at this point in the history
chore: improve code

chore: improve code
  • Loading branch information
edison1105 committed May 29, 2021
1 parent d6607c9 commit b8d329d
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
23 changes: 23 additions & 0 deletions packages/runtime-dom/__tests__/helpers/useCssVars.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
ref,
render,
useCssVars,
createStaticVNode,
h,
reactive,
nextTick,
Expand Down Expand Up @@ -140,4 +141,26 @@ describe('useCssVars', () => {
expect((c as HTMLElement).style.getPropertyValue(`--color`)).toBe('red')
}
})

test('with createStaticVNode', async () => {
const state = reactive({ color: 'red' })
const root = document.createElement('div')

const App = {
setup() {
useCssVars(() => state)
return () => [
h('div'),
createStaticVNode('<div>1</div><div><span>2</span></div>', 2),
h('div')
]
}
}

render(h(App), root)
await nextTick()
for (const c of [].slice.call(root.children as any)) {
expect((c as HTMLElement).style.getPropertyValue(`--color`)).toBe('red')
}
})
})
21 changes: 21 additions & 0 deletions packages/runtime-dom/src/helpers/useCssVars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
warn,
VNode,
Fragment,
Static,
onUpdated,
watchEffect
} from '@vue/runtime-core'
Expand Down Expand Up @@ -53,5 +54,25 @@ function setVarsOnVNode(vnode: VNode, vars: Record<string, string>) {
}
} else if (vnode.type === Fragment) {
;(vnode.children as VNode[]).forEach(c => setVarsOnVNode(c, vars))
} else if (vnode.type === Static) {
const { el, anchor } = vnode
let current: HTMLElement | null = el as HTMLElement
while (current) {
setVarsOnElement(current, vars)
if (current === anchor) break
current = current.nextSibling as HTMLElement
}
}

function setVarsOnElement(el: HTMLElement, vars: Record<string, string>) {
const style = el.style
for (const key in vars) {
style.setProperty(`--${key}`, vars[key])
}

for (var i = 0; i < el.children.length; i++) {
const n = el.children[i]
setVarsOnElement(n as HTMLElement, vars)
}
}
}

0 comments on commit b8d329d

Please sign in to comment.