diff --git a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
index 080646fa887c..0ca1f46f5d7e 100644
--- a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
@@ -1,3 +1,5 @@
+import { injectHtmlRenderBootstrap } from "@t3tools/shared/htmlRender";
+import { HtmlRenderDocument } from "../files/BrowserDocumentFrame";
import { flushSync } from "react-dom";
import { AudioPreview } from "../files/AudioPreview";
import { cdp, page } from "vite-plus/test/browser";
@@ -217,6 +219,66 @@ const TASK_ID = ScheduledTaskId.make("task-1");
const AUTOMATION_PROMPT = "Triage the inbox\n\nLabel every new issue and close duplicates.";
describe("MessagesTimeline work rows", () => {
+ it("keeps a tall HTML preview in place when its last accordion opens at the bottom", async () => {
+ const props = baseProps();
+ const html = injectHtmlRenderBootstrap(`
Earlier preview content
+ More rows
More rows
+ `);
+ const src = URL.createObjectURL(new Blob([html], { type: "text/html" }));
+ using _url = { [Symbol.dispose]: () => URL.revokeObjectURL(src) };
+ function Preview() {
+ const [height, setHeight] = useState(1437);
+ return (
+
+
+
+ );
+ }
+ const container = document.createElement("div");
+ container.style.cssText = "height:600px;width:900px;display:flex;flex-direction:column";
+ await using screen = await render(
+ }
+ timelineEntries={[
+ {
+ id: "preview",
+ kind: "html-render",
+ createdAt: CREATED_AT,
+ runId: RunId.make("preview-run"),
+ htmlRender: { attachmentId: "preview", title: "Tall preview", height: 1450 },
+ },
+ message("Done", { role: "assistant" }, "preview-done"),
+ ]}
+ />,
+ { container },
+ );
+ const viewport = props.listRef.current!.getScrollableNode()!;
+ const frame = screen.getByTitle("Tall preview").element() as HTMLIFrameElement;
+ await vi.waitFor(() => {
+ expect(frame.clientHeight).toBe(1437);
+ expect(viewport.scrollTop).toBeGreaterThan(0);
+ expect(viewport.scrollHeight - viewport.clientHeight - viewport.scrollTop).toBeLessThan(2);
+ });
+ const top = frame.getBoundingClientRect().top;
+ frame.focus();
+ frame.contentWindow!.postMessage("toggle", "*");
+ await vi.waitFor(() => {
+ expect(frame.clientHeight).toBe(2337);
+ expect(frame.getBoundingClientRect().top).toBeCloseTo(top, 0);
+ });
+ frame.contentWindow!.postMessage("toggle", "*");
+ await vi.waitFor(() => {
+ expect(frame.clientHeight).toBe(1437);
+ expect(frame.getBoundingClientRect().top).toBeCloseTo(top, 0);
+ });
+ });
+
it("keeps the worked-for heading in place when expanded at the bottom", async () => {
const props = baseProps();
const runId = RunId.make("completed-run");
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index 02c5f153961b..3b8db4484132 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -1119,7 +1119,15 @@ const ConversationTimeline = memo(function ConversationTimeline({
listRef.current = list;
const scrollNode: HTMLElement | null = list?.getScrollableNode() ?? null;
registerTimeline?.(scrollNode);
- const viewport = scrollNode ? attachTimelineViewport(scrollNode) : null;
+ const viewport = scrollNode
+ ? attachTimelineViewport(scrollNode, (frame) => {
+ const rowId = frame.closest("[data-timeline-row-id]")?.dataset.timelineRowId;
+ if (rowId && list) {
+ list.cancelScroll();
+ list.anchorVisibleContent({ key: rowId });
+ }
+ })
+ : null;
viewportRef.current = viewport;
const detachViewport = viewport ? onViewportAttach?.(viewport) : undefined;
const stopRememberingRelease = viewport?.onFollowReleased(rememberReleasedPosition);
diff --git a/apps/web/src/components/chat/timelineViewport.browser.test.tsx b/apps/web/src/components/chat/timelineViewport.browser.test.tsx
index c77ed433d080..ef29dfd4ed09 100644
--- a/apps/web/src/components/chat/timelineViewport.browser.test.tsx
+++ b/apps/web/src/components/chat/timelineViewport.browser.test.tsx
@@ -56,6 +56,27 @@ describe("attachTimelineViewport", () => {
timeline.scrollTop -= 100;
await scroll;
expect(sources).toEqual(["scroll"]);
+ const frame = screen.getByTitle("render").element() as HTMLIFrameElement;
+ const resize = (height: number, source: Window | null = frame.contentWindow) =>
+ window.dispatchEvent(
+ new MessageEvent("message", {
+ source,
+ data: { jsonrpc: "2.0", method: "ui/notifications/size-changed", params: { height } },
+ }),
+ );
+ sources.length = 0;
+ resize(200);
+ resize(400);
+ expect(sources).toEqual([]);
+ frame.focus();
+ resize(400, window);
+ resize(400);
+ expect(sources).toEqual([]);
+ resize(600);
+ resize(200);
+ expect(sources).toEqual(["command", "command"]);
viewport.dispose();
+ resize(800);
+ expect(sources).toEqual(["command", "command"]);
});
});
diff --git a/apps/web/src/components/chat/timelineViewport.ts b/apps/web/src/components/chat/timelineViewport.ts
index cafbe4f51247..fca3e5699608 100644
--- a/apps/web/src/components/chat/timelineViewport.ts
+++ b/apps/web/src/components/chat/timelineViewport.ts
@@ -1,3 +1,5 @@
+import { readHtmlRenderContentHeight } from "@t3tools/shared/htmlRender";
+
import { isInSideChatPane } from "../../lib/sideChatPane";
import { registerCommands } from "../../shortcuts/dispatcher";
import {
@@ -67,7 +69,10 @@ const DOWN_KEYS = new Set(["PageDown", "End", "ArrowDown", " "]);
* Owns the timeline scroll node's input listeners for as long as the node is
* mounted, and turns them into one navigation signal.
*/
-export function attachTimelineViewport(scrollNode: HTMLElement): TimelineViewport & {
+export function attachTimelineViewport(
+ scrollNode: HTMLElement,
+ onFrameResize?: (frame: HTMLIFrameElement) => void,
+): TimelineViewport & {
readonly dispose: () => void;
} {
const listeners = new Set<(navigation: TimelineNavigation) => void>();
@@ -141,6 +146,23 @@ export function attachTimelineViewport(scrollNode: HTMLElement): TimelineViewpor
emit({ source: "scroll" });
}
};
+ const frameHeights = new WeakMap();
+ const handleFrameResize = (event: MessageEvent) => {
+ const height = readHtmlRenderContentHeight(event.data);
+ if (height === undefined) return;
+ const frame = [...scrollNode.querySelectorAll("iframe")].find(
+ (frame) => frame.contentWindow === event.source,
+ );
+ if (!frame) return;
+ const previous = frameHeights.get(frame);
+ frameHeights.set(frame, height);
+ if (previous !== undefined && previous !== height && document.activeElement === frame) {
+ emit({ source: "command", releasesFollow: true });
+ onFrameResize?.(frame);
+ }
+ };
+ // Run before frame listeners resize rows, so an accordion cannot drag the reader to the end.
+ window.addEventListener("message", handleFrameResize, true);
scrollNode.addEventListener("scroll", handleScroll, { passive: true });
scrollNode.addEventListener("wheel", handleWheel, { passive: true });
scrollNode.addEventListener("touchmove", handleTouchMove, { passive: true });
@@ -170,6 +192,7 @@ export function attachTimelineViewport(scrollNode: HTMLElement): TimelineViewpor
return () => followReleasedListeners.delete(listener);
},
dispose: () => {
+ window.removeEventListener("message", handleFrameResize, true);
listeners.clear();
followReleasedListeners.clear();
scrollNode.removeEventListener("scroll", handleScroll);