Skip to content

Commit 4c0b4f0

Browse files
committed
fix(web): share html gesture cleanup with guest frames
1 parent fa289ef commit 4c0b4f0

4 files changed

Lines changed: 91 additions & 62 deletions

File tree

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ vi.mock(import("~/assets/assetUrls"), async (importOriginal) => ({
1919
useAssetUrlRefresh: () => async () => "about:blank",
2020
}));
2121

22+
import { GuestHtmlRender } from "../guest/GuestHtmlRender";
2223
import { HtmlRenderFrame } from "./HtmlRenderFrame";
2324

2425
describe("HtmlRenderFrame", () => {
@@ -42,10 +43,11 @@ describe("HtmlRenderFrame", () => {
4243
});
4344
});
4445

45-
it.each(["inside", "outside", "touch", "sibling"])(
46+
it.each(["inside", "outside", "touch", "sibling", "guest"])(
4647
"holds sizing until release: %s",
4748
async (kind) => {
48-
const outside = kind === "outside" || kind === "sibling";
49+
const outside = kind === "outside" || kind === "sibling" || kind === "guest";
50+
const border = kind === "guest" ? 2 : 0;
4951
const url = URL.createObjectURL(
5052
new Blob(
5153
[
@@ -64,12 +66,20 @@ it.each(["inside", "outside", "touch", "sibling"])(
6466
const pin = vi.fn();
6567
await using screen = await render(
6668
<>
67-
<HtmlRenderFrame
68-
environmentId={EnvironmentId.make("environment")}
69-
htmlRender={{ attachmentId: "attachment", title: "Drag", height: 200 }}
70-
threadRef={undefined}
71-
onFullscreenChange={pin}
72-
/>
69+
{kind === "guest" ? (
70+
<GuestHtmlRender
71+
itemId="drag"
72+
shareId="share"
73+
reference={{ attachmentId: "attachment", title: "Drag", height: 200 }}
74+
/>
75+
) : (
76+
<HtmlRenderFrame
77+
environmentId={EnvironmentId.make("environment")}
78+
htmlRender={{ attachmentId: "attachment", title: "Drag", height: 200 }}
79+
threadRef={undefined}
80+
onFullscreenChange={pin}
81+
/>
82+
)}
7383
{kind === "sibling" && (
7484
<HtmlRenderFrame
7585
environmentId={EnvironmentId.make("environment")}
@@ -90,13 +100,15 @@ it.each(["inside", "outside", "touch", "sibling"])(
90100
if (sibling && event.source === sibling.contentWindow && event.data === "ready")
91101
siblingReady = true;
92102
if (event.source !== frame.contentWindow) return;
103+
if (kind === "guest" && event.data?.method === "t3/notifications/pointer-held")
104+
pin(event.data.params.held);
93105
if (event.data === "cancelled") cancelled = true;
94106
if (event.data === "ready") ready = true;
95107
};
96108
window.addEventListener("message", receive);
97109
using _listener = { [Symbol.dispose]: () => window.removeEventListener("message", receive) };
98110
await vi.waitFor(() => expect(ready && siblingReady).toBe(true));
99-
await vi.waitFor(() => expect(frame.clientHeight).toBe(216));
111+
await vi.waitFor(() => expect(frame.clientHeight).toBe(216 - border));
100112
const outer = window.frameElement!.getBoundingClientRect();
101113
const box = frame.getBoundingClientRect();
102114
const x = outer.left + box.left + 30,
@@ -111,7 +123,7 @@ it.each(["inside", "outside", "touch", "sibling"])(
111123
});
112124
await cdp().send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [first] });
113125
expect(pin).toHaveBeenLastCalledWith(true);
114-
expect(frame.clientHeight).toBe(216);
126+
expect(frame.clientHeight).toBe(216 - border);
115127
await cdp().send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] });
116128
} else {
117129
await cdp().send("Input.dispatchMouseEvent", {
@@ -123,7 +135,7 @@ it.each(["inside", "outside", "touch", "sibling"])(
123135
clickCount: 1,
124136
});
125137
await vi.waitFor(() => expect(pin).toHaveBeenLastCalledWith(true));
126-
expect(frame.clientHeight).toBe(216);
138+
expect(frame.clientHeight).toBe(216 - border);
127139
await cdp().send("Input.dispatchMouseEvent", {
128140
type: "mouseMoved",
129141
x,
@@ -140,7 +152,7 @@ it.each(["inside", "outside", "touch", "sibling"])(
140152
});
141153
}
142154
await vi.waitFor(() => expect(pin).toHaveBeenLastCalledWith(false));
143-
await vi.waitFor(() => expect(frame.clientHeight).toBe(316));
155+
await vi.waitFor(() => expect(frame.clientHeight).toBe(316 - border));
144156
if (!outside) expect(cancelled).toBe(false);
145157
},
146158
);

‎apps/web/src/components/files/BrowserDocumentFrame.tsx‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ import {
1616
readHtmlRenderImageRequest,
1717
readHtmlRenderKeyDown,
1818
readHtmlRenderLinkRequest,
19-
readHtmlRenderPointerHeld,
20-
readHtmlRenderPointerRelease,
21-
HTML_RENDER_POINTER_RELEASE_METHOD,
2219
} from "@t3tools/shared/htmlRender";
2320
import {
2421
isMacPlatform,
@@ -40,6 +37,7 @@ import { FileSurfaceLoading } from "./fileSurfaceChrome";
4037
import { useOpenLink } from "~/browser/useOpenLink";
4138
import { ExpandedImageDialog } from "~/components/chat/ExpandedImageDialog";
4239
import type { ExpandedImagePreview } from "~/components/chat/ExpandedImagePreview";
40+
import { useHtmlRenderPointerHold } from "~/hooks/useHtmlRenderPointerHold";
4341
import { useHtmlRenderTheme } from "~/hooks/useHtmlRenderTheme";
4442
import { shortcutConflictKey } from "~/keybindings";
4543
import { useOpenChangeRequestLink } from "~/lib/openPullRequestLink";
@@ -234,7 +232,7 @@ export function HtmlRenderDocument(props: {
234232
}
235233
void openLink(url, { event: modifiers }).catch((cause: unknown) => console.error(cause));
236234
});
237-
const [pointerHeld, setPointerHeld] = useState(false);
235+
const pointerHeld = useHtmlRenderPointerHold(frameRef);
238236
const holding = expandedImage !== null || pointerHeld;
239237
const { onFullscreenChange } = props;
240238
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- holds the timeline during a page gesture or image viewer, and clears it on unmount
@@ -243,56 +241,10 @@ export function HtmlRenderDocument(props: {
243241
onFullscreenChange?.(true);
244242
return () => onFullscreenChange?.(false);
245243
}, [holding, onFullscreenChange]);
246-
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- forwards releases outside the sandboxed frame so its height reporting resumes
247-
useEffect(() => {
248-
if (!pointerHeld) return;
249-
const release = (event: Event) => {
250-
if (event.type === "pointermove" && event instanceof PointerEvent && event.buttons !== 0)
251-
return;
252-
frameRef.current?.contentWindow?.postMessage(
253-
{
254-
jsonrpc: "2.0",
255-
method: HTML_RENDER_POINTER_RELEASE_METHOD,
256-
...(event instanceof PointerEvent || event instanceof CustomEvent
257-
? {
258-
params: {
259-
pointerId: event instanceof PointerEvent ? event.pointerId : event.detail,
260-
},
261-
}
262-
: {}),
263-
},
264-
"*",
265-
);
266-
};
267-
window.addEventListener("pointerup", release, true);
268-
window.addEventListener("pointercancel", release, true);
269-
window.addEventListener("pointermove", release, true);
270-
window.addEventListener("blur", release);
271-
window.addEventListener(HTML_RENDER_POINTER_RELEASE_METHOD, release);
272-
return () => {
273-
window.removeEventListener("pointerup", release, true);
274-
window.removeEventListener("pointercancel", release, true);
275-
window.removeEventListener("pointermove", release, true);
276-
window.removeEventListener("blur", release);
277-
window.removeEventListener(HTML_RENDER_POINTER_RELEASE_METHOD, release);
278-
};
279-
}, [pointerHeld]);
280244
// Links, keys and images require frame focus and recent reader activity: a page can take
281245
// focus by script, so this blocks opens on load, though not a page that waits for the
282246
// reader's next input.
283247
const onFrameMessage = useEffectEvent((frame: HTMLIFrameElement, event: MessageEvent) => {
284-
const released = readHtmlRenderPointerRelease(event.data);
285-
if (released !== undefined) {
286-
window.dispatchEvent(
287-
new CustomEvent(HTML_RENDER_POINTER_RELEASE_METHOD, { detail: released }),
288-
);
289-
return;
290-
}
291-
const held = readHtmlRenderPointerHeld(event.data);
292-
if (held !== undefined) {
293-
setPointerHeld(held);
294-
return;
295-
}
296248
const height = readHtmlRenderContentHeight(event.data);
297249
if (height !== undefined) {
298250
props.onContentHeight?.(height);

‎apps/web/src/components/guest/GuestHtmlRender.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
} from "@t3tools/shared/htmlRender";
1212
import { useEffect, useLayoutEffect, useRef, useState } from "react";
1313

14+
import { useHtmlRenderPointerHold } from "~/hooks/useHtmlRenderPointerHold";
1415
import { useHtmlRenderTheme } from "~/hooks/useHtmlRenderTheme";
1516
import { observeResize } from "~/lib/observeResize";
1617

@@ -31,6 +32,7 @@ export function GuestHtmlRender({
3132
const theme = useHtmlRenderTheme();
3233
const boxRef = useRef<HTMLDivElement>(null);
3334
const frameRef = useRef<HTMLIFrameElement>(null);
35+
useHtmlRenderPointerHold(frameRef);
3436
const [width, setWidth] = useState(HTML_RENDER_COLUMN_WIDTH);
3537
const [contentHeight, setContentHeight] = useState<number>();
3638
// The theme rides in the fragment for the first paint; later changes are posted.
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
import {
2+
HTML_RENDER_POINTER_RELEASE_METHOD,
3+
readHtmlRenderPointerHeld,
4+
readHtmlRenderPointerRelease,
5+
} from "@t3tools/shared/htmlRender";
6+
import { useLayoutEffect, useState, type RefObject } from "react";
7+
8+
export function useHtmlRenderPointerHold(frameRef: RefObject<HTMLIFrameElement | null>) {
9+
const [pointerHeld, setPointerHeld] = useState(false);
10+
// 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
11+
useLayoutEffect(() => {
12+
let held = false;
13+
const release = (event: Event) => {
14+
if (
15+
!held ||
16+
(event instanceof PointerEvent && event.type === "pointermove" && event.buttons !== 0)
17+
)
18+
return;
19+
const pointerId =
20+
event instanceof PointerEvent
21+
? event.pointerId
22+
: event instanceof CustomEvent && typeof event.detail === "number"
23+
? event.detail
24+
: undefined;
25+
frameRef.current?.contentWindow?.postMessage(
26+
{
27+
jsonrpc: "2.0",
28+
method: HTML_RENDER_POINTER_RELEASE_METHOD,
29+
params: { pointerId },
30+
},
31+
"*",
32+
);
33+
};
34+
const onMessage = (event: MessageEvent) => {
35+
if (event.source !== frameRef.current?.contentWindow) return;
36+
const pointerHeld = readHtmlRenderPointerHeld(event.data);
37+
if (pointerHeld !== undefined) {
38+
held = pointerHeld;
39+
setPointerHeld(pointerHeld);
40+
}
41+
const pointerId = readHtmlRenderPointerRelease(event.data);
42+
if (pointerId !== undefined) {
43+
window.dispatchEvent(
44+
new CustomEvent(HTML_RENDER_POINTER_RELEASE_METHOD, { detail: pointerId }),
45+
);
46+
}
47+
};
48+
window.addEventListener("message", onMessage);
49+
const events = [
50+
"pointerup",
51+
"pointercancel",
52+
"pointermove",
53+
"blur",
54+
HTML_RENDER_POINTER_RELEASE_METHOD,
55+
];
56+
for (const event of events) window.addEventListener(event, release, true);
57+
return () => {
58+
window.removeEventListener("message", onMessage);
59+
for (const event of events) window.removeEventListener(event, release, true);
60+
};
61+
}, [frameRef]);
62+
return pointerHeld;
63+
}

0 commit comments

Comments
 (0)