π₯ Make videos programmatically with React
Refine Track inheritance and playhead-driven timeline layers
Jonny Burger9acb77456ee5
diff --git a/packages/core/src/Sequence.tsx b/packages/core/src/Sequence.tsxindex 1fc85feeaf..72d074a5b6 100644--- a/packages/core/src/Sequence.tsx+++ b/packages/core/src/Sequence.tsx@@ -102,10 +102,7 @@ export type SequencePropsWithoutDuration = {/*** @deprecated For internal use only.*/- readonly _remotionInternalTimelineTrack?: Pick<- TimelineTrackItem,- 'role' | 'anchor'- >;+ readonly _remotionInternalTimelineTrack?: Pick<TimelineTrackItem, 'role'>;/*** @deprecated For internal use only.*/@@ -647,7 +644,6 @@ const RegularSequenceRefForwardingFunction: React.ForwardRefRenderFunction<timelineTrack: {...timelineTrack,role: timelineTrackRole,- anchor: timelineTrackItem?.anchor ?? null,},}: {};@@ -751,7 +747,6 @@ const RegularSequenceRefForwardingFunction: React.ForwardRefRenderFunction<id,timelineTrack,timelineTrackRole,- timelineTrackItem?.anchor,getCurrentFrame,timelineClipName,playbackRate,diff --git a/packages/core/src/Track.tsx b/packages/core/src/Track.tsxindex 99305d70ce..4c8a8212e4 100644--- a/packages/core/src/Track.tsx+++ b/packages/core/src/Track.tsx@@ -1,5 +1,4 @@import React, {useMemo, useState} from 'react';-import type {SequenceControls} from './CompositionManager.js';import {addSequenceStackTraces} from './enable-sequence-stack-traces.js';import {sequenceSchema} from './interactivity-schema.js';import {SequenceWithoutSchema, type SequenceProps} from './Sequence.js';@@ -21,9 +20,14 @@ const trackSchema = {hidden: sequenceSchema.hidden,};-const TrackInner: React.FC<- TrackProps & {readonly controls: SequenceControls | undefined}-> = ({name = 'Track', children, controls, ...props}) => {+// Series variants share the Track foundation while retaining their own+// Sequence props, layout defaults, and interactivity schemas.+export const TrackWithoutSchema: React.FC<SequenceProps> = ({+ name = 'Track',+ children,+ layout = 'none',+ ...props+}) => {const [id] = useState(() => String(Math.random()));const value = useMemo(() => ({id, name}), [id, name]);@@ -32,9 +36,8 @@ const TrackInner: React.FC<<SequenceWithoutSchema{...props}name={name}- controls={controls}- layout="none"- _remotionInternalTimelineTrack={{role: 'track', anchor: null}}+ layout={layout}+ _remotionInternalTimelineTrack={{role: 'track'}}>{children}</SequenceWithoutSchema>@@ -44,7 +47,7 @@ const TrackInner: React.FC</** Groups clips on one Studio timeline row and applies Sequence timing. */export const Track = withInteractivitySchema<typeof trackSchema, TrackProps>({- Component: TrackInner,+ Component: TrackWithoutSchema,componentName: '<Track>',componentIdentity: 'dev.remotion.remotion.Track',schema: trackSchema,diff --git a/packages/core/src/internals.ts b/packages/core/src/internals.tsindex 2edd2498a5..795d69758b 100644--- a/packages/core/src/internals.ts+++ b/packages/core/src/internals.ts@@ -233,6 +233,7 @@ import {type SetTimelineContextValue,type TimelineContextValue,} from './TimelineContext.js';+import {TrackWithoutSchema} from './Track.js';import {truthy} from './truthy.js';import {useBuffering} from './use-buffering.js';import {useCropStyle} from './use-crop-style.js';@@ -397,6 +398,7 @@ export const Internals = {truthy,SequenceContext,TimelineTrackContext,+ TrackWithoutSchema,PremountContext,usePremounting,resolveSequenceDuration,diff --git a/packages/core/src/series/index.tsx b/packages/core/src/series/index.tsxindex e16541e9b1..e35201abc4 100644--- a/packages/core/src/series/index.tsx+++ b/packages/core/src/series/index.tsx@@ -15,7 +15,8 @@ import {type InteractivitySchema,} from '../interactivity-schema.js';import type {LayoutAndStyle, SequenceProps} from '../Sequence.js';-import {Sequence, SequenceWithoutSchema} from '../Sequence.js';+import {SequenceWithoutSchema} from '../Sequence.js';+import {TrackWithoutSchema} from '../Track.js';import {validateDurationInFrames} from '../validation/validate-duration-in-frames.js';import {withInteractivitySchema} from '../with-interactivity-schema.js';import {flattenChildren} from './flatten-children.js';@@ -257,15 +258,14 @@ const SeriesInner: FC<SeriesProps> = (props) => {}, [props.children]);return (- <Sequence+ <TrackWithoutSchemalayout="none"- name="<Series>"_remotionInternalDocumentationLink="https://www.remotion.dev/docs/series"{...props}- _remotionInternalTimelineTrack={{role: 'container', anchor: null}}+ name={props.name ?? '<Series>'}><IsInsideSeriesContainer>{childrenValue}</IsInsideSeriesContainer>- </Sequence>+ </TrackWithoutSchema>);};diff --git a/packages/core/src/timeline-track-context.ts b/packages/core/src/timeline-track-context.tsindex fac4abeb71..04d73dd4c6 100644--- a/packages/core/src/timeline-track-context.ts+++ b/packages/core/src/timeline-track-context.ts@@ -7,8 +7,6 @@ export type TimelineTrack = {export type TimelineTrackItem = TimelineTrack & {readonly role: 'track' | 'clip' | 'container' | 'transition' | 'overlay';- /** Position in the containing sequence's clock, used for overlay markers. */- readonly anchor: number | null;};export const TimelineTrackContext = createContext<TimelineTrack | null>(null);diff --git a/packages/core/src/use-media-in-timeline.ts b/packages/core/src/use-media-in-timeline.tsindex 0bd12bb9d4..d4261ab64a 100644--- a/packages/core/src/use-media-in-timeline.ts+++ b/packages/core/src/use-media-in-timeline.ts@@ -281,7 +281,6 @@ export const useMediaInTimeline = ({timelineTrack: {...timelineTrack,role: 'clip' as const,- anchor: null,},}: {}),diff --git a/packages/example/src/TrackPrototype.tsx b/packages/example/src/TrackPrototype.tsxindex 0c7db00dbc..18416c6469 100644--- a/packages/example/src/TrackPrototype.tsx+++ b/packages/example/src/TrackPrototype.tsx@@ -20,7 +20,15 @@ const DemoCard: React.FC<{<div style={{fontSize: 21, fontWeight: 600, marginBottom: 5}}>{title}</div>- <div style={{fontSize: 15, color: '#a7b0c0', marginBottom: 12}}>+ <div+ style={{+ fontSize: 15,+ lineHeight: '19px',+ minHeight: 38,+ color: '#a7b0c0',+ marginBottom: 12,+ }}+ >{description}</div><div@@ -92,7 +100,7 @@ export const TrackPrototype: React.FC = () => {backgroundColor: '#101720',color: 'white',fontFamily: 'Arial, sans-serif',- padding: 48,+ padding: 40,}}><div style={{display: 'flex', justifyContent: 'space-between'}}>@@ -108,21 +116,21 @@ export const TrackPrototype: React.FC = () => {</div></div><div style={{fontSize: 18, color: '#a7b0c0', marginTop: 8}}>- Five named tracks. Each occupies one timeline row.+ One scene row per Track. Overlapping overlays add auxiliary rows.</div><divstyle={{display: 'grid',- gridTemplateColumns: '1fr 1fr',- gap: '28px 32px',+ gridTemplateColumns: '1fr 1fr 1fr',+ gap: '32px 24px',marginTop: 30,}}><DemoCardtitle="Series"- description="Three consecutive clips, 80 frames each."+ description="Automatically one row: 80 + 54 + 80 = 214 frames.">- <Series>+ <Series name="Series"><Series.Sequence name="Series A" durationInFrames={80}><Scene color="#3268a8">A</Scene></Series.Sequence>@@ -138,124 +146,157 @@ export const TrackPrototype: React.FC = () => {title="TransitionSeries"description="90-frame clips with 15-frame fades: 240 frames total.">- <Track name="Transitions">- <TransitionSeries>- <TransitionSeries.Sequence name="Fade A" durationInFrames={90}>- <Scene color="#327e79">A</Scene>- </TransitionSeries.Sequence>- <TransitionSeries.Transition- presentation={fade()}- timing={linearTiming({durationInFrames: 15})}- />- <TransitionSeries.Sequence name="Fade B" durationInFrames={90}>- <Scene color="#967130">B</Scene>- </TransitionSeries.Sequence>- <TransitionSeries.Transition- presentation={fade()}- timing={linearTiming({durationInFrames: 15})}- />- <TransitionSeries.Sequence name="Fade C" durationInFrames={90}>- <Scene color="#a34a43">C</Scene>- </TransitionSeries.Sequence>- </TransitionSeries>- </Track>+ <TransitionSeries name="Transitions">+ <TransitionSeries.Sequence name="Fade A" durationInFrames={90}>+ <Scene color="#327e79">A</Scene>+ </TransitionSeries.Sequence>+ <TransitionSeries.Transition+ presentation={fade()}+ timing={linearTiming({durationInFrames: 15})}+ />+ <TransitionSeries.Sequence name="Fade B" durationInFrames={90}>+ <Scene color="#967130">B</Scene>+ </TransitionSeries.Sequence>+ <TransitionSeries.Transition+ presentation={fade()}+ timing={linearTiming({durationInFrames: 15})}+ />+ <TransitionSeries.Sequence name="Fade C" durationInFrames={90}>+ <Scene color="#a34a43">C</Scene>+ </TransitionSeries.Sequence>+ </TransitionSeries></DemoCard><DemoCard- title="TransitionSeries.Overlay"- description="24-frame flashes: centered at cut 80; shifted +20 at cut 160."+ title="Overlays sharing a row"+ description="Frames 68β91 and 168β191 share one auxiliary row.">- <Track name="Overlays">- <TransitionSeries>- <TransitionSeries.Sequence name="Overlay A" durationInFrames={80}>- <Scene color="#436582">A</Scene>- </TransitionSeries.Sequence>- <TransitionSeries.Overlay durationInFrames={24}>- <Flash />- </TransitionSeries.Overlay>- <TransitionSeries.Sequence name="Overlay B" durationInFrames={80}>- <Scene color="#774e90">B</Scene>- </TransitionSeries.Sequence>- <TransitionSeries.Overlay durationInFrames={24} offset={20}>- <Flash />- </TransitionSeries.Overlay>- <TransitionSeries.Sequence name="Overlay C" durationInFrames={80}>- <Scene color="#8f5f48">C</Scene>- </TransitionSeries.Sequence>- </TransitionSeries>- </Track>+ <TransitionSeries name="Nonoverlapping overlays">+ <TransitionSeries.Sequence name="Overlay A" durationInFrames={80}>+ <Scene color="#436582">A</Scene>+ </TransitionSeries.Sequence>+ <TransitionSeries.Overlay durationInFrames={24}>+ <Flash />+ </TransitionSeries.Overlay>+ <TransitionSeries.Sequence name="Overlay B" durationInFrames={80}>+ <Scene color="#774e90">B</Scene>+ </TransitionSeries.Sequence>+ <TransitionSeries.Overlay durationInFrames={24} offset={20}>+ <Flash />+ </TransitionSeries.Overlay>+ <TransitionSeries.Sequence name="Overlay C" durationInFrames={80}>+ <Scene color="#8f5f48">C</Scene>+ </TransitionSeries.Sequence>+ </TransitionSeries></DemoCard><DemoCard- title="Negative offsets"- description="Later clips start 20 frames early and cover the previous clip."+ title="Overlapping overlays"+ description="Both effects appear on frames 80β119: three timeline rows.">- <Track name="Overlapping clips">- <Series>- <Series.Sequence name="Overlap A" durationInFrames={100}>- <Scene color="#517345">A</Scene>- </Series.Sequence>- <Series.Sequence- name="Overlap B"- durationInFrames={100}- offset={-20}+ <TransitionSeries name="Overlapping overlays">+ <TransitionSeries.Sequence name="Scene A" durationInFrames={80}>+ <Scene color="#355c6e">A</Scene>+ </TransitionSeries.Sequence>+ <TransitionSeries.Overlay durationInFrames={80}>+ <div+ style={{+ position: 'absolute',+ top: 12,+ left: 12,+ padding: '8px 12px',+ borderRadius: 6,+ backgroundColor: '#7de1c0',+ color: '#102e24',+ fontSize: 18,+ fontWeight: 600,+ }}>- <Scene color="#92742d">B</Scene>- </Series.Sequence>- <Series.Sequence- name="Overlap C"- durationInFrames={80}- offset={-20}+ Overlay 1 Β· 40β119+ </div>+ </TransitionSeries.Overlay>+ <TransitionSeries.Sequence+ name="Short scene B"+ durationInFrames={40}+ >+ <Scene color="#44566e">B</Scene>+ </TransitionSeries.Sequence>+ <TransitionSeries.Overlay durationInFrames={80}>+ <div+ style={{+ position: 'absolute',+ bottom: 12,+ right: 12,+ padding: '8px 12px',+ borderRadius: 6,+ backgroundColor: '#f1c27a',+ color: '#392710',+ fontSize: 18,+ fontWeight: 600,+ }}>- <Scene color="#a15437">C</Scene>- </Series.Sequence>- </Series>+ Overlay 2 Β· 80β159+ </div>+ </TransitionSeries.Overlay>+ <TransitionSeries.Sequence name="Scene C" durationInFrames={120}>+ <Scene color="#6b526e">C</Scene>+ </TransitionSeries.Sequence>+ </TransitionSeries>+ </DemoCard>+ <DemoCard+ title="Negative offsets"+ description="20-frame overlaps stay on the scene row; later clips cover earlier clips."+ >+ <Series name="Overlapping clips">+ <Series.Sequence name="Overlap A" durationInFrames={100}>+ <Scene color="#517345">A</Scene>+ </Series.Sequence>+ <Series.Sequence+ name="Overlap B"+ durationInFrames={100}+ offset={-20}+ >+ <Scene color="#92742d">B</Scene>+ </Series.Sequence>+ <Series.Sequence+ name="Overlap C"+ durationInFrames={80}+ offset={-20}+ >+ <Scene color="#a15437">C</Scene>+ </Series.Sequence>+ </Series>+ </DemoCard>+ <DemoCard+ title="Caption tokens"+ description="All eight clips stay registered while one word is visible."+ >+ <Track name="Caption tokens">+ <Sequence name="Every" durationInFrames={30}>+ <Scene color="#27354a">Every</Scene>+ </Sequence>+ <Sequence name="caption" from={30} durationInFrames={30}>+ <Scene color="#27354a">caption</Scene>+ </Sequence>+ <Sequence name="token" from={60} durationInFrames={30}>+ <Scene color="#27354a">token</Scene>+ </Sequence>+ <Sequence name="stays" from={90} durationInFrames={30}>+ <Scene color="#27354a">stays</Scene>+ </Sequence>+ <Sequence name="visible" from={120} durationInFrames={30}>+ <Scene color="#27354a">visible</Scene>+ </Sequence>+ <Sequence name="in" from={150} durationInFrames={30}>+ <Scene color="#27354a">in</Scene>+ </Sequence>+ <Sequence name="one" from={180} durationInFrames={30}>+ <Scene color="#27354a">one</Scene>+ </Sequence>+ <Sequence name="track" from={210} durationInFrames={30}>+ <Scene color="#27354a">track</Scene>+ </Sequence></Track></DemoCard></div>- <div- style={{- fontSize: 18,- color: '#a7b0c0',- marginTop: 28,- marginBottom: 12,- }}- >- Tokens β all eight sequences stay registered while one word is visible.- </div>- <div- style={{- position: 'relative',- height: 65,- borderRadius: 12,- overflow: 'hidden',- }}- >- <Track name="Caption tokens">- <Sequence name="Every" durationInFrames={30}>- <Scene color="#27354a">Every</Scene>- </Sequence>- <Sequence name="caption" from={30} durationInFrames={30}>- <Scene color="#27354a">caption</Scene>- </Sequence>- <Sequence name="token" from={60} durationInFrames={30}>- <Scene color="#27354a">token</Scene>- </Sequence>- <Sequence name="stays" from={90} durationInFrames={30}>- <Scene color="#27354a">stays</Scene>- </Sequence>- <Sequence name="visible" from={120} durationInFrames={30}>- <Scene color="#27354a">visible</Scene>- </Sequence>- <Sequence name="in" from={150} durationInFrames={30}>- <Scene color="#27354a">in</Scene>- </Sequence>- <Sequence name="one" from={180} durationInFrames={30}>- <Scene color="#27354a">one</Scene>- </Sequence>- <Sequence name="track" from={210} durationInFrames={30}>- <Scene color="#27354a">track</Scene>- </Sequence>- </Track>- </div></div>);};diff --git a/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsx b/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsxindex dc0b097f86..39c33ff600 100644--- a/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsx+++ b/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsx@@ -75,6 +75,8 @@ const IntroLowerThirdContent: React.FC<IntroLowerThirdProps> = ({<Interactive.Divname="Presenter name"style={{fontSize: 50, fontWeight: 700, color: '#111'}}+ from={38}+ premountFor={30}>{nameText}</Interactive.Div>diff --git a/packages/studio/src/components/Timeline/Timeline.tsx b/packages/studio/src/components/Timeline/Timeline.tsxindex 3175123724..e48b86a98d 100644--- a/packages/studio/src/components/Timeline/Timeline.tsx+++ b/packages/studio/src/components/Timeline/Timeline.tsx@@ -273,6 +273,48 @@ const TimelineContextMenuArea: React.FC<{);};+const TimelineTrackChildrenSyncer: React.FC<{+ readonly tracks: readonly TimelineTrackWithDisplayGroup[];+ readonly onChange: (activeTrackItemIds: ReadonlySet<string>) => void;+}> = React.memo(({tracks, onChange}) => {+ const frame = Internals.Timeline.useTimelinePosition();+ const packedItems = useMemo(+ () =>+ tracks.filter(({sequence}) => {+ const role = sequence.timelineTrack?.role;+ return role === 'clip' || role === 'overlay' || role === 'transition';+ }),+ [tracks],+ );+ const activeTrackItemIds = useMemo(+ () =>+ new Set(+ packedItems+ .filter(+ ({sequence}) =>+ frame >= sequence.from &&+ frame < sequence.from + sequence.duration,+ )+ .map(({sequence}) => sequence.id),+ ),+ [frame, packedItems],+ );+ const previousActiveIds = useRef<ReadonlySet<string>>(new Set());+ useLayoutEffect(() => {+ if (+ previousActiveIds.current.size === activeTrackItemIds.size &&+ [...activeTrackItemIds].every((id) => previousActiveIds.current.has(id))+ ) {+ return;+ }++ previousActiveIds.current = activeTrackItemIds;+ onChange(activeTrackItemIds);+ }, [activeTrackItemIds, onChange]);++ return null;+});+const TimelineInner: React.FC = () => {const sequences = Internals.useSequenceManagerSequences();const {canvasContent, compositions} = useContext(@@ -412,12 +454,19 @@ const TimelineInner: React.FC = () => {return shouldShowTrackInTimeline(t, durationInFrames);});}, [activeFromDragOverrideKeys, durationInFrames, timeline]);+ const [activeTrackItemIds, setActiveTrackItemIds] = useState<+ ReadonlySet<string>+ >(() => new Set());// Keep `filtered` complete so a future toggle can show every programmatic// instance without recalculating the timeline or losing its instance index.const collapsed = useMemo(() => {const seenDisplayGroups = new Set<string>();- return filterTimelineTrackContents(filtered, sequences).filter((track) => {+ return filterTimelineTrackContents(+ filtered,+ sequences,+ activeTrackItemIds,+ ).filter((track) => {if (track.sequence.timelineTrack || track.displayGroup === null) {return true;}@@ -429,7 +478,7 @@ const TimelineInner: React.FC = () => {seenDisplayGroups.add(track.displayGroup.key);return true;});- }, [filtered, sequences]);+ }, [activeTrackItemIds, filtered, sequences]);const {visibleTracks, value: layerChildrenValue} = useTimelineLayerChildren(collapsed,@@ -567,6 +616,10 @@ const TimelineInner: React.FC = () => {return (<TimelineContextMenuArea>+ <TimelineTrackChildrenSyncer+ tracks={filtered}+ onChange={setActiveTrackItemIds}+ />{sequences.map((sequence) => {if (!shouldSubscribeToSequenceProps(sequence, previewInteractive)) {return null;diff --git a/packages/studio/src/components/Timeline/TimelineList.tsx b/packages/studio/src/components/Timeline/TimelineList.tsxindex e2a5bf8cee..03016b89d0 100644--- a/packages/studio/src/components/Timeline/TimelineList.tsx+++ b/packages/studio/src/components/Timeline/TimelineList.tsx@@ -1,5 +1,12 @@import React from 'react';-import {BACKGROUND} from '../../helpers/colors';+import {+ BACKGROUND,+ LIGHT_TEXT,+ TIMELINE_TRACK_SEPARATOR,+ WHITE_ALPHA_20,+} from '../../helpers/colors';+import {getTimelineRowLeftChromeWidth} from './timeline-row-layout';+import {TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT} from './timeline-track-groups';import {TimelineSequenceItem} from './TimelineSequenceItem';import {type TimelineVirtualRow,@@ -20,27 +27,68 @@ const TimelineListTrack: React.FC<{const {afterDropLineOffset, siblingIndex, track} = row;return (- <TimelineSequenceItem- afterDropLineOffset={afterDropLineOffset}- siblingIndex={siblingIndex}- connectedCompositions={- track.connectedCompositions ?? noConnectedCompositions- }- nestedDepth={track.depth}- sequence={track.sequence}- nodePathInfo={track.nodePathInfo}- keyframeDisplayOffset={track.keyframeDisplayOffset}- keyframePlaybackRate={track.keyframePlaybackRate}- sequenceFrameOffset={track.sequenceFrameOffset}- numberOfHiddenDuplicates={- row.items !== null- ? 0- : Math.max(0, (track.displayGroup?.numberOfSequences ?? 1) - 1)- }- showProvisionalVisibilityToggle={- track.nodePathInfo === null && track.displayGroup !== null- }- />+ <>+ <TimelineSequenceItem+ afterDropLineOffset={afterDropLineOffset}+ siblingIndex={siblingIndex}+ connectedCompositions={+ track.connectedCompositions ?? noConnectedCompositions+ }+ nestedDepth={track.depth}+ sequence={track.sequence}+ nodePathInfo={track.nodePathInfo}+ keyframeDisplayOffset={track.keyframeDisplayOffset}+ keyframePlaybackRate={track.keyframePlaybackRate}+ sequenceFrameOffset={track.sequenceFrameOffset}+ numberOfHiddenDuplicates={+ row.items !== null+ ? 0+ : Math.max(0, (track.displayGroup?.numberOfSequences ?? 1) - 1)+ }+ showProvisionalVisibilityToggle={+ track.nodePathInfo === null && track.displayGroup !== null+ }+ />+ {row.auxiliaryRows.length > 0 ? (+ <div+ style={{+ height:+ row.auxiliaryRows.length * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ borderBottom: `1px solid ${TIMELINE_TRACK_SEPARATOR}`,+ paddingLeft: getTimelineRowLeftChromeWidth(track.depth) + 8,+ paddingRight: 8,+ position: 'relative',+ userSelect: 'none',+ WebkitUserSelect: 'none',+ }}+ >+ <div+ aria-hidden="true"+ style={{+ position: 'absolute',+ top: 0,+ left: getTimelineRowLeftChromeWidth(track.depth) - 2,+ width: 6,+ height: TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT / 2,+ borderLeft: `1px solid ${WHITE_ALPHA_20}`,+ borderBottom: `1px solid ${WHITE_ALPHA_20}`,+ }}+ />+ <div+ style={{+ color: LIGHT_TEXT,+ fontSize: 11,+ lineHeight: `${TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT}px`,+ overflow: 'hidden',+ textOverflow: 'ellipsis',+ whiteSpace: 'nowrap',+ }}+ >+ Overlays+ </div>+ </div>+ ) : null}+ </>);});diff --git a/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx b/packages/studio/src/components/Timeline/TimelinePackedTrack.tsxindex 4b54e19998..3e8a6d751d 100644--- a/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx+++ b/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx@@ -1,85 +1,99 @@-import React, {useContext, useMemo} from 'react';-import {Internals} from 'remotion';-import {WHITE} from '../../helpers/colors';-import {TIMELINE_PADDING} from '../../helpers/timeline-layout';+import React, {useMemo} from 'react';+import {TIMELINE_TRACK_SEPARATOR} from '../../helpers/colors';+import {TIMELINE_ITEM_BORDER_BOTTOM} from '../../helpers/timeline-layout';import type {TimelineTrackWithDisplayGroup} from './timeline-display-groups';-import {TIMELINE_PACKED_TRACK_HEIGHT} from './timeline-track-groups';+import {+ TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ TIMELINE_PACKED_TRACK_HEIGHT,+} from './timeline-track-groups';import {TimelineSequence} from './TimelineSequence';-import {TimelineWidthContext} from './TimelineWidthProvider';const noConnectedCompositions = [] as const;+const primaryRowHeight =+ TIMELINE_PACKED_TRACK_HEIGHT + TIMELINE_ITEM_BORDER_BOTTOM;export const TimelinePackedTrack: React.FC<{readonly track: TimelineTrackWithDisplayGroup;readonly items: readonly TimelineTrackWithDisplayGroup[];-}> = ({track, items}) => {- const width = useContext(TimelineWidthContext);- const video = Internals.useVideo();- const ordered = useMemo(() => {+ readonly auxiliaryRows: readonly (readonly TimelineTrackWithDisplayGroup[])[];+}> = ({track, items, auxiliaryRows}) => {+ const rows = useMemo(() => {const clips = items.filter((item) => item.sequence.timelineTrack?.role === 'clip',);const effects = items.filter(- (item) => item.sequence.timelineTrack?.role !== 'clip',+ (item) =>+ item.sequence.timelineTrack?.role !== 'clip' &&+ item.sequence.timelineTrack?.role !== 'overlay',);- return [...clips, ...effects];- }, [items]);+ return [[...clips, ...effects], ...auxiliaryRows].map((row, index) => ({+ items: row,+ top:+ index === 0+ ? 0+ : primaryRowHeight ++ (index - 1) * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ height:+ index === 0 ? primaryRowHeight : TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ }));+ }, [auxiliaryRows, items]);return (<divdata-timeline-track={track.sequence.displayName}- style={{height: TIMELINE_PACKED_TRACK_HEIGHT, position: 'relative'}}+ style={{+ position: 'relative',+ height:+ primaryRowHeight ++ auxiliaryRows.length * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ }}>- {ordered.map((item) => (- <TimelineSequence- key={item.sequence.id}- s={item.sequence}- cascadedStart={item.cascadedStart}- localStart={item.localStart}- connectedCompositions={- item.connectedCompositions ?? noConnectedCompositions- }- nodePathInfo={item.nodePathInfo}- keyframeDisplayOffset={item.keyframeDisplayOffset}- keyframePlaybackRate={item.keyframePlaybackRate}- sequenceFrameOffset={item.sequenceFrameOffset}+ {rows.map((row) => (+ <div+ key={row.top}+ aria-hidden="true"+ data-timeline-track-row={row.top === 0 ? 'clips' : 'overlays'}+ style={{+ position: 'absolute',+ top: row.top,+ left: 0,+ right: 0,+ height: row.height,+ borderBottom: `${TIMELINE_ITEM_BORDER_BOTTOM}px solid ${TIMELINE_TRACK_SEPARATOR}`,+ pointerEvents: 'none',+ }}/>))}- {width === null || video === null- ? null- : items.map((item) => {- const anchor = item.sequence.timelineTrack?.anchor ?? null;- if (anchor === null) {- return null;- }-- const frame =- item.cascadedStart +- (anchor - item.localStart) / item.keyframePlaybackRate;- if (- frame < track.sequence.from ||- frame > track.sequence.from + track.sequence.duration- ) {- return null;- }-- return (- <div- key={`anchor-${item.sequence.id}`}- aria-hidden="true"- style={{- position: 'absolute',- left:- (frame / video.durationInFrames) *- (width - TIMELINE_PADDING * 2),- top: 0,- height: TIMELINE_PACKED_TRACK_HEIGHT,- borderLeft: `1px solid ${WHITE}`,- pointerEvents: 'none',- }}- />- );- })}+ {/* Keep clips under the same parent when timing edits move them to another row. */}+ {rows.flatMap((row) =>+ row.items.map((item) => (+ <div+ key={item.sequence.id}+ style={{+ position: 'absolute',+ top: row.top,+ left: 0,+ // The clip supplies its own pixel width. Empty row space must+ // not intercept clicks on other clips or the marquee.+ width: 0,+ height: row.height - TIMELINE_ITEM_BORDER_BOTTOM,+ }}+ >+ <TimelineSequence+ s={item.sequence}+ cascadedStart={item.cascadedStart}+ localStart={item.localStart}+ connectedCompositions={+ item.connectedCompositions ?? noConnectedCompositions+ }+ nodePathInfo={item.nodePathInfo}+ keyframeDisplayOffset={item.keyframeDisplayOffset}+ keyframePlaybackRate={item.keyframePlaybackRate}+ sequenceFrameOffset={item.sequenceFrameOffset}+ />+ </div>+ )),+ )}</div>);};diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex 3220c4f472..a8098ef01d 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -20,7 +20,6 @@ import type {import {Internals, useCurrentFrame} from 'remotion';import {StudioServerConnectionCtx} from '../../helpers/client-id';import {- BLACK,BLUE,TIMELINE_AUDIO_GRADIENT,TIMELINE_BACKGROUND_COLOR,@@ -31,7 +30,6 @@ import {WHITE,WHITE_ALPHA_20,WHITE_ALPHA_50,- WARNING_COLOR,} from '../../helpers/colors';import {createDragAwareDoubleClickTracker} from '../../helpers/drag-aware-double-click';import {@@ -45,6 +43,7 @@ import {isVideoWithLastFrameHold} from '../../helpers/is-video-with-last-frame-himport {getSequenceAnnotationAttributes} from '../../helpers/sequence-annotation';import {getTimelineLayerHeight,+ TIMELINE_ITEM_BORDER_BOTTOM,TIMELINE_LAYER_HEIGHT_AUDIO,TIMELINE_PADDING,} from '../../helpers/timeline-layout';@@ -52,6 +51,7 @@ import {useMediaMetadata} from '../../helpers/use-media-metadata';import {useRuntimeValueSelector} from '../../helpers/use-runtime-values';import {SetSelectedModalContext} from '../../state/modals';import {AudioWaveform} from '../AudioWaveform';+import {CompositionOrStillIcon} from '../CompositionOrStillIcon';import {useConfirmationDialog} from '../ConfirmationDialog';import {ContextMenu} from '../ContextMenu';import {useSelectComposition} from '../InitialCompositionLoader';@@ -78,7 +78,10 @@ import {splitSelectedTimelineItems} from './split-selected-timeline-item';import {getTimelineAssetLinkInfo} from './timeline-asset-link';import {timelineLeftEdgeCursor} from './timeline-left-edge-cursor';import {timelineLayerLayoutsRef} from './timeline-refs';-import {TIMELINE_PACKED_TRACK_HEIGHT} from './timeline-track-groups';+import {+ TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,+ TIMELINE_PACKED_TRACK_HEIGHT,+} from './timeline-track-groups';import {timelineTrimEdgeCursor} from './timeline-trim-edge-cursor';import {TimelineImageInfo} from './TimelineImageInfo';import {@@ -119,6 +122,10 @@ const {const NEGATIVE_START_BORDER_WIDTH = 1;const EDGE_DRAG_HIGHLIGHT_WIDTH = 12;const MIN_SECONDARY_LEFT_EDGE_ACTION_WIDTH = 32;+const PACKED_LABEL_HEIGHT = 15;+const PACKED_LABEL_BOTTOM = 1;+const PACKED_TRANSITION_HEIGHT =+ TIMELINE_PACKED_TRACK_HEIGHT - PACKED_LABEL_HEIGHT - PACKED_LABEL_BOTTOM;type TimelineEdgeHighlightEdge = 'left' | 'right' | 'source-only';@@ -303,6 +310,7 @@ const TimelineSequenceNegativeStart = React.memo(const TimelineSequenceCurrentFrame: React.FC<{readonly s: TSequence;+ readonly connectedComposition: _InternalTypes['AnyComposition'] | null;readonly annotationLocation: ResolvedStackLocation | null;readonly activeTrimEdge: 'left' | 'right' | null;readonly leftTrimHighlight: {@@ -336,6 +344,7 @@ const TimelineSequenceCurrentFrame: React.FC<{readonly onClick: React.MouseEventHandler<HTMLDivElement> | null;}> = ({s,+ connectedComposition,activeTrimEdge,leftTrimHighlight,annotationLocation,@@ -357,8 +366,6 @@ const TimelineSequenceCurrentFrame: React.FC<{onPointerDownCapture,onClick,}) => {- const {canvasContent} = useContext(Internals.CompositionManager);- const isAsset = canvasContent?.type === 'asset';const ref = useRef<HTMLDivElement>(null);const {onSelect, selectable, selected, selectionItem} =useTimelineRowSelection(nodePathInfo);@@ -412,6 +419,14 @@ const TimelineSequenceCurrentFrame: React.FC<{const negativeStartEnd = negativeStart? negativeStart.left + negativeStart.width: 0;+ const compactPremount = s.isInsideSeries && premount !== null;+ const contentStart = compactPremount+ ? premount.left + premount.width+ : negativeStartEnd;+ const transitionWidth =+ s.timelineTrack?.role === 'transition'+ ? (marqueeHorizontalBounds?.width ?? Number(style.width))+ : null;// Back the antialiased rounded edge only when the glow is at the painted layer edge.const sequenceBackground =activeTrimEdge === null ||@@ -422,49 +437,40 @@ const TimelineSequenceCurrentFrame: React.FC<{const actualStyle: React.CSSProperties = useMemo(() => {return {...style,- background: negativeStart ? TRANSPARENT : sequenceBackground,- boxShadow: s.timelineTrack- ? `inset 0 0 0 ${selected || containsSelection ? 2 : 1}px ${selected || containsSelection ? WHITE : WHITE_ALPHA_20}`- : style.boxShadow,- opacity:- activeTrimEdge !== null ||- selected ||- containsSelection ||- isAsset ||- s.timelineTrack- ? 1- : 0.75,+ background:+ negativeStart || compactPremount ? TRANSPARENT : sequenceBackground,+ pointerEvents: compactPremount ? 'none' : style.pointerEvents,+ opacity: 1,};- }, [- activeTrimEdge,- containsSelection,- isAsset,- negativeStart,- selected,- sequenceBackground,- style,- s.timelineTrack,- ]);+ }, [compactPremount, negativeStart, sequenceBackground, style]);- const content = (- <>- {premount ? (- <div- style={{- left: premount.left,- width: premount.width,- height: '100%',- background: `repeating-linear-gradient(+ const premountIndicator = premount ? (+ <div+ style={{+ left: premount.left,+ width: premount.width,+ top: 0,+ height: compactPremount ? 5 : '100%',+ background: `repeating-linear-gradient(-45deg,${TRANSPARENT},${TRANSPARENT} 2px,- ${isPremounting ? WHITE_ALPHA_50 : WHITE_ALPHA_20} 2px,- ${isPremounting ? WHITE_ALPHA_50 : WHITE_ALPHA_20} 4px- )`,- position: 'absolute',- }}- />- ) : null}+ ${WHITE_ALPHA_20} 2px,+ ${WHITE_ALPHA_20} 4px+ )${compactPremount ? `, ${style.background ?? TRANSPARENT}` : ''}`,+ boxShadow:+ compactPremount && (selected || containsSelection)+ ? `inset 0 0 0 2px ${WHITE}`+ : undefined,+ pointerEvents: compactPremount ? 'auto' : undefined,+ position: 'absolute',+ }}+ />+ ) : null;++ const content = (+ <>+ {compactPremount ? null : premountIndicator}{postmount ? (<div@@ -486,27 +492,74 @@ const TimelineSequenceCurrentFrame: React.FC<{{children}- {s.timelineTrack ? (+ {transitionWidth === null ? null : (+ <svg+ aria-hidden="true"+ style={{+ position: 'absolute',+ left: -(marqueeHorizontalBounds?.cropLeft ?? 0),+ top: 0,+ width: transitionWidth,+ height: PACKED_TRANSITION_HEIGHT,+ pointerEvents: 'none',+ }}+ >+ <rect+ x={0.5}+ y={0.5}+ width={Math.max(0, transitionWidth - 1)}+ height={PACKED_TRANSITION_HEIGHT - 1}+ fill="none"+ stroke={WHITE}+ strokeWidth={1}+ />+ <line+ x1={0.5}+ y1={PACKED_TRANSITION_HEIGHT - 0.5}+ x2={Math.max(0.5, transitionWidth - 0.5)}+ y2={0.5}+ stroke={WHITE}+ strokeWidth={1}+ />+ </svg>+ )}++ {s.timelineTrack && s.timelineTrack.role !== 'transition' ? (<divstyle={{position: 'absolute',left: 5 + negativeStartEnd + (premount?.width ?? 0),right: 4,- bottom: 1,- fontSize: 11,- lineHeight: '15px',- color: s.timelineTrack.role === 'overlay' ? BLACK : WHITE,- whiteSpace: 'nowrap',+ bottom: PACKED_LABEL_BOTTOM,+ display: 'flex',+ alignItems: 'center',+ gap: 4,overflow: 'hidden',- textOverflow: 'ellipsis',pointerEvents: 'none',+ userSelect: 'none',+ WebkitUserSelect: 'none',}}>- {s.timelineTrack.role === 'transition'- ? 'Transition'- : s.timelineTrack.role === 'overlay'- ? 'Overlay'- : s.displayName}+ {connectedComposition ? (+ <CompositionOrStillIcon+ composition={connectedComposition}+ color={WHITE}+ style={{flexShrink: 0, height: 12, width: 12}}+ />+ ) : null}+ <span+ style={{+ fontSize: 11,+ lineHeight: `${PACKED_LABEL_HEIGHT}px`,+ color: WHITE,+ minWidth: 0,+ whiteSpace: 'nowrap',+ overflow: 'hidden',+ textOverflow: 'ellipsis',+ }}+ >+ {s.timelineTrack.role === 'overlay' ? 'Overlay' : s.displayName}+ </span></div>) : null}@@ -573,14 +626,17 @@ const TimelineSequenceCurrentFrame: React.FC<{onPointerDown={selectable ? onPointerDown : undefined}onClick={onClick ?? undefined}>- {negativeStart ? (+ {compactPremount ? premountIndicator : null}+ {negativeStart || compactPremount ? (<>- <TimelineSequenceNegativeStart- left={negativeStart.left}- width={negativeStart.width}- leftEdgeVisible={leftEdgeVisible}- clipped={negativeStartClipped}- />+ {negativeStart ? (+ <TimelineSequenceNegativeStart+ left={negativeStart.left}+ width={negativeStart.width}+ leftEdgeVisible={leftEdgeVisible}+ clipped={negativeStartClipped}+ />+ ) : null}<divstyle={{background: sequenceBackground,@@ -590,17 +646,18 @@ const TimelineSequenceCurrentFrame: React.FC<{borderTopRightRadius: style.borderTopRightRadius,boxSizing: 'border-box',height: '100%',- left: negativeStartEnd,+ left: contentStart,overflow: 'hidden',+ pointerEvents: compactPremount ? 'auto' : undefined,position: 'absolute',top: 0,- width: `calc(100% - ${negativeStartEnd}px)`,+ width: `calc(100% - ${contentStart}px)`,}}><divstyle={{height: '100%',- left: -negativeStartEnd,+ left: -contentStart,position: 'absolute',top: 0,width: style.width,@@ -622,7 +679,21 @@ const TimelineSequenceCurrentFrame: React.FC<{{content}</div>)}- {edgeDragHandles}+ {(selected || containsSelection) &&+ (!compactPremount || Number(style.width) > contentStart) ? (+ <div+ aria-hidden="true"+ style={{+ position: 'absolute',+ inset: 0,+ left: compactPremount ? contentStart : 0,+ borderRadius: 'inherit',+ boxShadow: `inset 0 0 0 2px ${WHITE}`,+ pointerEvents: 'none',+ }}+ />+ ) : null}+ <div style={{pointerEvents: 'auto'}}>{edgeDragHandles}</div></div>);};@@ -1432,12 +1503,13 @@ const TimelineSequenceInner: React.FC<{(windowWidth - TIMELINE_PADDING * 2) / video.durationInFrames;const isMedia = s.type === 'audio' || s.type === 'video';const layerHeight =- s.timelineTrack?.role === 'transition' ||- s.timelineTrack?.role === 'overlay'- ? 16- : s.timelineTrack- ? TIMELINE_PACKED_TRACK_HEIGHT- : getTimelineLayerHeight(s.type);+ s.timelineTrack?.role === 'transition'+ ? PACKED_TRANSITION_HEIGHT+ : s.timelineTrack?.role === 'overlay'+ ? TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT - TIMELINE_ITEM_BORDER_BOTTOM+ : s.timelineTrack+ ? TIMELINE_PACKED_TRACK_HEIGHT+ : getTimelineLayerHeight(s.type);const trimOutline = (() => {if (activeEdgeHighlight === null ||@@ -1602,14 +1674,12 @@ const TimelineSequenceInner: React.FC<{return {background:role === 'transition'- ? `repeating-linear-gradient(135deg, ${BLUE} 0 5px, ${WHITE_ALPHA_20} 5px 7px), ${BLUE}`- : role === 'overlay'- ? WARNING_COLOR- : s.type === 'audio'- ? TIMELINE_AUDIO_GRADIENT- : s.type === 'video'- ? TIMELINE_VIDEO_GRADIENT- : BLUE,+ ? TRANSPARENT+ : s.type === 'audio'+ ? TIMELINE_AUDIO_GRADIENT+ : s.type === 'video'+ ? TIMELINE_VIDEO_GRADIENT+ : BLUE,borderTopLeftRadius: showLeftBorderRadius ? 2 : 0,borderBottomLeftRadius: showLeftBorderRadius ? 2 : 0,borderTopRightRadius: showRightBorderRadius ? 2 : 0,@@ -1618,9 +1688,6 @@ const TimelineSequenceInner: React.FC<{isolation: s.timelineTrack ? 'isolate' : undefined,height: layerHeight,top: s.timelineTrack ? 0 : undefined,- boxShadow: s.timelineTrack- ? `inset 0 0 0 1px ${WHITE_ALPHA_20}`- : undefined,marginLeft: visibleLayout?.marginLeft ?? 0,width: visibleLayout?.width ?? 0,color: WHITE,@@ -1681,6 +1748,7 @@ const TimelineSequenceInner: React.FC<{const sequence = (<TimelineSequenceCurrentFrames={s}+ connectedComposition={connectedCompositions[0] ?? null}annotationLocation={originalLocation}activeTrimEdge={activeTrimEdge}leftTrimHighlight={diff --git a/packages/studio/src/components/Timeline/TimelineTracks.tsx b/packages/studio/src/components/Timeline/TimelineTracks.tsxindex ad8cd1064f..d100ee9c51 100644--- a/packages/studio/src/components/Timeline/TimelineTracks.tsx+++ b/packages/studio/src/components/Timeline/TimelineTracks.tsx@@ -92,6 +92,7 @@ const TimelineTracksInner: React.FC<{<TimelinePackedTracktrack={rows[virtualItem.index].track}items={rows[virtualItem.index].items!}+ auxiliaryRows={rows[virtualItem.index].auxiliaryRows}/>)}</div>diff --git a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx b/packages/studio/src/components/Timeline/TimelineVirtualization.tsxindex 9d630bb9b8..4434746530 100644--- a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx+++ b/packages/studio/src/components/Timeline/TimelineVirtualization.tsx@@ -15,9 +15,9 @@ import React, {} from 'react';import {TIMELINE_ITEM_BORDER_BOTTOM} from '../../helpers/timeline-layout';import {MAX_TIMELINE_TRACKS_NOTICE_HEIGHT} from './MaxTimelineTracks';-import type {TimelineTrackWithDisplayGroup} from './timeline-display-groups';import {timelineVerticalScroll} from './timeline-refs';import {+ TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,TIMELINE_PACKED_TRACK_HEIGHT,type TimelineDisplayRow,} from './timeline-track-groups';@@ -30,11 +30,9 @@ import {import {TIMELINE_TIME_INDICATOR_HEIGHT} from './TimelineTimeIndicators';import {useTimelineTrackHeights} from './use-timeline-height';-export type TimelineVirtualRow = {+export type TimelineVirtualRow = TimelineDisplayRow & {readonly afterDropLineOffset: number;readonly siblingIndex: number;- readonly track: TimelineTrackWithDisplayGroup;- readonly items: readonly TimelineTrackWithDisplayGroup[] | null;};type TimelineVirtualizationContextValue = {@@ -73,7 +71,9 @@ export const TimelineVirtualizationProvider: React.FC<{timeline.map((row, index) =>row.items === null? individualHeights[index]- : TIMELINE_PACKED_TRACK_HEIGHT + TIMELINE_ITEM_BORDER_BOTTOM,+ : TIMELINE_PACKED_TRACK_HEIGHT ++ TIMELINE_ITEM_BORDER_BOTTOM ++ row.auxiliaryRows.length * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,),[individualHeights, timeline],);@@ -116,22 +116,25 @@ export const TimelineVirtualizationProvider: React.FC<{offsets[index + 1] = offsets[index] + trackHeights[index];}- const rows = timeline.map(({track, items}, index): TimelineVirtualRow => {- const afterDropLineOffset =- offsets[subtreeEndIndexes[index]] - offsets[index];- const siblingIndex = siblingIndexes[index];- const previous = previousRowsRef.current[index];- if (- previous?.track === track &&- previous.items === items &&- previous.afterDropLineOffset === afterDropLineOffset &&- previous.siblingIndex === siblingIndex- ) {- return previous;- }+ const rows = timeline.map(+ ({track, items, auxiliaryRows}, index): TimelineVirtualRow => {+ const afterDropLineOffset =+ offsets[subtreeEndIndexes[index]] - offsets[index];+ const siblingIndex = siblingIndexes[index];+ const previous = previousRowsRef.current[index];+ if (+ previous?.track === track &&+ previous.items === items &&+ previous.auxiliaryRows === auxiliaryRows &&+ previous.afterDropLineOffset === afterDropLineOffset &&+ previous.siblingIndex === siblingIndex+ ) {+ return previous;+ }- return {afterDropLineOffset, siblingIndex, track, items};- });+ return {afterDropLineOffset, siblingIndex, track, items, auxiliaryRows};+ },+ );const rootTrackIndexes = new Map<string, number>();for (let index = 0; index < timeline.length; index++) {for (const {nodePathInfo} of [@@ -148,6 +151,7 @@ export const TimelineVirtualizationProvider: React.FC<{}return {+ offsets,rootTrackIndexes,rows,tracksEnd: offsets[offsets.length - 1],@@ -245,19 +249,63 @@ export const TimelineVirtualizationProvider: React.FC<{return;}- const offset = virtualizer.getOffsetForIndex(index, 'auto');- if (offset === undefined) {- return;- }+ const row = layout.rows[index];+ if (row.items !== null) {+ const scrollElement = timelineVerticalScroll.current;+ if (+ scrollElement === null ||+ scrollElement.clientHeight <= paddingStart+ ) {+ return;+ }- if (offset[1] !== 'auto') {- virtualizer.scrollToIndex(index, {align: 'center'});+ const auxiliaryIndex = row.auxiliaryRows.findIndex((items) =>+ items.some(+ ({nodePathInfo}) =>+ nodePathInfo !== null &&+ getTimelineSequenceSelectionKey(nodePathInfo) === key,+ ),+ );+ const primaryHeight =+ TIMELINE_PACKED_TRACK_HEIGHT + TIMELINE_ITEM_BORDER_BOTTOM;+ const start =+ layout.offsets[index] ++ (auxiliaryIndex === -1+ ? 0+ : primaryHeight ++ auxiliaryIndex * TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT);+ const height =+ auxiliaryIndex === -1+ ? primaryHeight+ : TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT;+ // A packed Track can exceed the viewport. Reveal the selected lane,+ // allowing for the pinned time ruler, rather than centering its owner.+ if (+ start < scrollElement.scrollTop + paddingStart ||+ start + height > scrollElement.scrollTop + scrollElement.clientHeight+ ) {+ virtualizer.scrollToOffset(+ start + height / 2 - (scrollElement.clientHeight + paddingStart) / 2,+ );+ }+ } else {+ const offset = virtualizer.getOffsetForIndex(index, 'auto');+ if (offset === undefined) {+ return;+ }++ if (offset[1] !== 'auto') {+ virtualizer.scrollToIndex(index, {align: 'center'});+ }}consumeRevealRequest(revealRequest.token);}, [consumeRevealRequest,+ layout.offsets,layout.rootTrackIndexes,+ layout.rows,+ paddingStart,revealRequest,selectedItems,virtualizer,diff --git a/packages/studio/src/components/Timeline/timeline-track-groups.ts b/packages/studio/src/components/Timeline/timeline-track-groups.tsindex 232efb650c..67e96311bb 100644--- a/packages/studio/src/components/Timeline/timeline-track-groups.ts+++ b/packages/studio/src/components/Timeline/timeline-track-groups.ts@@ -1,26 +1,33 @@import type {TSequence} from 'remotion';+import {timelineNodePathInfoToKey} from '../../helpers/timeline-node-path-key';import type {TimelineTrackWithDisplayGroup} from './timeline-display-groups';-export const TIMELINE_PACKED_TRACK_HEIGHT = 36;+export const TIMELINE_PACKED_TRACK_HEIGHT = 54;+export const TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT = 24;export type TimelineDisplayRow = {readonly track: TimelineTrackWithDisplayGroup;readonly items: readonly TimelineTrackWithDisplayGroup[] | null;+ readonly auxiliaryRows: readonly (readonly TimelineTrackWithDisplayGroup[])[];};export const filterTimelineTrackContents = (tracks: readonly TimelineTrackWithDisplayGroup[],sequences: readonly TSequence[],+ activeTrackItemIds: ReadonlySet<string>,): TimelineTrackWithDisplayGroup[] => {const byId = new Map(sequences.map((sequence) => [sequence.id, sequence]));+ const tracksById = new Map(tracks.map((track) => [track.sequence.id, track]));+ const scopedDisplayGroupCounts = new Map<string, number>();- return tracks.flatMap((track) => {+ const visibleTracks = tracks.flatMap((track) => {if (track.sequence.timelineTrack?.role === 'container') {return [];}let {parent} = track.sequence;let hiddenAncestors = 0;+ let nearestPackedInstance: string | null = null;while (parent !== null) {const ancestor = byId.get(parent);if (!ancestor) {@@ -41,19 +48,67 @@ export const filterTimelineTrackContents = (if (ancestor.timelineTrack.role !== 'container' &&- ancestor.timelineTrack.role !== 'track' &&- !track.sequence.timelineTrack+ ancestor.timelineTrack.role !== 'track') {- // A clip owns its internal layers. Explicit nested tracks still- // keep their own rows.- return [];+ // Nested tracks follow their containing clip too, while keeping+ // their own packed rows whenever that clip is active.+ if (!activeTrackItemIds.has(ancestor.id)) {+ return [];+ }++ if (nearestPackedInstance === null) {+ const nodePathInfo = tracksById.get(ancestor.id)?.nodePathInfo;+ nearestPackedInstance = nodePathInfo+ ? `source:${timelineNodePathInfoToKey(nodePathInfo)}`+ : `instance:${ancestor.id}`;+ }}}parent = ancestor.parent;}- return [{...track, depth: Math.max(0, track.depth - hiddenAncestors)}];+ let {displayGroup} = track;+ if (+ !track.sequence.timelineTrack &&+ nearestPackedInstance !== null &&+ displayGroup !== null+ ) {+ // Shared child components in overlapping clips must remain visible+ // once per clip, while duplicates inside one clip still collapse.+ const key = `packed-descendant:${JSON.stringify([nearestPackedInstance, displayGroup.key])}`;+ scopedDisplayGroupCounts.set(+ key,+ (scopedDisplayGroupCounts.get(key) ?? 0) + 1,+ );+ displayGroup = {...displayGroup, key};+ }++ return [+ {+ ...track,+ displayGroup,+ depth: Math.max(0, track.depth - hiddenAncestors),+ },+ ];+ });++ return visibleTracks.map((track) => {+ if (track.displayGroup === null) {+ return track;+ }++ const numberOfSequences = scopedDisplayGroupCounts.get(+ track.displayGroup.key,+ );+ if (numberOfSequences === undefined) {+ return track;+ }++ return {+ ...track,+ displayGroup: {...track.displayGroup, numberOfSequences},+ };});};@@ -76,9 +131,42 @@ export const getTimelineDisplayRows = (for (const track of tracks) {const group = track.sequence.timelineTrack;if (!group) {- rows.push({track, items: null});+ rows.push({track, items: null, auxiliaryRows: []});} else if (group.role === 'track') {- rows.push({track, items: groupedItems.get(group.id) ?? []});+ const items = groupedItems.get(group.id) ?? [];+ const auxiliaryRows: TimelineTrackWithDisplayGroup[][] = [];+ for (const item of items) {+ if (item.sequence.timelineTrack?.role !== 'overlay') {+ continue;+ }++ const start = item.sequence.from - (item.sequence.premountDisplay ?? 0);+ const end =+ item.sequence.from ++ item.sequence.duration ++ (item.sequence.postmountDisplay ?? 0);+ let rowIndex = 0;+ for (let index = 0; index < auxiliaryRows.length; index++) {+ const overlaps = auxiliaryRows[index].some(({sequence}) => {+ const otherStart = sequence.from - (sequence.premountDisplay ?? 0);+ const otherEnd =+ sequence.from ++ sequence.duration ++ (sequence.postmountDisplay ?? 0);+ return start < otherEnd && otherStart < end;+ });+ if (overlaps) {+ // Later overlays paint above earlier ones. Keep them below every+ // overlapping overlay, even if a higher row has free space.+ rowIndex = index + 1;+ }+ }++ auxiliaryRows[rowIndex] ??= [];+ auxiliaryRows[rowIndex].push(item);+ }++ rows.push({track, items, auxiliaryRows});}}diff --git a/packages/transitions/src/TransitionSeries.tsx b/packages/transitions/src/TransitionSeries.tsxindex cfbd60285a..724e947f08 100644--- a/packages/transitions/src/TransitionSeries.tsx+++ b/packages/transitions/src/TransitionSeries.tsx@@ -12,7 +12,6 @@ import type {import {Internals,Interactive,- Sequence,useCurrentFrame,useVideoConfig,} from 'remotion';@@ -29,7 +28,7 @@ import type {} from './types.js';import {validateDurationInFrames} from './validate.js';-const {SequenceWithoutSchema} = Internals;+const {SequenceWithoutSchema, TrackWithoutSchema} = Internals;type ResolvedTransitionSeriesTransitionProps<PresentationProps extends Record<string, unknown>,@@ -313,7 +312,6 @@ const TransitionSeriesChildren: FC<{readonly children: React.ReactNode}> = ({const childrenValue = useMemo(() => {type OverlayRender = {- readonly cutPoint: number;readonly overlayFrom: number;readonly durationInFrames: number;readonly overlayOffset: number;@@ -335,7 +333,6 @@ const TransitionSeriesChildren: FC<{readonly children: React.ReactNode}> = ({name="<TS.Overlay>"_remotionInternalTimelineTrack={{role: 'overlay',- anchor: info.cutPoint,}}_remotionInternalDocumentationLink="https://www.remotion.dev/docs/transitions/transitionseries"controls={info.controls ?? undefined}@@ -497,7 +494,6 @@ const TransitionSeriesChildren: FC<{readonly children: React.ReactNode}> = ({// Store overlay info to validate the other side once the next// sequence has resolved its interactive props.const overlayRender: OverlayRender = {- cutPoint,overlayFrom,durationInFrames: overlayProps.durationInFrames,overlayOffset,@@ -571,7 +567,6 @@ const TransitionSeriesChildren: FC<{readonly children: React.ReactNode}> = ({name="<TS.Transition>"_remotionInternalTimelineTrack={{role: 'transition',- anchor: null,}}_remotionInternalDocumentationLink="https://www.remotion.dev/docs/transitions/transitionseries"controls={transitionProps.controls ?? undefined}@@ -1020,7 +1015,7 @@ const TransitionSeriesInner: FC<SequenceProps> = (props) => {}return (- <Sequence+ <TrackWithoutSchemaname={displayName}layout={layout}_remotionInternalDocumentationLink={@@ -1030,10 +1025,9 @@ const TransitionSeriesInner: FC<SequenceProps> = (props) => {}{...otherProps}controls={controls ?? undefined}- _remotionInternalTimelineTrack={{role: 'container', anchor: null}}><TransitionSeriesChildren>{children}</TransitionSeriesChildren>- </Sequence>+ </TrackWithoutSchema>);};