Skip to content

Write HTML. Render video. Built for agents.

fix(studio): timeline lanes hold still while a clip drags onto a new track (#4892)

Miguel Ángela2efe7b46d20
diff --git a/packages/studio/src/player/components/Timeline.test.ts b/packages/studio/src/player/components/Timeline.test.ts
index 70a3efa49e..84b1406e7a 100644
--- a/packages/studio/src/player/components/Timeline.test.ts
+++ b/packages/studio/src/player/components/Timeline.test.ts
@@ -70,6 +70,21 @@ describe("timeline viewport geometry", () => {
const scrollTop = previous.getRowTop(2) - RULER_H + 6;
expect(getTimelineScrollTopForGeometryChange(previous, next, scrollTop)).toBe(scrollTop + 56);
});
+
+ it("keeps a row added above the top row in view while the list sits at the top", () => {
+ // No top padding (trackPadding { top: 0 }), so the first row sits right under the ruler.
+ const previous = createTimelineRowGeometry([1, 2, 3], [48, 48, 48], { top: 0 });
+ const next = createTimelineRowGeometry([9, 1, 2, 3], [48, 48, 48, 48], { top: 0 });
+ expect(getTimelineScrollTopForGeometryChange(previous, next, 0)).toBe(0);
+ });
+
+ it("leaves scrollTop to edge auto-scroll while a clip drag adds a row above", () => {
+ const previous = createTimelineRowGeometry([1, 2, 3], [48, 48, 48]);
+ const next = createTimelineRowGeometry([9, 1, 2, 3], [48, 48, 48, 48]);
+ const scrollTop = previous.getRowTop(1) - RULER_H + 6;
+ expect(getTimelineScrollTopForGeometryChange(previous, next, scrollTop, true)).toBe(scrollTop);
+ expect(getTimelineScrollTopForGeometryChange(previous, next, scrollTop)).toBe(scrollTop + 48);
+ });
});
function getHorizontalGeometry(host: HTMLElement, clipId: string, tickLabel: string) {
diff --git a/packages/studio/src/player/components/timelineViewportGeometry.ts b/packages/studio/src/player/components/timelineViewportGeometry.ts
index db0a964232..6c408a0128 100644
--- a/packages/studio/src/player/components/timelineViewportGeometry.ts
+++ b/packages/studio/src/player/components/timelineViewportGeometry.ts
@@ -40,7 +40,10 @@ export function getTimelineScrollTopForGeometryChange(
previous: TimelineRowGeometry,
next: TimelineRowGeometry,
scrollTop: number,
+ dragAutoScrollOwnsScrollTop = false,
): number {
+ const atTopSoRowsAddedAboveStayShown = scrollTop <= 0;
+ if (dragAutoScrollOwnsScrollTop || atTopSoRowsAddedAboveStayShown) return scrollTop;
const anchor = previous.getRowPositionFromY(scrollTop + RULER_H);
if (anchor.row < 0 || anchor.row >= previous.rowKeys.length) return scrollTop;
const anchorKey = previous.rowKeys[anchor.row];
diff --git a/packages/studio/src/player/components/useTimelineRowVirtualization.ts b/packages/studio/src/player/components/useTimelineRowVirtualization.ts
index 2396631558..73c23e639c 100644
--- a/packages/studio/src/player/components/useTimelineRowVirtualization.ts
+++ b/packages/studio/src/player/components/useTimelineRowVirtualization.ts
@@ -120,6 +120,7 @@ export function useTimelineRowVirtualization({
previousGeometry,
rowGeometry,
scroll.scrollTop,
+ draggedRowKey !== undefined,
);
if (nextScrollTop !== scroll.scrollTop) {
scroll.scrollTop = nextScrollTop;
@@ -127,7 +128,7 @@ export function useTimelineRowVirtualization({
}
}
previousLayoutRef.current = rowGeometry;
- }, [lastScrollLeftRef, rowGeometry, scrollRef, sessionEpoch, syncScrollViewport]);
+ }, [draggedRowKey, lastScrollLeftRef, rowGeometry, scrollRef, sessionEpoch, syncScrollViewport]);
return {
enabled,