fix: [#1628] Fixes issue where the wrong event target was used when d…

…ispatching events on HTMLFormElement or HTMLSelectElement (#1655)

packages/happy-dom/src/event/EventTarget.ts

@@ -111,7 +111,7 @@ export default class EventTarget {
 	 */
 	public dispatchEvent(event: Event): boolean {
 		if (!event[PropertySymbol.target]) {
-			event[PropertySymbol.target] = this;
+			event[PropertySymbol.target] = this[PropertySymbol.proxy] || this;
 
 			this.#goThroughDispatchEventPhases(event);
 
@@ -180,7 +180,7 @@ export default class EventTarget {
 
 		// At target phase
 		event[PropertySymbol.eventPhase] = EventPhaseEnum.atTarget;
-		event[PropertySymbol.currentTarget] = this;
+		event[PropertySymbol.currentTarget] = this[PropertySymbol.proxy] || this;
 		event[PropertySymbol.target].dispatchEvent(event);
 
 		// Bubbling phase

packages/happy-dom/test/nodes/html-form-element/HTMLFormElement.test.ts

@@ -20,6 +20,7 @@ import { beforeEach, describe, it, expect, vi } from 'vitest';
 import THTMLFormControlElement from '../../../src/nodes/html-form-element/THTMLFormControlElement.js';
 import HTMLOutputElement from '../../../src/nodes/html-output-element/HTMLOutputElement.js';
 import * as PropertySymbol from '../../../src/PropertySymbol.js';
+import EventTarget from '../../../src/event/EventTarget.js';
 
 describe('HTMLFormElement', () => {
 	let window: Window;
@@ -1352,4 +1353,22 @@ describe('HTMLFormElement', () => {
 			});
 		});
 	}
+
+	describe('dispatchEvent()', () => {
+		it('Dispatches events using the proxy as the target.', () => {
+			const event = new Event('test');
+			let target: EventTarget | null = null;
+			let currentTarget: EventTarget | null = null;
+
+			element.addEventListener('test', (event: Event) => {
+				target = event.target;
+				currentTarget = event.currentTarget;
+			});
+
+			element.dispatchEvent(event);
+
+			expect(target).toBe(element);
+			expect(currentTarget).toBe(element);
+		});
+	});
 });

packages/happy-dom/test/nodes/html-select-element/HTMLSelectElement.test.ts

@@ -6,6 +6,7 @@ import ValidityState from '../../../src/validity-state/ValidityState.js';
 import Event from '../../../src/event/Event.js';
 import { beforeEach, describe, it, expect } from 'vitest';
 import HTMLCollection from '../../../src/nodes/element/HTMLCollection.js';
+import EventTarget from '../../../src/event/EventTarget.js';
 
 describe('HTMLSelectElement', () => {
 	let window: Window;
@@ -772,4 +773,22 @@ describe('HTMLSelectElement', () => {
 			});
 		});
 	}
+
+	describe('dispatchEvent()', () => {
+		it('Dispatches events using the proxy as the target.', () => {
+			const event = new Event('test');
+			let target: EventTarget | null = null;
+			let currentTarget: EventTarget | null = null;
+
+			element.addEventListener('test', (event: Event) => {
+				target = event.target;
+				currentTarget = event.currentTarget;
+			});
+
+			element.dispatchEvent(event);
+
+			expect(target).toBe(element);
+			expect(currentTarget).toBe(element);
+		});
+	});
 });