Skip to content

Commit e44c639

Browse files
committed
fix(web): release html pointer hold when the frame navigates
1 parent e6404ea commit e44c639

2 files changed

Lines changed: 54 additions & 5 deletions

File tree

‎apps/web/src/components/chat/HtmlRenderFrame.browser.test.tsx‎

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,25 @@ import "~/index.css";
88
import { render } from "../../../test/render";
99

1010
vi.mock(import("~/assets/longLivedAssetUrls"), () => ({
11-
useLongLivedAssetUrl: () => ({
12-
_tag: "Success",
11+
useLongLivedAssetUrl: vi.fn(() => ({
12+
_tag: "Success" as const,
1313
url: "about:blank",
1414
expiresAt: Date.now() + 60 * 60_000,
15-
}),
15+
})),
1616
}));
1717
vi.mock(import("~/assets/assetUrls"), async (importOriginal) => ({
1818
...(await importOriginal()),
1919
useAssetUrlRefresh: () => async () => "about:blank",
2020
}));
2121

22+
import * as longLivedAssetUrls from "~/assets/longLivedAssetUrls";
23+
2224
import { GuestHtmlRender } from "../guest/GuestHtmlRender";
2325
import { HtmlRenderFrame } from "./HtmlRenderFrame";
2426

2527
describe("HtmlRenderFrame", () => {
2628
it("reports leaving full screen when it unmounts while expanded", async () => {
29+
vi.mocked(longLivedAssetUrls.useLongLivedAssetUrl).mockReset();
2730
const onFullscreenChange = vi.fn();
2831
await using screen = await render(
2932
<HtmlRenderFrame
@@ -43,11 +46,22 @@ describe("HtmlRenderFrame", () => {
4346
});
4447
});
4548

46-
it.each(["inside", "outside", "touch", "sibling", "guest"])(
49+
it.each(["inside", "outside", "touch", "sibling", "guest", "navigation"])(
4750
"holds sizing until release: %s",
4851
async (kind) => {
4952
const outside = kind === "outside" || kind === "sibling" || kind === "guest";
5053
const border = kind === "guest" ? 2 : 0;
54+
const nextUrl = URL.createObjectURL(
55+
new Blob(
56+
[
57+
injectHtmlRenderBootstrap(
58+
'<div style="height:300px">New document</div><script>addEventListener("load", function () { parent.postMessage("navigated", "*"); });</script>',
59+
),
60+
],
61+
{ type: "text/html" },
62+
),
63+
);
64+
using _nextUrl = { [Symbol.dispose]: () => URL.revokeObjectURL(nextUrl) };
5165
const url = URL.createObjectURL(
5266
new Blob(
5367
[
@@ -63,6 +77,13 @@ it.each(["inside", "outside", "touch", "sibling", "guest"])(
6377
),
6478
);
6579
using _url = { [Symbol.dispose]: () => URL.revokeObjectURL(url) };
80+
vi.mocked(longLivedAssetUrls.useLongLivedAssetUrl)
81+
.mockReset()
82+
.mockReturnValue({
83+
_tag: "Success",
84+
url,
85+
expiresAt: Date.now() + 60 * 60_000,
86+
});
6687
const pin = vi.fn();
6788
await using screen = await render(
6889
<>
@@ -90,12 +111,16 @@ it.each(["inside", "outside", "touch", "sibling", "guest"])(
90111
</>,
91112
);
92113
const frame = screen.container.querySelector("iframe")!;
114+
const loaded = new Promise<void>((resolve) =>
115+
frame.addEventListener("load", () => resolve(), { once: true }),
116+
);
93117
frame.src = url;
94118
const sibling = screen.container.querySelectorAll("iframe")[1];
95119
if (sibling) sibling.src = url;
96120
let cancelled = false,
97121
ready = false,
98-
siblingReady = !sibling;
122+
siblingReady = !sibling,
123+
navigated = false;
99124
const receive = (event: MessageEvent) => {
100125
if (sibling && event.source === sibling.contentWindow && event.data === "ready")
101126
siblingReady = true;
@@ -104,9 +129,11 @@ it.each(["inside", "outside", "touch", "sibling", "guest"])(
104129
pin(event.data.params.held);
105130
if (event.data === "cancelled") cancelled = true;
106131
if (event.data === "ready") ready = true;
132+
if (event.data === "navigated") navigated = true;
107133
};
108134
window.addEventListener("message", receive);
109135
using _listener = { [Symbol.dispose]: () => window.removeEventListener("message", receive) };
136+
await loaded;
110137
await vi.waitFor(() => expect(ready && siblingReady).toBe(true));
111138
await vi.waitFor(() => expect(frame.clientHeight).toBe(216 - border));
112139
const outer = window.frameElement!.getBoundingClientRect();
@@ -136,6 +163,20 @@ it.each(["inside", "outside", "touch", "sibling", "guest"])(
136163
});
137164
await vi.waitFor(() => expect(pin).toHaveBeenLastCalledWith(true));
138165
expect(frame.clientHeight).toBe(216 - border);
166+
if (kind === "navigation") {
167+
frame.src = nextUrl;
168+
await vi.waitFor(() => expect(navigated).toBe(true));
169+
await vi.waitFor(() => expect(pin).toHaveBeenLastCalledWith(false));
170+
await cdp().send("Input.dispatchMouseEvent", {
171+
type: "mouseReleased",
172+
x,
173+
y,
174+
button: "left",
175+
buttons: 0,
176+
clickCount: 1,
177+
});
178+
return;
179+
}
139180
await cdp().send("Input.dispatchMouseEvent", {
140181
type: "mouseMoved",
141182
x,

‎apps/web/src/hooks/useHtmlRenderPointerHold.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ export function useHtmlRenderPointerHold(frameRef: RefObject<HTMLIFrameElement |
1010
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- bridges pointer releases across sandboxed frames and their host before the page can report a hold
1111
useLayoutEffect(() => {
1212
let held = false;
13+
const frame = frameRef.current;
14+
const onLoad = () => {
15+
if (!held) return;
16+
held = false;
17+
setPointerHeld(false);
18+
};
19+
frame?.addEventListener("load", onLoad);
1320
const release = (event: Event) => {
1421
if (
1522
!held ||
@@ -55,6 +62,7 @@ export function useHtmlRenderPointerHold(frameRef: RefObject<HTMLIFrameElement |
5562
];
5663
for (const event of events) window.addEventListener(event, release, true);
5764
return () => {
65+
frame?.removeEventListener("load", onLoad);
5866
window.removeEventListener("message", onMessage);
5967
for (const event of events) window.removeEventListener(event, release, true);
6068
};

0 commit comments

Comments
 (0)