Skip to content

Commit 76e9094

Browse files
ryansolidbrenelzclaude
authored
fix(web): delegated dispatch restores currentTarget and target (no try) (#4325)
* fix(web): delegated dispatch restores the event's currentTarget and target * Drop try/finally from the delegated restore A throwing handler is an error path that is already reported, and the try costs 13 B in every client scenario. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_018LY7F9czoRqdMEvk2QwPr1 * Changeset: drop the throwing-handler claim Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_018LY7F9czoRqdMEvk2QwPr1 --------- Co-authored-by: Brenley Dueck <[email protected]> Co-authored-by: Claude <[email protected]>
1 parent 7f03a4f commit 76e9094

3 files changed

Lines changed: 114 additions & 3 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/web": patch
3+
---
4+
5+
Delegated dispatch removes its `currentTarget` and `target` overrides from the native event when its walk ends. Native listeners that run later in the same dispatch, such as ones on `document`, `window` or an element above the render root, read their own `currentTarget` again instead of the last node Solid visited.

‎packages/web/src/client.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2975,7 +2975,6 @@ function eventHandler(e, container, state) {
29752975

29762976
let node = resumeNode || e.target;
29772977
const key = EVENT_KEY + e.type;
2978-
const oriTarget = e.target;
29792978
const retarget = value =>
29802979
Object.defineProperty(e, "target", {
29812980
configurable: true,
@@ -3040,8 +3039,9 @@ function eventHandler(e, container, state) {
30403039
}
30413040
// fallback for browsers that don't support composedPath
30423041
else walkUpTree();
3043-
// Mixing portals and shadow dom can lead to a nonstandard target, so reset here.
3044-
retarget(oriTarget);
3042+
// Later native listeners (document, window, outer roots) see the real getters.
3043+
delete e.target;
3044+
delete e.currentTarget;
30453045
}
30463046

30473047
function insertExpression(parent, value, current, marker) {
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/**
2+
* @jsxImportSource @solidjs/web
3+
* @vitest-environment jsdom
4+
*/
5+
import { describe, expect, test } from "vitest";
6+
import { render } from "@solidjs/web";
7+
8+
describe("delegated dispatch restores the native Event", () => {
9+
test("a native listener above the render root sees its own currentTarget", () => {
10+
const root = document.createElement("div");
11+
document.body.appendChild(root);
12+
let btn!: HTMLButtonElement;
13+
const seen: any[] = [];
14+
const listener = (e: Event) => seen.push(e.currentTarget);
15+
document.addEventListener("click", listener);
16+
const dispose = render(
17+
() => (
18+
<section>
19+
<button ref={btn} onClick={() => {}} />
20+
</section>
21+
),
22+
root
23+
);
24+
btn.click();
25+
document.removeEventListener("click", listener);
26+
dispose();
27+
root.remove();
28+
expect(seen[0]).toBe(document);
29+
});
30+
31+
test("a native listener on the root's ancestor sees its own currentTarget", () => {
32+
const outer = document.createElement("div");
33+
const root = document.createElement("div");
34+
outer.appendChild(root);
35+
document.body.appendChild(outer);
36+
let btn!: HTMLButtonElement;
37+
const seen: any[] = [];
38+
outer.addEventListener("click", e => seen.push(e.currentTarget));
39+
const dispose = render(() => <button ref={btn} onClick={() => {}} />, root);
40+
btn.click();
41+
dispose();
42+
outer.remove();
43+
expect(seen[0]).toBe(outer);
44+
});
45+
46+
test.fails("the same Event object dispatched twice runs the handler twice", () => {
47+
const root = document.createElement("div");
48+
document.body.appendChild(root);
49+
let btn!: HTMLButtonElement;
50+
let calls = 0;
51+
const dispose = render(() => <button ref={btn} onClick={() => calls++} />, root);
52+
const e = new MouseEvent("click", { bubbles: true });
53+
btn.dispatchEvent(e);
54+
btn.dispatchEvent(e);
55+
expect(calls).toBe(2);
56+
dispose();
57+
root.remove();
58+
});
59+
test("re-dispatching to another element reports the new target", () => {
60+
const root = document.createElement("div");
61+
document.body.appendChild(root);
62+
let a!: HTMLButtonElement, b!: HTMLButtonElement;
63+
const targets: any[] = [];
64+
const dispose = render(
65+
() => (
66+
<div>
67+
<button ref={a} onClick={() => {}} />
68+
<button ref={b} />
69+
</div>
70+
),
71+
root
72+
);
73+
const e = new MouseEvent("click", { bubbles: true });
74+
a.dispatchEvent(e);
75+
const native: any[] = [];
76+
b.addEventListener("click", ev => native.push(ev.target));
77+
b.dispatchEvent(e);
78+
expect(native[0]).toBe(b);
79+
dispose();
80+
root.remove();
81+
});
82+
83+
test.fails("nested roots each run once per dispatch of the same Event object", () => {
84+
const outerRoot = document.createElement("div");
85+
document.body.appendChild(outerRoot);
86+
let slot!: HTMLDivElement, btn!: HTMLButtonElement;
87+
const calls: string[] = [];
88+
const disposeOuter = render(
89+
() => <div ref={slot} onClick={() => calls.push("outer")} />,
90+
outerRoot
91+
);
92+
const innerRoot = document.createElement("div");
93+
slot.appendChild(innerRoot);
94+
const disposeInner = render(
95+
() => <button ref={btn} onClick={() => calls.push("inner")} />,
96+
innerRoot
97+
);
98+
const e = new MouseEvent("click", { bubbles: true });
99+
btn.dispatchEvent(e);
100+
btn.dispatchEvent(e);
101+
expect(calls).toEqual(["inner", "outer", "inner", "outer"]);
102+
disposeInner();
103+
disposeOuter();
104+
outerRoot.remove();
105+
});
106+
});

0 commit comments

Comments
 (0)