Skip to content

🎥 Make videos programmatically with React

Simplify track roles and revert presenter timing changes

Jonny Burger8790d2571ff0
diff --git a/packages/core/src/Sequence.tsx b/packages/core/src/Sequence.tsx
index a0c2d79570..e9a483243a 100644
--- a/packages/core/src/Sequence.tsx
+++ b/packages/core/src/Sequence.tsx
@@ -199,8 +199,7 @@ const RegularSequenceRefForwardingFunction: React.ForwardRefRenderFunction<
const [id] = useState(() => String(Math.random()));
const parentSequence = useContext(SequenceContext);
const timelineTrack = useContext(TimelineTrackContext);
- const timelineTrackRole =
- timelineTrackItem?.role ?? (showInTimeline ? 'clip' : 'container');
+ const timelineTrackRole = timelineTrackItem?.role ?? 'clip';
const parentPlaybackRate = parentSequence?.playbackRate ?? 1;
const cumulativePlaybackRate = parentPlaybackRate * playbackRate;
const cumulatedFrom = parentSequence
@@ -902,7 +901,8 @@ const RegularSequenceRefForwardingFunction: React.ForwardRefRenderFunction<
const sequence = (
<TimelineTrackContext.Provider
value={
- timelineTrackRole === 'container' || timelineTrackRole === 'track'
+ timelineTrackRole === 'track' ||
+ (timelineTrackRole === 'clip' && !showInTimeline)
? timelineTrack
: null
}
diff --git a/packages/core/src/timeline-track-context.ts b/packages/core/src/timeline-track-context.ts
index 1011a1f52f..2e58e700a0 100644
--- a/packages/core/src/timeline-track-context.ts
+++ b/packages/core/src/timeline-track-context.ts
@@ -6,7 +6,7 @@ export type TimelineTrack = {
};
export type TimelineTrackItem = TimelineTrack & {
- readonly role: 'track' | 'clip' | 'container' | 'transition' | 'overlay';
+ readonly role: 'track' | 'clip' | 'transition' | 'overlay';
};
export const TimelineTrackContext = createContext<TimelineTrack | null>(null);
diff --git a/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsx b/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsx
index 39c33ff600..dc0b097f86 100644
--- a/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsx
+++ b/packages/jonnys-videos/src/roller-skis/IntroLowerThird.tsx
@@ -75,8 +75,6 @@ const IntroLowerThirdContent: React.FC<IntroLowerThirdProps> = ({
<Interactive.Div
name="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.tsx
index 66e3a4fa40..41986b0799 100644
--- a/packages/studio/src/components/Timeline/Timeline.tsx
+++ b/packages/studio/src/components/Timeline/Timeline.tsx
@@ -283,7 +283,11 @@ const TimelineTrackChildrenSyncer: React.FC<{
() =>
tracks.filter(({sequence}) => {
const role = sequence.timelineTrack?.role;
- return role === 'clip' || role === 'overlay' || role === 'transition';
+ return (
+ (role === 'clip' && sequence.showInTimeline) ||
+ role === 'overlay' ||
+ role === 'transition'
+ );
}),
[tracks],
);
diff --git a/packages/studio/src/components/Timeline/timeline-track-groups.ts b/packages/studio/src/components/Timeline/timeline-track-groups.ts
index 724b4ccb35..776f786c75 100644
--- a/packages/studio/src/components/Timeline/timeline-track-groups.ts
+++ b/packages/studio/src/components/Timeline/timeline-track-groups.ts
@@ -21,7 +21,10 @@ export const filterTimelineTrackContents = (
const scopedDisplayGroupCounts = new Map<string, number>();
const visibleTracks = tracks.flatMap((track) => {
- if (track.sequence.timelineTrack?.role === 'container') {
+ if (
+ track.sequence.timelineTrack?.role === 'clip' &&
+ !track.sequence.showInTimeline
+ ) {
return [];
}
@@ -47,8 +50,8 @@ export const filterTimelineTrackContents = (
}
if (
- ancestor.timelineTrack.role !== 'container' &&
- ancestor.timelineTrack.role !== 'track'
+ ancestor.timelineTrack.role !== 'track' &&
+ (ancestor.timelineTrack.role !== 'clip' || ancestor.showInTimeline)
) {
// Nested tracks follow their containing clip too, while keeping
// their own packed rows whenever that clip is active.