Skip to content

Commit

Permalink
fix(runtime-dom): fix css v-bind for suspensed components (vuejs#8523)
Browse files Browse the repository at this point in the history
  • Loading branch information
baiwusanyu-c authored and lynxlangya committed May 30, 2024
1 parent f3497a6 commit f50030c
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 2 deletions.
57 changes: 57 additions & 0 deletions packages/runtime-dom/__tests__/helpers/useCssVars.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,63 @@ describe('useCssVars', () => {
}
})

test('with v-if & async component & suspense', async () => {
const state = reactive({ color: 'red' })
const root = document.createElement('div')
const show = ref(false)
let resolveAsync: any
let asyncPromise: any

const AsyncComp = {
setup() {
useCssVars(() => state)
asyncPromise = new Promise(r => {
resolveAsync = () => {
r(() => h('p', 'default'))
}
})
return asyncPromise
},
}

const App = {
setup() {
return () =>
h(Suspense, null, {
default: h('div', {}, show.value ? h(AsyncComp) : h('p')),
})
},
}

render(h(App), root)
await nextTick()
// AsyncComp resolve
show.value = true
await nextTick()
resolveAsync()
await asyncPromise.then(() => {})
// Suspense effects flush
await nextTick()
// css vars use with default tree
for (const c of [].slice.call(root.children as any)) {
expect(
((c as any).children[0] as HTMLElement).style.getPropertyValue(
`--color`,
),
).toBe(`red`)
}

state.color = 'green'
await nextTick()
for (const c of [].slice.call(root.children as any)) {
expect(
((c as any).children[0] as HTMLElement).style.getPropertyValue(
`--color`,
),
).toBe('green')
}
})

test('with subTree changed', async () => {
const state = reactive({ color: 'red' })
const value = ref(true)
Expand Down
3 changes: 1 addition & 2 deletions packages/runtime-dom/src/helpers/useCssVars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ export function useCssVars(getter: (ctx: any) => Record<string, string>) {
updateTeleports(vars)
}

watchPostEffect(setVars)

onMounted(() => {
watchPostEffect(setVars)
const ob = new MutationObserver(setVars)
ob.observe(instance.subTree.el!.parentNode, { childList: true })
onUnmounted(() => ob.disconnect())
Expand Down

0 comments on commit f50030c

Please sign in to comment.