🎥 Make videos programmatically with React
`@remotion/studio`: Place Series overlays below scene children
Jonny Burger85055bb23ce4
diff --git a/packages/studio/src/components/Timeline/TimelineList.tsx b/packages/studio/src/components/Timeline/TimelineList.tsxindex 3291e6f88f..9d6ddaa0a5 100644--- a/packages/studio/src/components/Timeline/TimelineList.tsx+++ b/packages/studio/src/components/Timeline/TimelineList.tsx@@ -52,16 +52,21 @@ const TimelineListTrack: React.FC<{track.nodePathInfo === null && track.displayGroup !== null}/>- {row.auxiliaryRows.length > 0 ? (+ {row.auxiliaryRowOffsets.map((offset) => (<div+ key={offset}aria-hidden="true"style={{- height:- row.auxiliaryRows.length * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ position: 'absolute',+ top: offset,+ left: 0,+ right: 0,+ height: TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,borderBottom: `1px solid ${TIMELINE_TRACK_SEPARATOR}`,+ pointerEvents: 'none',}}/>- ) : null}+ ))}</div>);});diff --git a/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx b/packages/studio/src/components/Timeline/TimelinePackedTrack.tsxindex 946694737c..d7c41b3116 100644--- a/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx+++ b/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx@@ -16,8 +16,9 @@ const primaryRowHeight =export const TimelinePackedTrack: React.FC<{readonly track: TimelineTrackWithDisplayGroup;readonly items: readonly TimelineTrackWithDisplayGroup[];+ readonly auxiliaryRowOffsets: readonly number[];readonly auxiliaryRows: readonly (readonly TimelineTrackWithDisplayGroup[])[];-}> = ({track, items, auxiliaryRows}) => {+}> = ({track, items, auxiliaryRows, auxiliaryRowOffsets}) => {const {dropIndicatorLeft, onClickCapture, onPointerDownCapture} =useSeriesReorder(items);const rows = useMemo(() => {@@ -26,15 +27,11 @@ export const TimelinePackedTrack: React.FC<{.sort((a, b) => a.sequence.from - b.sequence.from);return [clips, ...auxiliaryRows].map((row, index) => ({items: row,- top:- index === 0- ? 0- : primaryRowHeight +- (index - 1) * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ top: index === 0 ? 0 : auxiliaryRowOffsets[index - 1],height:index === 0 ? primaryRowHeight : TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,}));- }, [auxiliaryRows, items]);+ }, [auxiliaryRows, auxiliaryRowOffsets, items]);return (<div@@ -43,9 +40,12 @@ export const TimelinePackedTrack: React.FC<{onPointerDownCapture={onPointerDownCapture}style={{position: 'relative',- height:- primaryRowHeight +- auxiliaryRows.length * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ height: Math.max(+ primaryRowHeight,+ ...auxiliaryRowOffsets.map(+ (offset) => offset + TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ ),+ ),}}>{rows.map((row) => (diff --git a/packages/studio/src/components/Timeline/TimelineTracks.tsx b/packages/studio/src/components/Timeline/TimelineTracks.tsxindex 4f78d31766..de16d178f2 100644--- a/packages/studio/src/components/Timeline/TimelineTracks.tsx+++ b/packages/studio/src/components/Timeline/TimelineTracks.tsx@@ -95,7 +95,7 @@ const TimelineTracksInner: React.FC<{<div style={timelineStyle} {...{'oai-annotation-container': ''}}><div style={{...content, height: tracksEnd}}>{virtualItems.map((virtualItem) => {- const {sceneRange, track, items, auxiliaryRows} =+ const {sceneRange, track, items, auxiliaryRows, auxiliaryRowOffsets} =rows[virtualItem.index];const trackContent =items === null ? (@@ -105,6 +105,7 @@ const TimelineTracksInner: React.FC<{track={track}items={items}auxiliaryRows={auxiliaryRows}+ auxiliaryRowOffsets={auxiliaryRowOffsets}/>);return (diff --git a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx b/packages/studio/src/components/Timeline/TimelineVirtualization.tsxindex 928b0cd7f0..dd09932d6f 100644--- a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx+++ b/packages/studio/src/components/Timeline/TimelineVirtualization.tsx@@ -38,6 +38,7 @@ import {useCompactSeries} from './use-compact-series';import {useTimelineTrackHeights} from './use-timeline-height';export type TimelineVirtualRow = TimelineDisplayRow & {+ readonly auxiliaryRowOffsets: readonly number[];readonly afterDropLineOffset: number;readonly siblingIndex: number;readonly sceneRange: TimelineSceneRange | null;@@ -111,6 +112,7 @@ export const TimelineVirtualizationProvider: React.FC<{const rows = timeline.map(({track, items, auxiliaryRows}, index): TimelineVirtualRow => {const afterDropLineOffset = seriesLayout.afterDropLineOffsets[index];+ const auxiliaryRowOffsets = seriesLayout.auxiliaryRowOffsets[index];const siblingIndex = seriesLayout.siblingIndexes[index];const sceneRange = seriesLayout.sceneRanges[index];const sceneGroupId =@@ -124,6 +126,11 @@ export const TimelineVirtualizationProvider: React.FC<{previous?.track === track &&previous.items === items &&previous.auxiliaryRows === auxiliaryRows &&+ previous.auxiliaryRowOffsets.length === auxiliaryRowOffsets.length &&+ previous.auxiliaryRowOffsets.every(+ (offset, auxiliaryIndex) =>+ offset === auxiliaryRowOffsets[auxiliaryIndex],+ ) &&previous.afterDropLineOffset === afterDropLineOffset &&previous.siblingIndex === siblingIndex &&previous.sceneGroupId === sceneGroupId &&@@ -134,6 +141,7 @@ export const TimelineVirtualizationProvider: React.FC<{}return {+ auxiliaryRowOffsets,afterDropLineOffset,siblingIndex,track,@@ -346,10 +354,7 @@ export const TimelineVirtualizationProvider: React.FC<{TIMELINE_PACKED_TRACK_HEIGHT + TIMELINE_ITEM_BORDER_BOTTOM;const start =layout.offsets[index] +- (auxiliaryIndex === -1- ? 0- : primaryHeight +- auxiliaryIndex * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT);+ (auxiliaryIndex === -1 ? 0 : row.auxiliaryRowOffsets[auxiliaryIndex]);const height =auxiliaryIndex !== -1? TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT@@ -433,7 +438,7 @@ export const TimelineVirtualizationProvider: React.FC<{return (verticalRenderWindow !== null &&layout.offsets[index] < verticalRenderWindow.bottom &&- layout.offsets[index] + trackHeights[index] >+ layout.offsets[index] + layout.rowHeights[index] >verticalRenderWindow.top);})@@ -442,8 +447,8 @@ export const TimelineVirtualizationProvider: React.FC<{index,key: timeline[index].track.sequence.id,start: layout.offsets[index],- end: layout.offsets[index] + trackHeights[index],- size: trackHeights[index],+ end: layout.offsets[index] + layout.rowHeights[index],+ size: layout.rowHeights[index],lane: 0,}),),@@ -451,9 +456,9 @@ export const TimelineVirtualizationProvider: React.FC<{[layout.groups,layout.offsets,+ layout.rowHeights,selectedTrackIndexes,timeline,- trackHeights,verticalRenderWindow,virtualGroups,],diff --git a/packages/studio/src/components/Timeline/timeline-series-layout.ts b/packages/studio/src/components/Timeline/timeline-series-layout.tsindex b0344191db..9fde5e5d2c 100644--- a/packages/studio/src/components/Timeline/timeline-series-layout.ts+++ b/packages/studio/src/components/Timeline/timeline-series-layout.ts@@ -1,6 +1,9 @@import type {TSequence} from 'remotion';import type {TimelineTrackWithDisplayGroup} from './timeline-display-groups';-import type {TimelineDisplayRow} from './timeline-track-groups';+import {+ TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ type TimelineDisplayRow,+} from './timeline-track-groups';export type TimelineSceneRange = {readonly from: number;@@ -90,6 +93,15 @@ export const getTimelineSeriesLayout = ({}const offsets = new Array<number>(rows.length);+ const rowHeights = [...heights];+ const auxiliaryRowOffsets = rows.map((row, index) =>+ row.auxiliaryRows.map(+ (_, auxiliaryIndex) =>+ heights[index] -+ (row.auxiliaryRows.length - auxiliaryIndex) *+ TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ ),+ );const sceneRanges = new Array<TimelineSceneRange | null>(rows.length).fill(null,);@@ -117,8 +129,28 @@ export const getTimelineSeriesLayout = ({continue;}+ // Keep transitions by the scene track, but place overlays after scene children.+ const overlayRows = rows[index].auxiliaryRows.flatMap(+ (items, auxiliaryIndex) =>+ items[0]?.sequence.timelineTrack?.role === 'overlay'+ ? [auxiliaryIndex]+ : [],+ );+ cursor -= overlayRows.length * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT;// Overlay contents get their own space below the scene contents.for (const role of ['clip', 'overlay'] as const) {+ if (role === 'overlay') {+ for (const auxiliaryIndex of overlayRows) {+ auxiliaryRowOffsets[index][auxiliaryIndex] =+ cursor - offsets[index];+ cursor += TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT;+ }++ if (overlayRows.length > 0) {+ rowHeights[index] = cursor - offsets[index];+ }+ }+const lanes: {end: number; height: number}[] = [];const placements: {lane: number; rows: number[]}[] = [];for (const {sequence} of scenes) {@@ -186,7 +218,9 @@ export const getTimelineSeriesLayout = ({siblingCounts.set(track.sequence.parent, index + 1);return index;});- const subtreeEnds = offsets.map((offset, index) => offset + heights[index]);+ const subtreeEnds = offsets.map(+ (offset, index) => offset + rowHeights[index],+ );for (let index = 0; index < rows.length; index++) {let {parent} = rows[index].track.sequence;while (parent !== null) {@@ -194,7 +228,7 @@ export const getTimelineSeriesLayout = ({if (parentIndex !== undefined) {subtreeEnds[parentIndex] = Math.max(subtreeEnds[parentIndex],- offsets[index] + heights[index],+ offsets[index] + rowHeights[index],);}@@ -204,6 +238,8 @@ export const getTimelineSeriesLayout = ({return {offsets,+ rowHeights,+ auxiliaryRowOffsets,sceneRanges,groupIndexes,groups,