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: [#1766] Fixes issue where the wrong scope was used when settings.errorCapture is not set to tryAndCatch and handleEvent is used for an event listener #1768

Merged
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/happy-dom/src/event/EventTarget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export default class EventTarget {
}
} else {
if ((<TEventListenerObject>listener).handleEvent) {
(<TEventListenerObject>listener).handleEvent.call(this, event);
(<TEventListenerObject>listener).handleEvent.call(listener, event);
} else {
(<TEventListenerFunction>listener).call(this, event);
}
Expand Down
20 changes: 17 additions & 3 deletions packages/happy-dom/test/event/EventTarget.test.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import BrowserWindow from '../../src/window/BrowserWindow.js';
import Window from '../../src/window/Window.js';
import EventTarget from '../../src/event/EventTarget.js';
import Event from '../../src/event/Event.js';
import CustomEvent from '../../src/event/events/CustomEvent.js';
import * as PropertySymbol from '../../src/PropertySymbol.js';
import { beforeEach, describe, it, expect } from 'vitest';
import BrowserErrorCaptureEnum from '../../src/browser/enums/BrowserErrorCaptureEnum.js';

const EVENT_TYPE = 'click';

describe('EventTarget', () => {
let window: BrowserWindow;
let window: Window;
let eventTarget: EventTarget;

beforeEach(() => {
Expand Down Expand Up @@ -117,7 +117,21 @@ describe('EventTarget', () => {
expect(scope).toBe(eventTarget);
});

it('Event listener with handleEvent is called in the scope of the listener when calling dispatchEvent().', () => {
it('Event listener with handleEvent is called in the scope of the listener when calling dispatchEvent() when browser settings error capture is set to "tryAndCatch".', () => {
let scope = null;
const listener = {
handleEvent(): void {
scope = this;
}
};
const dispatchedEvent = new Event(EVENT_TYPE);
eventTarget.addEventListener(EVENT_TYPE, listener);
eventTarget.dispatchEvent(dispatchedEvent);
expect(scope).toBe(listener);
});

it('Event listener with handleEvent is called in the scope of the listener when calling dispatchEvent() when browser settings error capture is not set to "tryAndCatch".', () => {
window.happyDOM.settings.errorCapture = BrowserErrorCaptureEnum.disabled;
let scope = null;
const listener = {
handleEvent(): void {
Expand Down
Loading