🎥 Make videos programmatically with React
Require cached parent timing on timeline tracks
Jonny Burger0759302d7ac8
diff --git a/packages/sdk/src/get-timeline-sequence-sort-key.ts b/packages/sdk/src/get-timeline-sequence-sort-key.tsindex 00f471a53d..6a359d4af4 100644--- a/packages/sdk/src/get-timeline-sequence-sort-key.ts+++ b/packages/sdk/src/get-timeline-sequence-sort-key.ts@@ -25,8 +25,8 @@ export type TimelineTrackData = {sequenceFrameOffset: number;cascadedStart: number;localStart: number;- parentVisibleStart?: number;- parentVisibleEnd?: number | null;+ parentVisibleStart: number;+ parentVisibleEnd: number | null;};export type TimelineLoopDisplay = LoopDisplay & {diff --git a/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx b/packages/studio/src/components/Timeline/TimelinePackedTrack.tsxindex 21033e4445..b009fa2e35 100644--- a/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx+++ b/packages/studio/src/components/Timeline/TimelinePackedTrack.tsx@@ -117,8 +117,8 @@ export const TimelinePackedTrack: React.FC<{labelStartFrame={labelStartFrames.get(item.sequence.id) ?? null}cascadedStart={item.cascadedStart}localStart={item.localStart}- parentVisibleStart={item.parentVisibleStart ?? 0}- parentVisibleEnd={item.parentVisibleEnd ?? null}+ parentVisibleStart={item.parentVisibleStart}+ parentVisibleEnd={item.parentVisibleEnd}connectedCompositions={item.connectedCompositions ?? noConnectedCompositions}diff --git a/packages/studio/src/components/Timeline/TimelineTrack.tsx b/packages/studio/src/components/Timeline/TimelineTrack.tsxindex 27d5c9bc71..e61222d97b 100644--- a/packages/studio/src/components/Timeline/TimelineTrack.tsx+++ b/packages/studio/src/components/Timeline/TimelineTrack.tsx@@ -76,8 +76,8 @@ const TimelineTrackUnmemoized: React.FC<{labelStartFrame={null}cascadedStart={track.cascadedStart}localStart={track.localStart}- parentVisibleStart={track.parentVisibleStart ?? 0}- parentVisibleEnd={track.parentVisibleEnd ?? null}+ parentVisibleStart={track.parentVisibleStart}+ parentVisibleEnd={track.parentVisibleEnd}connectedCompositions={track.connectedCompositions ?? emptyConnectedCompositions}diff --git a/packages/studio/src/test/timeline-selection.test.ts b/packages/studio/src/test/timeline-selection.test.tsindex 6fb4cd7183..3c9a0329ab 100644--- a/packages/studio/src/test/timeline-selection.test.ts+++ b/packages/studio/src/test/timeline-selection.test.ts@@ -6645,6 +6645,8 @@ test('Derived selectable timeline items follow expanded timeline order', () => {{cascadedStart: 0,localStart: 0,+ parentVisibleStart: 0,+ parentVisibleEnd: null,depth: 0,keyframeDisplayOffset: 0,keyframePlaybackRate: 1,