🎥 Make videos programmatically with React
Improve experimental timeline track visibility and labels
JonnyBurger119fcc763168
diff --git a/packages/studio/src/components/Timeline/Timeline.tsx b/packages/studio/src/components/Timeline/Timeline.tsxindex 41986b0799..43050a1f3a 100644--- a/packages/studio/src/components/Timeline/Timeline.tsx+++ b/packages/studio/src/components/Timeline/Timeline.tsx@@ -274,59 +274,7 @@ const TimelineContextMenuArea: React.FC<{);};-const TimelineTrackChildrenSyncer: React.FC<{- readonly tracks: readonly TimelineTrackWithDisplayGroup[];- readonly onChange: (activeTrackItemIds: ReadonlySet<string>) => void;-}> = React.memo(({tracks, onChange}) => {- const frame = Internals.Timeline.useTimelinePosition();- const packedItems = useMemo(- () =>- tracks.filter(({sequence}) => {- const role = sequence.timelineTrack?.role;- return (- (role === 'clip' && sequence.showInTimeline) ||- role === 'overlay' ||- role === 'transition'- );- }),- [tracks],- );- const activeTrackItemIds = useMemo(- () =>- new Set(- packedItems- .filter(- ({sequence}) =>- frame >= sequence.from &&- frame < sequence.from + sequence.duration,- )- .map(({sequence}) => sequence.id),- ),- [frame, packedItems],- );- // Publish even an empty set when tracks are re-enabled after seeking.- const previousActiveIds = useRef<ReadonlySet<string> | null>(null);- useLayoutEffect(() => {- const previous = previousActiveIds.current;- if (- previous !== null &&- previous.size === activeTrackItemIds.size &&- [...activeTrackItemIds].every((id) => previous.has(id))- ) {- return;- }-- previousActiveIds.current = activeTrackItemIds;- onChange(activeTrackItemIds);- }, [activeTrackItemIds, onChange]);-- return null;-});-const TimelineInner: React.FC = () => {- const experimentalTracksEnabled = useContext(- Internals.ExperimentalTracksEnabledContext,- );const sequences = Internals.useSequenceManagerSequences();const {canvasContent, compositions} = useContext(Internals.CompositionManager,@@ -460,19 +408,11 @@ const TimelineInner: React.FC = () => {return shouldShowTrackInTimeline(t, durationInFrames);});}, [activeFromDragOverrideKeys, durationInFrames, timeline]);- const [activeTrackItemIds, setActiveTrackItemIds] = useState<- ReadonlySet<string>- >(() => new Set());-// Keep `filtered` complete so a future toggle can show every programmatic// instance without recalculating the timeline or losing its instance index.const collapsed = useMemo(() => {const seenDisplayGroups = new Set<string>();- return filterTimelineTrackContents(- filtered,- sequences,- activeTrackItemIds,- ).filter((track) => {+ return filterTimelineTrackContents(filtered, sequences).filter((track) => {if (track.sequence.timelineTrack || track.displayGroup === null) {return true;}@@ -484,7 +424,7 @@ const TimelineInner: React.FC = () => {seenDisplayGroups.add(track.displayGroup.key);return true;});- }, [activeTrackItemIds, filtered, sequences]);+ }, [filtered, sequences]);const {visibleTracks, value: layerChildrenValue} = useTimelineLayerChildren(collapsed,@@ -622,12 +562,6 @@ const TimelineInner: React.FC = () => {return (<TimelineContextMenuArea>- {experimentalTracksEnabled ? (- <TimelineTrackChildrenSyncer- tracks={filtered}- onChange={setActiveTrackItemIds}- />- ) : null}{sequences.map((sequence) => {if (!shouldSubscribeToSequenceProps(sequence, previewInteractive)) {return null;diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex a681c85d56..fb71ae341a 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -87,6 +87,7 @@ import {import {timelineTrimEdgeCursor} from './timeline-trim-edge-cursor';import {TimelineImageInfo} from './TimelineImageInfo';import {+ getTimelineColor,getTimelineSequenceSelectionKey,isTimelineSelectionModifierEvent,shouldSelectTimelineRowOnPointerDown,@@ -506,11 +507,11 @@ const TimelineSequenceBar: React.FC<{left:5 +Math.max(labelOffset, negativeStartEnd + (premount?.width ?? 0)),- right: 4,+ right: 0,bottom: PACKED_LABEL_BOTTOM,display: 'flex',- alignItems: 'center',- gap: 4,+ flexDirection: 'column',+ alignItems: 'flex-start',overflow: 'hidden',pointerEvents: 'none',userSelect: 'none',@@ -520,19 +521,23 @@ const TimelineSequenceBar: React.FC<{{connectedComposition ? (<CompositionOrStillIconcomposition={connectedComposition}- color={WHITE}+ color={getTimelineColor(false, false)}style={{flexShrink: 0, height: 12, width: 12}}/>) : null}<spanstyle={{+ alignSelf: 'stretch',fontSize: 11,lineHeight: `${PACKED_LABEL_HEIGHT}px`,- color: WHITE,+ color: getTimelineColor(false, false),+ maskImage:+ 'linear-gradient(to right, black calc(100% - 5px), transparent)',minWidth: 0,whiteSpace: 'nowrap',overflow: 'hidden',- textOverflow: 'ellipsis',+ WebkitMaskImage:+ 'linear-gradient(to right, black calc(100% - 5px), transparent)',}}>{s.timelineTrack.role === 'overlay' ? 'Overlay' : s.displayName}diff --git a/packages/studio/src/components/Timeline/timeline-track-groups.ts b/packages/studio/src/components/Timeline/timeline-track-groups.tsindex 4de034be11..17cce072eb 100644--- a/packages/studio/src/components/Timeline/timeline-track-groups.ts+++ b/packages/studio/src/components/Timeline/timeline-track-groups.ts@@ -14,7 +14,6 @@ export type TimelineDisplayRow = {export const filterTimelineTrackContents = (tracks: readonly TimelineTrackWithDisplayGroup[],sequences: readonly TSequence[],- activeTrackItemIds: ReadonlySet<string>,): TimelineTrackWithDisplayGroup[] => {const byId = new Map(sequences.map((sequence) => [sequence.id, sequence]));const tracksById = new Map(tracks.map((track) => [track.sequence.id, track]));@@ -53,12 +52,6 @@ export const filterTimelineTrackContents = (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.- if (!activeTrackItemIds.has(ancestor.id)) {- return [];- }-if (nearestPackedInstance === null) {const nodePathInfo = tracksById.get(ancestor.id)?.nodePathInfo;nearestPackedInstance = nodePathInfo