From 0b39e46192c6258d5bf9d3b6992b84edb0b641d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20L=C3=BCnborg?= Date: Fri, 11 Nov 2022 05:01:10 +0100 Subject: [PATCH] fix(custom-elements): also dispatch hyphenated version of emitted events (#5378) fix #5373 --- .../__tests__/customElement.spec.ts | 24 +++++++++++++++++-- packages/runtime-dom/src/apiCustomElement.ts | 13 ++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/packages/runtime-dom/__tests__/customElement.spec.ts b/packages/runtime-dom/__tests__/customElement.spec.ts index c45aaa0081d..eccbe4d425f 100644 --- a/packages/runtime-dom/__tests__/customElement.spec.ts +++ b/packages/runtime-dom/__tests__/customElement.spec.ts @@ -232,7 +232,12 @@ describe('defineCustomElement', () => { emit('created') return () => h('div', { - onClick: () => emit('my-click', 1) + onClick: () => { + emit('my-click', 1) + }, + onMousedown: () => { + emit('myEvent', 1) // validate hypenization + } }) } }) @@ -252,11 +257,26 @@ describe('defineCustomElement', () => { const spy = jest.fn() e.addEventListener('my-click', spy) e.shadowRoot!.childNodes[0].dispatchEvent(new CustomEvent('click')) - expect(spy).toHaveBeenCalled() + expect(spy).toHaveBeenCalledTimes(1) expect(spy.mock.calls[0][0]).toMatchObject({ detail: [1] }) }) + + // #5373 + test('case transform for camelCase event', () => { + container.innerHTML = `` + const e = container.childNodes[0] as VueElement + const spy1 = jest.fn() + e.addEventListener('myEvent', spy1) + const spy2 = jest.fn() + // emitting myEvent, but listening for my-event. This happens when + // using the custom element in a Vue template + e.addEventListener('my-event', spy2) + e.shadowRoot!.childNodes[0].dispatchEvent(new CustomEvent('mousedown')) + expect(spy1).toHaveBeenCalledTimes(1) + expect(spy2).toHaveBeenCalledTimes(1) + }) }) describe('slots', () => { diff --git a/packages/runtime-dom/src/apiCustomElement.ts b/packages/runtime-dom/src/apiCustomElement.ts index 5bd81345a45..92bd2f3ad3d 100644 --- a/packages/runtime-dom/src/apiCustomElement.ts +++ b/packages/runtime-dom/src/apiCustomElement.ts @@ -351,8 +351,7 @@ export class VueElement extends BaseClass { } } - // intercept emit - instance.emit = (event: string, ...args: any[]) => { + const dispatch = (event: string, args: any[]) => { this.dispatchEvent( new CustomEvent(event, { detail: args @@ -360,6 +359,16 @@ export class VueElement extends BaseClass { ) } + // intercept emit + instance.emit = (event: string, ...args: any[]) => { + // dispatch both the raw and hyphenated versions of an event + // to match Vue behavior + dispatch(event, args) + if (hyphenate(event) !== event) { + dispatch(hyphenate(event), args) + } + } + // locate nearest Vue custom element parent for provide/inject let parent: Node | null = this while (