Skip to content

Commit 2af862c

Browse files
authored
fix: Use closures to store listeners and fallback to window (#18795)
Doesn't use this reference directly to store a list of event listeners, but uses closures. Calls the original addEventListener functions via .call(this, arguments) to avoid explosions due to this being undefined. Fixes #18793
1 parent 0a82372 commit 2af862c

1 file changed

Lines changed: 44 additions & 44 deletions

File tree

  • flow-server/src/main/resources/com/vaadin/flow/server/frontend

‎flow-server/src/main/resources/com/vaadin/flow/server/frontend/Flow.tsx‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -281,74 +281,74 @@ export const serverSideRoutes = [
281281
(function () {
282282
"use strict";
283283
[Document, Window].forEach((cst) => {
284-
// save the original methods before overwriting them
285284
if (typeof cst === "function") {
286-
// @ts-ignore
287-
cst.prototype._addEventListener = cst.prototype.addEventListener;
288-
// @ts-ignore
289-
cst.prototype._removeEventListener = cst.prototype.removeEventListener;
290-
291-
cst.prototype.addEventListener = function (type: string, listener: EventListener,
292-
useCapture: boolean = false) {
293-
// declare listener
294-
// @ts-ignore
295-
this._addEventListener(type, listener, useCapture);
296-
297-
// @ts-ignore
298-
if (!this.eventListenerList) this.eventListenerList = {};
299-
// @ts-ignore
300-
if (!this.eventListenerList[type]) this.eventListenerList[type] = [];
301-
302-
// add listener to event tracking list
285+
const eventListenerList = {};
286+
function pushEventListener(type: string, listener: EventListener,
287+
useCapture: boolean = false) {
303288
// @ts-ignore
304-
this.eventListenerList[type].push({ type, listener, useCapture });
305-
};
306-
307-
cst.prototype.removeEventListener = function (type: string, listener: EventListener,
308-
useCapture: boolean = false) {
309-
// remove listener
310-
// @ts-ignore
311-
this._removeEventListener(type, listener, useCapture);
312-
289+
if (!eventListenerList[type]) {
290+
// @ts-ignore
291+
eventListenerList[type] = [];
292+
}
313293
// @ts-ignore
314-
if (!this.eventListenerList) this.eventListenerList = {};
294+
eventListenerList[type].push({ type, listener, useCapture });
295+
}
296+
function removeEventListener(type: string, listener: EventListener,
297+
useCapture: boolean = false) {
315298
// @ts-ignore
316-
if (!this.eventListenerList[type]) this.eventListenerList[type] = [];
317-
299+
if (!eventListenerList[type]) {
300+
return;
301+
}
318302
// Find the event in the list, If a listener is registered twice, one
319303
// with capture and one without, remove each one separately. Removal of
320304
// a capturing listener does not affect a non-capturing version of the
321305
// same listener, and vice versa.
322306
// @ts-ignore
323-
for (let i = 0; i < this.eventListenerList[type].length; i++) {
307+
for (let i = 0; i < eventListenerList[type].length; i++) {
324308
if (
325309
// @ts-ignore
326-
this.eventListenerList[type][i].listener === listener &&
310+
eventListenerList[type][i].listener === listener &&
327311
// @ts-ignore
328-
this.eventListenerList[type][i].useCapture === useCapture
312+
eventListenerList[type][i].useCapture === useCapture
329313
) {
330314
// @ts-ignore
331-
this.eventListenerList[type].splice(i, 1);
315+
eventListenerList[type].splice(i, 1);
332316
break;
333317
}
334318
}
335319
// if no more events of the removed event type are left,remove the group
336320
// @ts-ignore
337-
if (this.eventListenerList[type].length == 0)
321+
if (eventListenerList[type].length == 0) {
338322
// @ts-ignore
339-
delete this.eventListenerList[type];
323+
delete eventListenerList[type];
324+
}
325+
}
326+
function getEventListener(type: string) {
327+
if (!eventListenerList) return [];
328+
if (type == undefined) return eventListenerList;
329+
// @ts-ignore
330+
return eventListenerList[type];
331+
}
332+
333+
// save the original methods before overwriting them
334+
const originalAddEventListener = cst.prototype.addEventListener;
335+
const originalRemoveEventListener = cst.prototype.removeEventListener;
336+
337+
cst.prototype.addEventListener = function (type: string, listener: EventListener,
338+
useCapture: boolean = false) {
339+
originalAddEventListener.call(this, type, listener, useCapture);
340+
pushEventListener(type, listener, useCapture);
341+
};
342+
343+
cst.prototype.removeEventListener = function (type: string, listener: EventListener,
344+
useCapture: boolean = false) {
345+
originalRemoveEventListener.call(this, type, listener, useCapture);
346+
removeEventListener(type, listener, useCapture);
340347
};
341348

342349
// @ts-ignore
343350
cst.prototype.getEventListeners = function (type: string) {
344-
// @ts-ignore
345-
if (!this.eventListenerList) this.eventListenerList = {};
346-
347-
// return reqested listeners type or all them
348-
// @ts-ignore
349-
if (type === undefined) return this.eventListenerList;
350-
// @ts-ignore
351-
return this.eventListenerList[type];
351+
return getEventListener(type);
352352
};
353353
}
354354
});

0 commit comments

Comments
 (0)