parent
cb504c287f
commit
2302dea162
@ -7,7 +7,7 @@ describe(`events`, () => {
|
|||||||
const el = document.createElement('div')
|
const el = document.createElement('div')
|
||||||
const event = new Event('click')
|
const event = new Event('click')
|
||||||
const fn = jest.fn()
|
const fn = jest.fn()
|
||||||
patchEvent(el, 'click', null, fn, null)
|
patchEvent(el, 'onClick', null, fn, null)
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
@ -22,9 +22,9 @@ describe(`events`, () => {
|
|||||||
const event = new Event('click')
|
const event = new Event('click')
|
||||||
const prevFn = jest.fn()
|
const prevFn = jest.fn()
|
||||||
const nextFn = jest.fn()
|
const nextFn = jest.fn()
|
||||||
patchEvent(el, 'click', null, prevFn, null)
|
patchEvent(el, 'onClick', null, prevFn, null)
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
patchEvent(el, 'click', prevFn, nextFn, null)
|
patchEvent(el, 'onClick', prevFn, nextFn, null)
|
||||||
await timeout()
|
await timeout()
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
@ -39,7 +39,7 @@ describe(`events`, () => {
|
|||||||
const event = new Event('click')
|
const event = new Event('click')
|
||||||
const fn1 = jest.fn()
|
const fn1 = jest.fn()
|
||||||
const fn2 = jest.fn()
|
const fn2 = jest.fn()
|
||||||
patchEvent(el, 'click', null, [fn1, fn2], null)
|
patchEvent(el, 'onClick', null, [fn1, fn2], null)
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
expect(fn1).toHaveBeenCalledTimes(1)
|
expect(fn1).toHaveBeenCalledTimes(1)
|
||||||
@ -50,8 +50,8 @@ describe(`events`, () => {
|
|||||||
const el = document.createElement('div')
|
const el = document.createElement('div')
|
||||||
const event = new Event('click')
|
const event = new Event('click')
|
||||||
const fn = jest.fn()
|
const fn = jest.fn()
|
||||||
patchEvent(el, 'click', null, fn, null)
|
patchEvent(el, 'onClick', null, fn, null)
|
||||||
patchEvent(el, 'click', fn, null, null)
|
patchEvent(el, 'onClick', fn, null, null)
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
expect(fn).not.toHaveBeenCalled()
|
expect(fn).not.toHaveBeenCalled()
|
||||||
@ -67,7 +67,7 @@ describe(`events`, () => {
|
|||||||
once: true
|
once: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
patchEvent(el, 'click', null, nextValue, null)
|
patchEvent(el, 'onClick', null, nextValue, null)
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
@ -86,8 +86,8 @@ describe(`events`, () => {
|
|||||||
once: true
|
once: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
patchEvent(el, 'click', null, prevFn, null)
|
patchEvent(el, 'onClick', null, prevFn, null)
|
||||||
patchEvent(el, 'click', prevFn, nextValue, null)
|
patchEvent(el, 'onClick', prevFn, nextValue, null)
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
@ -106,12 +106,30 @@ describe(`events`, () => {
|
|||||||
once: true
|
once: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
patchEvent(el, 'click', null, nextValue, null)
|
patchEvent(el, 'onClick', null, nextValue, null)
|
||||||
patchEvent(el, 'click', nextValue, null, null)
|
patchEvent(el, 'onClick', nextValue, null, null)
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
el.dispatchEvent(event)
|
el.dispatchEvent(event)
|
||||||
await timeout()
|
await timeout()
|
||||||
expect(fn).not.toHaveBeenCalled()
|
expect(fn).not.toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should assign native onclick attribute', async () => {
|
||||||
|
const el = document.createElement('div')
|
||||||
|
const event = new Event('click')
|
||||||
|
const fn = ((window as any)._nativeClickSpy = jest.fn())
|
||||||
|
|
||||||
|
patchEvent(el, 'onclick', null, '_nativeClickSpy()' as any)
|
||||||
|
el.dispatchEvent(event)
|
||||||
|
await timeout()
|
||||||
|
expect(fn).toHaveBeenCalledTimes(1)
|
||||||
|
|
||||||
|
const fn2 = jest.fn()
|
||||||
|
patchEvent(el, 'onclick', null, fn2)
|
||||||
|
el.dispatchEvent(event)
|
||||||
|
await timeout()
|
||||||
|
expect(fn).toHaveBeenCalledTimes(1)
|
||||||
|
expect(fn2).toHaveBeenCalledTimes(1)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { EMPTY_OBJ } from '@vue/shared'
|
import { EMPTY_OBJ, isString } from '@vue/shared'
|
||||||
import {
|
import {
|
||||||
ComponentInternalInstance,
|
ComponentInternalInstance,
|
||||||
callWithAsyncErrorHandling
|
callWithAsyncErrorHandling
|
||||||
@ -66,11 +66,22 @@ export function removeEventListener(
|
|||||||
|
|
||||||
export function patchEvent(
|
export function patchEvent(
|
||||||
el: Element,
|
el: Element,
|
||||||
name: string,
|
rawName: string,
|
||||||
prevValue: EventValueWithOptions | EventValue | null,
|
prevValue: EventValueWithOptions | EventValue | null,
|
||||||
nextValue: EventValueWithOptions | EventValue | null,
|
nextValue: EventValueWithOptions | EventValue | null,
|
||||||
instance: ComponentInternalInstance | null = null
|
instance: ComponentInternalInstance | null = null
|
||||||
) {
|
) {
|
||||||
|
// support native onxxx handlers
|
||||||
|
if (rawName in el) {
|
||||||
|
if (isString(nextValue)) {
|
||||||
|
el.setAttribute(rawName, nextValue)
|
||||||
|
} else {
|
||||||
|
;(el as any)[rawName] = nextValue
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const name = rawName.slice(2).toLowerCase()
|
||||||
const prevOptions = prevValue && 'options' in prevValue && prevValue.options
|
const prevOptions = prevValue && 'options' in prevValue && prevValue.options
|
||||||
const nextOptions = nextValue && 'options' in nextValue && nextValue.options
|
const nextOptions = nextValue && 'options' in nextValue && nextValue.options
|
||||||
const invoker = prevValue && prevValue.invoker
|
const invoker = prevValue && prevValue.invoker
|
||||||
|
@ -29,13 +29,7 @@ export const patchProp: RendererOptions<Node, Element>['patchProp'] = (
|
|||||||
if (isOn(key)) {
|
if (isOn(key)) {
|
||||||
// ignore v-model listeners
|
// ignore v-model listeners
|
||||||
if (key.indexOf('onUpdate:') < 0) {
|
if (key.indexOf('onUpdate:') < 0) {
|
||||||
patchEvent(
|
patchEvent(el, key, prevValue, nextValue, parentComponent)
|
||||||
el,
|
|
||||||
key.slice(2).toLowerCase(),
|
|
||||||
prevValue,
|
|
||||||
nextValue,
|
|
||||||
parentComponent
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
} else if (!isSVG && key in el) {
|
} else if (!isSVG && key in el) {
|
||||||
patchDOMProp(
|
patchDOMProp(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user