Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/web/src/components/chat/MessagesTimeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
use,
useCallback,
useEffect,
useLayoutEffect,
useMemo,
useRef,
useState,
Expand Down Expand Up @@ -68,6 +69,7 @@ import { buildExpandedImagePreview, ExpandedImagePreview } from "./ExpandedImage
import { ProposedPlanCard } from "./ProposedPlanCard";
import { ChangedFilesCard } from "./ChangedFilesTree";
import { shouldAutoExpandChangedFiles } from "./changedFilesPresentation";
import { keepTimelineEndVisibleAfterOverlayGrowth } from "./timelineScrollAnchoring";
import { MessageCopyButton } from "./MessageCopyButton";
import {
computeStableMessagesTimelineRows,
Expand Down Expand Up @@ -286,6 +288,17 @@ export const MessagesTimeline = memo(function MessagesTimeline({
const disclosureAnchorKeyRef = useRef<string | null>(null);
const disclosureSettleFrameRef = useRef<number | null>(null);
const disclosureSettleSecondFrameRef = useRef<number | null>(null);
const previousContentInsetEndAdjustmentRef = useRef(contentInsetEndAdjustment);

useLayoutEffect(() => {
keepTimelineEndVisibleAfterOverlayGrowth({
timeline: listRef.current,
previousOverlayHeight: previousContentInsetEndAdjustmentRef.current,
overlayHeight: contentInsetEndAdjustment,
followingEnd: liveFollowEnabled && anchorMessageId === null,
});
previousContentInsetEndAdjustmentRef.current = contentInsetEndAdjustment;
}, [anchorMessageId, contentInsetEndAdjustment, listRef, liveFollowEnabled]);

useEffect(() => {
return () => {
Expand Down
35 changes: 33 additions & 2 deletions apps/web/src/components/chat/timelineScrollAnchoring.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { describe, expect, it } from "vite-plus/test";
import { getAnchoredTurnMetrics, getRowBottom } from "./timelineScrollAnchoring";
import { describe, expect, it, vi } from "vite-plus/test";
import {
getAnchoredTurnMetrics,
getRowBottom,
keepTimelineEndVisibleAfterOverlayGrowth,
} from "./timelineScrollAnchoring";

function buildState({
positions,
Expand All @@ -22,6 +26,33 @@ function buildState({
}

describe("timeline scroll anchoring", () => {
it("keeps the live edge visible when the composer overlay grows", () => {
const scrollToEnd = vi.fn();

keepTimelineEndVisibleAfterOverlayGrowth({
timeline: { scrollToEnd },
previousOverlayHeight: 120,
overlayHeight: 180,
followingEnd: true,
});

expect(scrollToEnd).toHaveBeenCalledOnce();
expect(scrollToEnd).toHaveBeenCalledWith({ animated: false });
});

it("leaves the scroll position alone while the user reads history", () => {
const scrollToEnd = vi.fn();

keepTimelineEndVisibleAfterOverlayGrowth({
timeline: { scrollToEnd },
previousOverlayHeight: 120,
overlayHeight: 180,
followingEnd: false,
});

expect(scrollToEnd).not.toHaveBeenCalled();
});

it("measures row bottoms from LegendList row position and size", () => {
const state = buildState({
positions: [0, 120],
Expand Down
16 changes: 16 additions & 0 deletions apps/web/src/components/chat/timelineScrollAnchoring.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,22 @@ export interface AnchoredTurnMetrics {
readonly scrollDeltaToRevealEnd: number;
}

export function keepTimelineEndVisibleAfterOverlayGrowth({
timeline,
previousOverlayHeight,
overlayHeight,
followingEnd,
}: {
readonly timeline: { scrollToEnd: (options: { animated: boolean }) => unknown } | null;
readonly previousOverlayHeight: number;
readonly overlayHeight: number;
readonly followingEnd: boolean;
}): void {
if (timeline && followingEnd && overlayHeight > previousOverlayHeight) {
void timeline.scrollToEnd({ animated: false });
}
}

export function getRowBottom(state: TimelineListMeasurementState, index: number): number | null {
const top = state.positionAtIndex(index);
const height = state.sizeAtIndex(index);
Expand Down
Loading