🎥 Make videos programmatically with React
Separate shared Series child bars with a visual gap
Jonny Burger71ca3bf8eade
diff --git a/packages/studio/src/components/Timeline/TimelineSceneRangeContext.ts b/packages/studio/src/components/Timeline/TimelineSceneRangeContext.tsnew file mode 100644index 0000000000..b654d21ad8--- /dev/null+++ b/packages/studio/src/components/Timeline/TimelineSceneRangeContext.ts@@ -0,0 +1,5 @@+import {createContext} from 'react';+import type {TimelineSceneRange} from './timeline-series-layout';++export const TimelineSceneRangeContext =+ createContext<TimelineSceneRange | null>(null);diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex 1700500535..1ac49a5fcd 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -87,6 +87,7 @@ import {} from './timeline-track-groups';import {timelineTrimEdgeCursor} from './timeline-trim-edge-cursor';import {TimelineImageInfo} from './TimelineImageInfo';+import {TimelineSceneRangeContext} from './TimelineSceneRangeContext';import {getTimelineColor,getTimelineSequenceSelectionKey,@@ -384,6 +385,9 @@ const TimelineSequenceBar: React.FC<{onClick,}) => {const ref = useRef<HTMLDivElement>(null);+ const sceneRange = useContext(TimelineSceneRangeContext);+ const timelineWidth = useContext(TimelineWidthContext);+ const video = Internals.useUnsafeVideoConfig();const {onSelect, selectable, selected, selectionItem} =useTimelineRowSelection(nodePathInfo);const containsSelection = useTimelineRowContainsSelection(nodePathInfo);@@ -421,11 +425,30 @@ const TimelineSequenceBar: React.FC<{s.timelineTrack?.role === 'transition'? (marqueeHorizontalBounds?.width ?? Number(style.width)): null;- // Take the gap from the trailing painted edge, keeping the full frame-based- // layout and trim handles intact. Keep tiny clips visible when zoomed out.+ const frameIncrement =+ timelineWidth !== null && video !== null+ ? (timelineWidth - TIMELINE_PADDING * 2) / video.durationInFrames+ : null;+ const sceneLeft =+ sceneRange !== null && frameIncrement !== null+ ? sceneRange.from * frameIncrement - Number(style.marginLeft)+ : -Infinity;+ const sceneRight =+ sceneRange !== null && frameIncrement !== null+ ? sceneRange.end * frameIncrement - Number(style.marginLeft)+ : Infinity;+ const paintedStart = Math.max(negativeStartEnd, sceneLeft);+ const paintedEnd = Math.max(0, Math.min(Number(style.width), sceneRight));+ // Shared child rows need the same gap as Track clips, including when the+ // scene clips their trailing edge. Only inset the paint: timing, hit areas,+ // and trim handles keep their full width. Preserve tiny clips when zoomed out.const visualRightInset =- s.timelineTrack && transitionWidth === null && rightEdgeVisible- ? Math.min(1, Math.max(0, Number(style.width) - negativeStartEnd - 1))+ (s.timelineTrack || sceneRange !== null) &&+ transitionWidth === null &&+ (rightEdgeVisible || sceneRight <= Number(style.width))+ ? Number(style.width) -+ paintedEnd ++ Math.min(1, Math.max(0, paintedEnd - paintedStart - 1)): 0;// Back the antialiased rounded edge only when the glow is at the painted layer edge.const sequenceBackground =diff --git a/packages/studio/src/components/Timeline/TimelineTracks.tsx b/packages/studio/src/components/Timeline/TimelineTracks.tsxindex a4e9554169..4f78d31766 100644--- a/packages/studio/src/components/Timeline/TimelineTracks.tsx+++ b/packages/studio/src/components/Timeline/TimelineTracks.tsx@@ -5,6 +5,7 @@ import {MaxTimelineTracksReached} from './MaxTimelineTracks';import {timelineDurationRef, timelineLayerLayoutsRef} from './timeline-refs';import type {TimelineSceneRange} from './timeline-series-layout';import {TimelinePackedTrack} from './TimelinePackedTrack';+import {TimelineSceneRangeContext} from './TimelineSceneRangeContext';import {TimelineTrack} from './TimelineTrack';import {TimelineViewportContext} from './TimelineViewport';import {useTimelineVirtualization} from './TimelineVirtualization';@@ -28,7 +29,11 @@ const TimelineSceneTrackContent: React.FC<{}> = React.memo(({children, sceneRange}) => {const frame = Internals.Timeline.useTimelinePosition();const active = frame >= sceneRange.from && frame < sceneRange.end;- return <div style={{opacity: active ? 1 : 0.5}}>{children}</div>;+ return (+ <TimelineSceneRangeContext.Provider value={sceneRange}>+ <div style={{opacity: active ? 1 : 0.5}}>{children}</div>+ </TimelineSceneRangeContext.Provider>+ );});const TimelineTracksInner: React.FC<{