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
4 changes: 4 additions & 0 deletions packages/runtime-core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -557,3 +557,7 @@ export { startMeasure, endMeasure } from './profiling'
* @internal
*/
export { initFeatureFlags } from './featureFlags'
/**
* @internal
*/
export { createInternalObject } from './internalObject'
48 changes: 47 additions & 1 deletion packages/runtime-vapor/__tests__/componentAttrs.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import { type Ref, nextTick, ref } from '@vue/runtime-dom'
import {
type Ref,
createApp,
defineComponent,
h,
nextTick,
ref,
} from '@vue/runtime-dom'
import {
createComponent,
defineVaporComponent,
Expand All @@ -8,6 +15,7 @@ import {
setProp,
setStyle,
template,
vaporInteropPlugin,
} from '../src'
import { makeRender } from './_utils'
import { stringifyStyle } from '@vue/shared'
Expand Down Expand Up @@ -361,4 +369,42 @@ describe('attribute fallthrough', () => {
const el = host.children[0]
expect(el.classList.length).toBe(0)
})

it('should not fallthrough emit handlers to vdom child', () => {
const VDomChild = defineComponent({
emits: ['click'],
setup(_, { emit }) {
return () => h('button', { onClick: () => emit('click') }, 'click me')
},
})

const fn = vi.fn()
const VaporChild = defineVaporComponent({
emits: ['click'],
setup() {
return createComponent(
VDomChild as any,
{ onClick: () => fn },
null,
true,
)
},
})

const App = {
setup() {
return () => h(VaporChild as any)
},
}

const root = document.createElement('div')
createApp(App).use(vaporInteropPlugin).mount(root)

expect(root.innerHTML).toBe('<button>click me</button>')
const button = root.querySelector('button')!
button.dispatchEvent(new Event('click'))

// fn should be called once
expect(fn).toHaveBeenCalledTimes(1)
})
})
11 changes: 10 additions & 1 deletion packages/runtime-vapor/src/vdomInterop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import {
type Slots,
type VNode,
type VaporInteropInterface,
createInternalObject,
createVNode,
currentInstance,
ensureRenderer,
isEmitListener,
onScopeDispose,
renderSlot,
shallowRef,
Expand Down Expand Up @@ -162,7 +164,14 @@ function createVDOMComponent(
// overwrite how the vdom instance handles props
vnode.vi = (instance: ComponentInternalInstance) => {
instance.props = wrapper.props
instance.attrs = wrapper.attrs

const attrs = (instance.attrs = createInternalObject())
for (const key in wrapper.attrs) {
if (!isEmitListener(instance.emitsOptions, key)) {
attrs[key] = wrapper.attrs[key]
}
}

instance.slots =
wrapper.slots === EMPTY_OBJ
? EMPTY_OBJ
Expand Down