fix(v-on): refactor DOM event options modifer handling
fix #1567 Previously multiple `v-on` handlers with different event attach option modifers (`.once`, `.capture` and `.passive`) are generated as an array of objects in the form of `[{ handler, options }]` - however, this makes it pretty complex for `runtime-dom` to properly handle all possible value permutations, as each handler may need to be attached with different options. With this commit, they are now generated as event props with different keys - e.g. `v-on:click.capture` is now generated as a prop named `onClick.capture`. This allows them to be patched as separate props which makes the runtime handling much simpler.
This commit is contained in:
@@ -57,17 +57,11 @@ describe(`runtime-dom: events patching`, () => {
|
||||
expect(fn).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('should support event options', async () => {
|
||||
it('should support event option modifiers', async () => {
|
||||
const el = document.createElement('div')
|
||||
const event = new Event('click')
|
||||
const fn = jest.fn()
|
||||
const nextValue = {
|
||||
handler: fn,
|
||||
options: {
|
||||
once: true
|
||||
}
|
||||
}
|
||||
patchProp(el, 'onClick', null, nextValue)
|
||||
patchProp(el, 'onClick.once.capture', null, fn)
|
||||
el.dispatchEvent(event)
|
||||
await timeout()
|
||||
el.dispatchEvent(event)
|
||||
@@ -75,39 +69,12 @@ describe(`runtime-dom: events patching`, () => {
|
||||
expect(fn).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('should support varying event options', async () => {
|
||||
const el = document.createElement('div')
|
||||
const event = new Event('click')
|
||||
const prevFn = jest.fn()
|
||||
const nextFn = jest.fn()
|
||||
const nextValue = {
|
||||
handler: nextFn,
|
||||
options: {
|
||||
once: true
|
||||
}
|
||||
}
|
||||
patchProp(el, 'onClick', null, prevFn)
|
||||
patchProp(el, 'onClick', prevFn, nextValue)
|
||||
el.dispatchEvent(event)
|
||||
await timeout()
|
||||
el.dispatchEvent(event)
|
||||
await timeout()
|
||||
expect(prevFn).not.toHaveBeenCalled()
|
||||
expect(nextFn).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('should unassign event handler with options', async () => {
|
||||
const el = document.createElement('div')
|
||||
const event = new Event('click')
|
||||
const fn = jest.fn()
|
||||
const nextValue = {
|
||||
handler: fn,
|
||||
options: {
|
||||
once: true
|
||||
}
|
||||
}
|
||||
patchProp(el, 'onClick', null, nextValue)
|
||||
patchProp(el, 'onClick', nextValue, null)
|
||||
patchProp(el, 'onClick.capture', null, fn)
|
||||
patchProp(el, 'onClick.capture', fn, null)
|
||||
el.dispatchEvent(event)
|
||||
await timeout()
|
||||
el.dispatchEvent(event)
|
||||
|
||||
Reference in New Issue
Block a user