Skip to content

🎥 Make videos programmatically with React

Merge pull request #12227 from remotion-dev/codex/track-clip-rows

Jonny Burger5ce951493471
diff --cc packages/studio/src/components/Timeline/TimelineSequence.tsx
index 945b831328,dfd0e36f37..9b067ed9db
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@@ -87,10 -84,9 +86,10 @@@ import
PACKED_LABEL_BOTTOM,
TimelineSequenceLabel,
} from './timeline-sequence-label';
+import {timelineSourceOnlyCursor} from './timeline-source-only-cursor';
import {
- TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT,
- TIMELINE_PACKED_TRACK_HEIGHT,
+ getTimelineSequenceHeight,
+ hasTimelineTrackMediaLabel,
} from './timeline-track-groups';
import {timelineTrimEdgeCursor} from './timeline-trim-edge-cursor';
import {TimelineImageInfo} from './TimelineImageInfo';
@@@ -1792,15 -1701,9 +1796,10 @@@ const TimelineSequenceLayoutInner: Reac
const parentEnd = parentVisibleEnd ?? video.durationInFrames;
const frameIncrement =
(windowWidth - TIMELINE_PADDING * 2) / video.durationInFrames;
- const layerHeight =
- s.timelineTrack?.role === 'overlay'
- ? TIMELINE_PACKED_AUXILIARY_ROW_HEIGHT - TIMELINE_ITEM_BORDER_BOTTOM
- : s.timelineTrack
- ? TIMELINE_PACKED_TRACK_HEIGHT
- : getTimelineLayerHeight(s.type);
+ const layerHeight = getTimelineSequenceHeight(s);
const trimOutline = (() => {
if (
+ !isEdgeDragging ||
activeEdgeHighlight === null ||
activeEdgeHighlight === 'source-only' ||
s.loopDisplay ||