Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Increase forward timeline overscan (#10610)

Jonny Burger3ac516bae6fc
diff --git a/packages/studio/src/components/Timeline/TimelineViewport.tsx b/packages/studio/src/components/Timeline/TimelineViewport.tsx
index 56909d8944..583114e836 100644
--- a/packages/studio/src/components/Timeline/TimelineViewport.tsx
+++ b/packages/studio/src/components/Timeline/TimelineViewport.tsx
@@ -13,13 +13,20 @@ type TimelineRenderWindow = {
export const TimelineViewportContext =
createContext<TimelineRenderWindow | null>(null);
-const getRenderWindow = (scrollable: HTMLDivElement): TimelineRenderWindow => {
+export const getTimelineRenderWindow = (
+ scrollable: HTMLDivElement,
+): TimelineRenderWindow => {
const viewportWidth = scrollable.clientWidth;
if (viewportWidth === 0) {
return {left: 0, width: 0};
}
- const currentSection = Math.floor(scrollable.scrollLeft / viewportWidth);
+ // Move the render window half a viewport before the visible viewport reaches
+ // its right edge. This keeps at least half a viewport rendered ahead while
+ // retaining the three-viewport-wide window.
+ const currentSection = Math.floor(
+ (scrollable.scrollLeft + viewportWidth / 2) / viewportWidth,
+ );
const left = Math.max(0, (currentSection - 1) * viewportWidth);
return {
@@ -43,7 +50,7 @@ export const TimelineViewportProvider: React.FC<{
return;
}
- const next = getRenderWindow(element);
+ const next = getTimelineRenderWindow(element);
setRenderWindow((previous) => {
if (previous.left === next.left && previous.width === next.width) {
return previous;
diff --git a/packages/studio/src/test/timeline-viewport.test.ts b/packages/studio/src/test/timeline-viewport.test.ts
new file mode 100644
index 0000000000..42a32329cb
--- /dev/null
+++ b/packages/studio/src/test/timeline-viewport.test.ts
@@ -0,0 +1,22 @@
+import {expect, test} from 'bun:test';
+import {getTimelineRenderWindow} from '../components/Timeline/TimelineViewport';
+
+const getRenderWindow = (scrollLeft: number) => {
+ return getTimelineRenderWindow({
+ clientWidth: 100,
+ scrollLeft,
+ } as HTMLDivElement);
+};
+
+test('advances the render window half a viewport before its right edge', () => {
+ expect(getRenderWindow(0)).toEqual({left: 0, width: 300});
+ expect(getRenderWindow(149.999)).toEqual({left: 0, width: 300});
+ expect(getRenderWindow(150)).toEqual({left: 100, width: 300});
+ expect(getRenderWindow(249.999)).toEqual({left: 100, width: 300});
+ expect(getRenderWindow(250)).toEqual({left: 200, width: 300});
+
+ const beforeBoundary = getRenderWindow(249.999);
+ const renderedAhead =
+ beforeBoundary.left + beforeBoundary.width - (249.999 + 100);
+ expect(renderedAhead).toBeGreaterThanOrEqual(50);
+});