diff --git a/packages/app/e2e/performance/timeline-stability/scroll-interaction.spec.ts b/packages/app/e2e/performance/timeline-stability/scroll-interaction.spec.ts index 392d693e4b5..3699c50afdd 100644 --- a/packages/app/e2e/performance/timeline-stability/scroll-interaction.spec.ts +++ b/packages/app/e2e/performance/timeline-stability/scroll-interaction.spec.ts @@ -381,9 +381,10 @@ test("jump to latest lands on stable final rows after offscreen growth", async ( }) const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") }) - await scroller.evaluate( - (element) => (element.scrollTop = Math.max(0, element.scrollHeight - element.clientHeight - 600)), - ) + await scroller.evaluate((element) => { + element.dispatchEvent(new WheelEvent("wheel", { bubbles: true, deltaY: -1 })) + element.scrollTop = 0 + }) await timeline.send(partUpdated(shell(shellID, "running", lines(50))), 300) const regions = defineVisualRegions({ diff --git a/packages/app/e2e/regression/mobile-timeline-scroll.spec.ts b/packages/app/e2e/regression/mobile-timeline-scroll.spec.ts index b83a499d511..888daa67dcd 100644 --- a/packages/app/e2e/regression/mobile-timeline-scroll.spec.ts +++ b/packages/app/e2e/regression/mobile-timeline-scroll.spec.ts @@ -562,7 +562,11 @@ for (const device of ["Pixel 7", "iPhone 13"]) { if (!handoff.held) await devtools.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] }) - if (handoff.key === "latest") await latest.click() + if (handoff.key === "latest") { + await latest.click() + // The hidden button no longer covers the timeline, so a resting pointer would hover it and keep the thumb shown. + await page.mouse.move(0, 0) + } if (handoff.key !== "latest" && !usesScrollbar) await scroller.press(handoff.key) diff --git a/packages/app/e2e/regression/session-timeline-accessibility.spec.ts b/packages/app/e2e/regression/session-timeline-accessibility.spec.ts index acddfaba682..e2525582b5b 100644 --- a/packages/app/e2e/regression/session-timeline-accessibility.spec.ts +++ b/packages/app/e2e/regression/session-timeline-accessibility.spec.ts @@ -38,6 +38,30 @@ test("space activates a focused timeline button instead of scrolling", async ({ expect(await scroller.evaluate((element) => element.scrollTop)).toBe(before) }) +test("jump to latest is reachable only while it is shown", async ({ page }) => { + await setupTimeline(page, { + messages: [userMessage(), assistantMessage([textPart("prt_jump_latest_text", "Latest response.")])], + seedHistory: true, + }) + const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") }) + const jump = page.getByRole("button", { name: "Jump to latest", exact: true }) + const latest = page.getByText("Latest response.", { exact: true }) + await expect(latest).toBeInViewport() + await jump.focus() + await expect(jump).not.toBeFocused() + + await scroller.hover() + await page.mouse.wheel(0, -3000) + await expect(latest).not.toBeInViewport() + await jump.click() + await expect + .poll(() => scroller.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop)) + .toBeLessThanOrEqual(1) + await expect(latest).toBeInViewport() + // The click focused the button; hiding it must not leave focus on an invisible control. + await expect(jump).not.toBeFocused() +}) + function lines(count: number) { return Array.from({ length: count }, (_, index) => `line ${index + 1}`).join("\n") } diff --git a/packages/app/src/session/timeline/interaction.ts b/packages/app/src/session/timeline/interaction.ts index fff226971bf..7e1d261bdc9 100644 --- a/packages/app/src/session/timeline/interaction.ts +++ b/packages/app/src/session/timeline/interaction.ts @@ -59,7 +59,7 @@ export function createSessionTimelineInteraction(session: SessionModel) { // The active timeline's navigation, registered by its virtualizer. let revealMessage = (_id: string, _partID?: string) => {} - let scrollToEnd = () => {} + let scrollToEnd = (_behavior?: ScrollBehavior) => {} let scrollMark = 0 let messageMark = 0 @@ -160,10 +160,10 @@ export function createSessionTimelineInteraction(session: SessionModel) { consumePendingMessage: (key) => layout.pendingMessage.consume(key), }) - const resume = () => { + const resume = (behavior?: ScrollBehavior) => { setState("messageID", undefined) pin() - scrollToEnd() + scrollToEnd(behavior) clearMessageHash() if (scroller) scheduleScrollState(scroller) @@ -397,7 +397,7 @@ export function createSessionTimelineInteraction(session: SessionModel) { }, }, setScrollRef, - setScrollToEnd: (scroll: () => void) => { + setScrollToEnd: (scroll: (behavior?: ScrollBehavior) => void) => { scrollToEnd = scroll }, unpin, diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx index 85acc85e02b..b67f3e53cec 100644 --- a/packages/app/src/session/timeline/message-timeline.tsx +++ b/packages/app/src/session/timeline/message-timeline.tsx @@ -73,7 +73,7 @@ type MessageTimelineProps = { background: SessionBackground actions?: SessionUserActions scroll: { overflow: boolean; jump: boolean } - onResumeScroll: () => void + onResumeScroll: (behavior?: ScrollBehavior) => void setScrollRef: (el: HTMLDivElement | undefined) => void onScheduleScrollState: (el: HTMLDivElement) => void onPin: () => void @@ -87,7 +87,7 @@ type MessageTimelineProps = { setContentRef: (el: HTMLDivElement) => void anchor: (id: string) => string setRevealMessage?: (fn: (id: string, partID?: string) => void) => void - setScrollToEnd?: (fn: () => void) => void + setScrollToEnd?: (fn: (behavior?: ScrollBehavior) => void) => void reveal?: { target: () => string | undefined; done: () => void } search?: JSX.Element } diff --git a/packages/app/src/session/timeline/virtualizer.tsx b/packages/app/src/session/timeline/virtualizer.tsx index fe26622eaf1..6e8ddb8e828 100644 --- a/packages/app/src/session/timeline/virtualizer.tsx +++ b/packages/app/src/session/timeline/virtualizer.tsx @@ -63,7 +63,7 @@ type Input = { /** True while the timeline follows the newest content. Drives every anchoring decision. */ pinned: Accessor scroll: Accessor<{ overflow: boolean; jump: boolean }> - onResumeScroll: () => void + onResumeScroll: (behavior?: ScrollBehavior) => void setScrollRef: (element: HTMLDivElement | undefined) => void setContentRef: (element: HTMLDivElement) => void onScheduleScrollState: (element: HTMLDivElement) => void @@ -77,7 +77,7 @@ type Input = { disclosure: Readonly>, ) => boolean setRevealMessage?: (fn: (id: string, partID?: string) => void) => void - setScrollToEnd?: (fn: () => void) => void + setScrollToEnd?: (fn: (behavior?: ScrollBehavior) => void) => void /** A tool call the route asks this timeline to open on; `done` clears it once revealed. */ reveal?: { target: () => string | undefined; done: () => void } } @@ -528,11 +528,17 @@ export function createTimelineVirtualizer(input: Input) { prepareNavigation() virtualizer.scrollToIndex(index, { align: "center" }) }) - input.setScrollToEnd?.(() => { - if (!active() || !listRoot()?.isConnected) return + input.setScrollToEnd?.((behavior) => { + const root = listRoot() + + if (!active() || !root?.isConnected) return prepareNavigation() input.onPin() - virtualizer.scrollToEnd() + + // Glide only the final screen. Crossing the whole history smoothly would stream every row through the virtualizer. + if (behavior === "smooth") + virtualizer.scrollToOffset(Math.max(root.scrollTop, root.scrollHeight - root.clientHeight * 2)) + virtualizer.scrollToEnd({ behavior }) }) }) @@ -847,23 +853,27 @@ export function createTimelineVirtualizer(input: Input) { data-local-session={!props.workspaceSession() ? "" : undefined} >