Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix interoperability issue regarding Event properties #36386

Merged
merged 2 commits into from Jun 30, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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', () => {
GeoSot marked this conversation as resolved.
Show resolved Hide resolved
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)
})
})
})
})