Skip to content

🎥 Make videos programmatically with React

Show connected composition children in shared Series timelines

Jonny Burgera953f2498e11
diff --git a/packages/sdk/src/calculate-timeline.ts b/packages/sdk/src/calculate-timeline.ts
index 36e819e4b6..ccef0ff22d 100644
--- a/packages/sdk/src/calculate-timeline.ts
+++ b/packages/sdk/src/calculate-timeline.ts
@@ -24,10 +24,12 @@ export const calculateTimeline = ({
sequences,
overrideIdsToNodePaths,
compositions = [],
+ showConnectedCompositionChildren = false,
}: {
sequences: TSequence[];
overrideIdsToNodePaths: OverrideIdToNodePaths;
compositions?: readonly _InternalTypes['AnyComposition'][];
+ showConnectedCompositionChildren?: boolean;
}): TimelineTrackData[] => {
const registeredSequencesById = new Map(
sequences.map((sequence) => [sequence.id, sequence]),
@@ -186,7 +188,9 @@ export const calculateTimeline = ({
};
const timelineSequences = sortedSequences.filter(
- (sequence) => !getTiming(sequence).hasConnectedCompositionAncestor,
+ (sequence) =>
+ showConnectedCompositionChildren ||
+ !getTiming(sequence).hasConnectedCompositionAncestor,
);
for (let i = 0; i < timelineSequences.length; i++) {
diff --git a/packages/studio/src/components/Timeline/Timeline.tsx b/packages/studio/src/components/Timeline/Timeline.tsx
index 43050a1f3a..1c54546602 100644
--- a/packages/studio/src/components/Timeline/Timeline.tsx
+++ b/packages/studio/src/components/Timeline/Timeline.tsx
@@ -78,6 +78,7 @@ import {
import {TimelineTracks} from './TimelineTracks';
import {TimelineVirtualizationProvider} from './TimelineVirtualization';
import {TimelineWidthProvider} from './TimelineWidthProvider';
+import {useCompactSeries} from './use-compact-series';
import {useResolvedStack} from './use-resolved-stack';
import {useTimelineAssetDrop} from './use-timeline-asset-drop';
@@ -276,6 +277,7 @@ const TimelineContextMenuArea: React.FC<{
const TimelineInner: React.FC = () => {
const sequences = Internals.useSequenceManagerSequences();
+ const compactSeries = useCompactSeries();
const {canvasContent, compositions} = useContext(
Internals.CompositionManager,
);
@@ -308,6 +310,7 @@ const TimelineInner: React.FC = () => {
sequences,
overrideIdsToNodePaths: overrideIdToNodePathMappings,
compositions,
+ showConnectedCompositionChildren: compactSeries,
}),
);
const previous = previousTimelineRef.current;
@@ -377,6 +380,7 @@ const TimelineInner: React.FC = () => {
videoConfigIsNull,
overrideIdToNodePathMappings,
compositions,
+ compactSeries,
]);
useLayoutEffect(() => {
previousTimelineRef.current = {
diff --git a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx b/packages/studio/src/components/Timeline/TimelineVirtualization.tsx
index e1642b535d..5d0a6e8525 100644
--- a/packages/studio/src/components/Timeline/TimelineVirtualization.tsx
+++ b/packages/studio/src/components/Timeline/TimelineVirtualization.tsx
@@ -14,7 +14,6 @@ import React, {
useRef,
} from 'react';
import {Internals} from 'remotion';
-import {getStudioShowPremounting} from '../../helpers/studio-runtime-config';
import {TIMELINE_ITEM_BORDER_BOTTOM} from '../../helpers/timeline-layout';
import {MAX_TIMELINE_TRACKS_NOTICE_HEIGHT} from './MaxTimelineTracks';
import {timelineVerticalScroll} from './timeline-refs';
@@ -34,6 +33,7 @@ import {
useTimelineSelection,
} from './TimelineSelection';
import {TIMELINE_TIME_INDICATOR_HEIGHT} from './TimelineTimeIndicators';
+import {useCompactSeries} from './use-compact-series';
import {useTimelineTrackHeights} from './use-timeline-height';
export type TimelineVirtualRow = TimelineDisplayRow & {
@@ -71,16 +71,7 @@ export const TimelineVirtualizationProvider: React.FC<{
readonly timeline: readonly TimelineDisplayRow[];
}> = ({children, hasBeenCut, isStill, timeline}) => {
const sequences = Internals.useSequenceManagerSequences();
- const experimentalTracks = useContext(
- Internals.ExperimentalTracksEnabledContext,
- );
- const activitySettings = useContext(
- Internals.SequenceActivitySettingsContext,
- );
- const compactSeries =
- experimentalTracks &&
- activitySettings?.enabled === true &&
- !getStudioShowPremounting();
+ const compactSeries = useCompactSeries();
const representativeTracks = useMemo(
() => timeline.map((row) => row.track),
[timeline],
diff --git a/packages/studio/src/components/Timeline/use-compact-series.ts b/packages/studio/src/components/Timeline/use-compact-series.ts
new file mode 100644
index 0000000000..b405b58d45
--- /dev/null
+++ b/packages/studio/src/components/Timeline/use-compact-series.ts
@@ -0,0 +1,17 @@
+import {useContext} from 'react';
+import {Internals} from 'remotion';
+import {getStudioShowPremounting} from '../../helpers/studio-runtime-config';
+
+export const useCompactSeries = () => {
+ const experimentalTracks = useContext(
+ Internals.ExperimentalTracksEnabledContext,
+ );
+ const activitySettings = useContext(
+ Internals.SequenceActivitySettingsContext,
+ );
+ return (
+ experimentalTracks &&
+ activitySettings?.enabled === true &&
+ !getStudioShowPremounting()
+ );
+};
diff --git a/packages/studio/src/components/WebMcp.tsx b/packages/studio/src/components/WebMcp.tsx
index c7090ee53d..fda8c00e05 100644
--- a/packages/studio/src/components/WebMcp.tsx
+++ b/packages/studio/src/components/WebMcp.tsx
@@ -64,6 +64,7 @@ import {
useTimelineSelection,
} from './Timeline/TimelineSelection';
import {getOriginalLocationFromStack} from './Timeline/TimelineStack/get-stack';
+import {useCompactSeries} from './Timeline/use-compact-series';
import {useResolveStackAndReactToChange} from './Timeline/use-resolved-stack-react-to-change';
import {
getDefaultCaptionOutputName,
@@ -277,6 +278,9 @@ const WebMcpSelectionSync: FC<{
};
export const WebMcp: FC = () => {
+ const compactSeries = useCompactSeries();
+ const compactSeriesRef = useRef(compactSeries);
+ compactSeriesRef.current = compactSeries;
const {addCaptionJob, addVideoMattingJob} = useContext(RenderQueueContext);
const staticFiles = useStaticFiles();
const timelineSelectionRef = useCurrentTimelineSelectionStateAsRef();
@@ -376,6 +380,7 @@ export const WebMcp: FC = () => {
sequences: sequencesRef.current,
overrideIdsToNodePaths: overrideIdToNodePathMappingsRef.current,
compositions: compositionsRef.current,
+ showConnectedCompositionChildren: compactSeriesRef.current,
}).filter((timelineTrack) =>
shouldShowTrackInTimeline(timelineTrack, durationInFrames),
);