Skip to content

Commit a88a0ad

Browse files
authored
fix(web): keep HTML previews anchored when accordions expand (pingdotgg#34003)
1 parent 5f2bb93 commit a88a0ad

4 files changed

Lines changed: 116 additions & 2 deletions

File tree

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { injectHtmlRenderBootstrap } from "@t3tools/shared/htmlRender";
2+
import { HtmlRenderDocument } from "../files/BrowserDocumentFrame";
13
import { flushSync } from "react-dom";
24
import { AudioPreview } from "../files/AudioPreview";
35
import { cdp, page } from "vite-plus/test/browser";
@@ -217,6 +219,66 @@ const TASK_ID = ScheduledTaskId.make("task-1");
217219
const AUTOMATION_PROMPT = "Triage the inbox\n\nLabel every new issue and close duplicates.";
218220

219221
describe("MessagesTimeline work rows", () => {
222+
it("keeps a tall HTML preview in place when its last accordion opens at the bottom", async () => {
223+
const props = baseProps();
224+
const html = injectHtmlRenderBootstrap(`<div style="height:1400px">Earlier preview content</div>
225+
<details><summary>More rows</summary><div style="height:900px">More rows</div></details>
226+
<script>addEventListener('message', e => { if(e.data === 'toggle') document.querySelector('details').open = !document.querySelector('details').open; });</script>`);
227+
const src = URL.createObjectURL(new Blob([html], { type: "text/html" }));
228+
using _url = { [Symbol.dispose]: () => URL.revokeObjectURL(src) };
229+
function Preview() {
230+
const [height, setHeight] = useState(1437);
231+
return (
232+
<div style={{ height }}>
233+
<HtmlRenderDocument
234+
src={src}
235+
title="Tall preview"
236+
className="size-full"
237+
onContentHeight={setHeight}
238+
/>
239+
</div>
240+
);
241+
}
242+
const container = document.createElement("div");
243+
container.style.cssText = "height:600px;width:900px;display:flex;flex-direction:column";
244+
await using screen = await render(
245+
<MessagesTimeline
246+
{...props}
247+
renderHtmlRender={() => <Preview />}
248+
timelineEntries={[
249+
{
250+
id: "preview",
251+
kind: "html-render",
252+
createdAt: CREATED_AT,
253+
runId: RunId.make("preview-run"),
254+
htmlRender: { attachmentId: "preview", title: "Tall preview", height: 1450 },
255+
},
256+
message("Done", { role: "assistant" }, "preview-done"),
257+
]}
258+
/>,
259+
{ container },
260+
);
261+
const viewport = props.listRef.current!.getScrollableNode()!;
262+
const frame = screen.getByTitle("Tall preview").element() as HTMLIFrameElement;
263+
await vi.waitFor(() => {
264+
expect(frame.clientHeight).toBe(1437);
265+
expect(viewport.scrollTop).toBeGreaterThan(0);
266+
expect(viewport.scrollHeight - viewport.clientHeight - viewport.scrollTop).toBeLessThan(2);
267+
});
268+
const top = frame.getBoundingClientRect().top;
269+
frame.focus();
270+
frame.contentWindow!.postMessage("toggle", "*");
271+
await vi.waitFor(() => {
272+
expect(frame.clientHeight).toBe(2337);
273+
expect(frame.getBoundingClientRect().top).toBeCloseTo(top, 0);
274+
});
275+
frame.contentWindow!.postMessage("toggle", "*");
276+
await vi.waitFor(() => {
277+
expect(frame.clientHeight).toBe(1437);
278+
expect(frame.getBoundingClientRect().top).toBeCloseTo(top, 0);
279+
});
280+
});
281+
220282
it("keeps the worked-for heading in place when expanded at the bottom", async () => {
221283
const props = baseProps();
222284
const runId = RunId.make("completed-run");

‎apps/web/src/components/chat/MessagesTimeline.tsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,15 @@ const ConversationTimeline = memo(function ConversationTimeline({
11191119
listRef.current = list;
11201120
const scrollNode: HTMLElement | null = list?.getScrollableNode() ?? null;
11211121
registerTimeline?.(scrollNode);
1122-
const viewport = scrollNode ? attachTimelineViewport(scrollNode) : null;
1122+
const viewport = scrollNode
1123+
? attachTimelineViewport(scrollNode, (frame) => {
1124+
const rowId = frame.closest<HTMLElement>("[data-timeline-row-id]")?.dataset.timelineRowId;
1125+
if (rowId && list) {
1126+
list.cancelScroll();
1127+
list.anchorVisibleContent({ key: rowId });
1128+
}
1129+
})
1130+
: null;
11231131
viewportRef.current = viewport;
11241132
const detachViewport = viewport ? onViewportAttach?.(viewport) : undefined;
11251133
const stopRememberingRelease = viewport?.onFollowReleased(rememberReleasedPosition);

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,27 @@ describe("attachTimelineViewport", () => {
5656
timeline.scrollTop -= 100;
5757
await scroll;
5858
expect(sources).toEqual(["scroll"]);
59+
const frame = screen.getByTitle("render").element() as HTMLIFrameElement;
60+
const resize = (height: number, source: Window | null = frame.contentWindow) =>
61+
window.dispatchEvent(
62+
new MessageEvent("message", {
63+
source,
64+
data: { jsonrpc: "2.0", method: "ui/notifications/size-changed", params: { height } },
65+
}),
66+
);
67+
sources.length = 0;
68+
resize(200);
69+
resize(400);
70+
expect(sources).toEqual([]);
71+
frame.focus();
72+
resize(400, window);
73+
resize(400);
74+
expect(sources).toEqual([]);
75+
resize(600);
76+
resize(200);
77+
expect(sources).toEqual(["command", "command"]);
5978
viewport.dispose();
79+
resize(800);
80+
expect(sources).toEqual(["command", "command"]);
6081
});
6182
});

‎apps/web/src/components/chat/timelineViewport.ts‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { readHtmlRenderContentHeight } from "@t3tools/shared/htmlRender";
2+
13
import { isInSideChatPane } from "../../lib/sideChatPane";
24
import { registerCommands } from "../../shortcuts/dispatcher";
35
import {
@@ -67,7 +69,10 @@ const DOWN_KEYS = new Set(["PageDown", "End", "ArrowDown", " "]);
6769
* Owns the timeline scroll node's input listeners for as long as the node is
6870
* mounted, and turns them into one navigation signal.
6971
*/
70-
export function attachTimelineViewport(scrollNode: HTMLElement): TimelineViewport & {
72+
export function attachTimelineViewport(
73+
scrollNode: HTMLElement,
74+
onFrameResize?: (frame: HTMLIFrameElement) => void,
75+
): TimelineViewport & {
7176
readonly dispose: () => void;
7277
} {
7378
const listeners = new Set<(navigation: TimelineNavigation) => void>();
@@ -141,6 +146,23 @@ export function attachTimelineViewport(scrollNode: HTMLElement): TimelineViewpor
141146
emit({ source: "scroll" });
142147
}
143148
};
149+
const frameHeights = new WeakMap<HTMLIFrameElement, number>();
150+
const handleFrameResize = (event: MessageEvent) => {
151+
const height = readHtmlRenderContentHeight(event.data);
152+
if (height === undefined) return;
153+
const frame = [...scrollNode.querySelectorAll("iframe")].find(
154+
(frame) => frame.contentWindow === event.source,
155+
);
156+
if (!frame) return;
157+
const previous = frameHeights.get(frame);
158+
frameHeights.set(frame, height);
159+
if (previous !== undefined && previous !== height && document.activeElement === frame) {
160+
emit({ source: "command", releasesFollow: true });
161+
onFrameResize?.(frame);
162+
}
163+
};
164+
// Run before frame listeners resize rows, so an accordion cannot drag the reader to the end.
165+
window.addEventListener("message", handleFrameResize, true);
144166
scrollNode.addEventListener("scroll", handleScroll, { passive: true });
145167
scrollNode.addEventListener("wheel", handleWheel, { passive: true });
146168
scrollNode.addEventListener("touchmove", handleTouchMove, { passive: true });
@@ -170,6 +192,7 @@ export function attachTimelineViewport(scrollNode: HTMLElement): TimelineViewpor
170192
return () => followReleasedListeners.delete(listener);
171193
},
172194
dispose: () => {
195+
window.removeEventListener("message", handleFrameResize, true);
173196
listeners.clear();
174197
followReleasedListeners.clear();
175198
scrollNode.removeEventListener("scroll", handleScroll);

0 commit comments

Comments
 (0)