Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/runtime-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ export { baseEmit, isEmitListener } from './componentEmits'
/**
* @internal
*/
export { queueJob, flushOnAppMount } from './scheduler'
export { queueJob, flushOnAppMount, SchedulerJobFlags } from './scheduler'
/**
* @internal
*/
Expand Down
43 changes: 42 additions & 1 deletion packages/runtime-vapor/__tests__/componentEmits.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ import {
isEmitListener,
nextTick,
onBeforeUnmount,
ref,
toHandlers,
} from '@vue/runtime-dom'
import { createComponent, defineVaporComponent } from '../src'
import {
createComponent,
createIf,
defineVaporComponent,
template,
} from '../src'
import { makeRender } from './_utils'

const define = makeRender()
Expand Down Expand Up @@ -444,4 +450,39 @@ describe('component: emit', () => {

expect(handler).toHaveBeenCalledTimes(1)
})

test('should re-queue when child emit mutates parent state during update', async () => {
const show = ref(false)
const calls: string[] = []

const { component: Child } = define({
emits: ['change'],
setup(_: any, { emit }: any) {
emit('change')
return template('<p>child</p>')()
},
})

const { host } = define({
setup() {
const onChange = () => {
calls.push(`change:${show.value}`)
show.value = false
}
return createIf(
() => show.value,
() =>
createComponent(Child, {
onChange: () => onChange,
}),
)
},
}).render()

show.value = true
await nextTick()

expect(calls).toEqual(['change:true'])
expect(host.innerHTML).toBe('<!--if-->')
})
})
7 changes: 7 additions & 0 deletions packages/runtime-vapor/src/renderEffect.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { EffectFlags, type EffectScope, ReactiveEffect } from '@vue/reactivity'
import {
type SchedulerJob,
SchedulerJobFlags,
currentInstance,
queueJob,
queuePostFlushCb,
Expand Down Expand Up @@ -53,6 +54,12 @@ export class RenderEffect extends ReactiveEffect {

this.job = job
this.i = instance

// Allow self re-queue when render/hook logic mutates reactive state.
// Safe in Vapor because updates are always async via queueJob(), and
// isUpdating prevents duplicate bu/u hooks on re-entry.
this.flags |= EffectFlags.ALLOW_RECURSE
this.job.flags! |= SchedulerJobFlags.ALLOW_RECURSE
}

fn(): void {
Expand Down
Loading