Skip to content

Commit

Permalink
Fix interoperability issue regarding Event properties (#36386)
Browse files Browse the repository at this point in the history
* Fix interoperability issue regarding Event properties

- make possible to re-set read-only event properties
- use hydrateObj() to set delegateTarget property

Fixes #36207

Co-authored-by: GeoSot <geo.sotis@gmail.com>
Co-authored-by: Julien Déramond <julien.deramond@orange.com>
  • Loading branch information
3 people committed Jun 30, 2022
1 parent 4082a3b commit 505e023
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 7 deletions.
19 changes: 12 additions & 7 deletions js/src/dom/event-handler.js
Expand Up @@ -89,7 +89,7 @@ function getElementEvents(element) {

function bootstrapHandler(element, fn) {
return function handler(event) {
event.delegateTarget = element
hydrateObj(event, { delegateTarget: element })

if (handler.oneOff) {
EventHandler.off(element, event.type, fn)
Expand All @@ -109,7 +109,7 @@ function bootstrapDelegationHandler(element, selector, fn) {
continue
}

event.delegateTarget = target
hydrateObj(event, { delegateTarget: target })

if (handler.oneOff) {
EventHandler.off(element, event.type, selector, fn)
Expand Down Expand Up @@ -302,11 +302,16 @@ const EventHandler = {

function hydrateObj(obj, meta) {
for (const [key, value] of Object.entries(meta || {})) {
Object.defineProperty(obj, key, {
get() {
return value
}
})
try {
obj[key] = value
} catch {
Object.defineProperty(obj, key, {
configurable: true,
get() {
return value
}
})
}
}

return obj
Expand Down
37 changes: 37 additions & 0 deletions js/tests/unit/dom/event-handler.spec.js
Expand Up @@ -441,4 +441,41 @@ describe('EventHandler', () => {
expect(i).toEqual(5)
})
})

describe('general functionality', () => {
it('should hydrate properties, and make them configurable', () => {
return new Promise(resolve => {
fixtureEl.innerHTML = [
'<div id="div1">',
' <div id="div2"></div>',
' <div id="div3"></div>',
'</div>'
].join('')

const div1 = fixtureEl.querySelector('#div1')
const div2 = fixtureEl.querySelector('#div2')
const div3 = fixtureEl.querySelector('#div3')

EventHandler.on(div1, 'click', event => {
event.originalTarget = div3

expect(event.currentTarget).toBe(div2)

Object.defineProperty(event, 'currentTarget', {
configurable: true,
get() {
return div1
}
})

expect(event.currentTarget).toBe(div1)
resolve()
})

expect(() => {
EventHandler.trigger(div1, 'click', { delegateTarget: div2, originalTarget: null, currentTarget: div2 })
}).not.toThrowError(TypeError)
})
})
})
})

0 comments on commit 505e023

Please sign in to comment.