Skip to content

🎥 Make videos programmatically with React

Merge remote-tracking branch 'origin/main' into HEAD

Jonny Burgera4bbbcc5290d
diff --cc packages/core/src/CompositionManager.tsx
index 974fa12c36,e3d306937e..14c59d4578
--- a/packages/core/src/CompositionManager.tsx
+++ b/packages/core/src/CompositionManager.tsx
@@@ -141,9 -140,10 +141,11 @@@ export type TSequence =
parent: string | null;
showInTimeline: boolean;
timelineOrder: number | null;
+ timelineTrack?: TimelineTrackItem;
loopDisplay: LoopDisplay | undefined;
getStack: () => string | null;
+ /** Read the committed child clock without updating timeline metadata each frame. */
+ getCurrentFrame?: (() => number) | null;
premountDisplay: number | null;
postmountDisplay: number | null;
controls: SequenceRegistrationControls | null;
diff --cc packages/core/src/Sequence.tsx
index d12009252b,143aa9064a..1fc85feeaf
--- a/packages/core/src/Sequence.tsx
+++ b/packages/core/src/Sequence.tsx
@@@ -737,9 -722,7 +749,10 @@@ const RegularSequenceRefForwardingFunct
};
}, [
id,
+ timelineTrack,
+ timelineTrackRole,
+ timelineTrackItem?.anchor,
+ getCurrentFrame,
timelineClipName,
playbackRate,
parentSequence?.id,
diff --cc packages/studio/src/components/Timeline/TimelineSequence.tsx
index 41da76b72e,a7792b6aa4..3220c4f472
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@@ -76,7 -75,7 +77,8 @@@ import {LoopedTimelineIndicator} from '
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 {timelineTrimEdgeCursor} from './timeline-trim-edge-cursor';
import {TimelineImageInfo} from './TimelineImageInfo';
import {
diff --cc packages/studio/src/components/Timeline/TimelineTracks.tsx
index 17942f82e1,6f9867972c..ad8cd1064f
--- a/packages/studio/src/components/Timeline/TimelineTracks.tsx
+++ b/packages/studio/src/components/Timeline/TimelineTracks.tsx
@@@ -1,9 -1,11 +1,12 @@@
- import React, {useMemo} from 'react';
+ import React, {useContext, useImperativeHandle, useMemo} from 'react';
import {TIMELINE_PADDING} from '../../helpers/timeline-layout';
import {MaxTimelineTracksReached} from './MaxTimelineTracks';
+ import {timelineDurationRef, timelineLayerLayoutsRef} from './timeline-refs';
+import {TimelinePackedTrack} from './TimelinePackedTrack';
import {TimelineTrack} from './TimelineTrack';
+ import {TimelineViewportContext} from './TimelineViewport';
import {useTimelineVirtualization} from './TimelineVirtualization';
+ import {TimelineWidthContext} from './TimelineWidthProvider';
const content: React.CSSProperties = {
paddingLeft: TIMELINE_PADDING,