🎥 Make videos programmatically with React
Share timeline multi-selection action targets
Jonny Burgere5dd4c101661
diff --git a/packages/studio/src/components/Timeline/TimelineSelection.tsx b/packages/studio/src/components/Timeline/TimelineSelection.tsxindex e78d6ff7c9..13845677ff 100644--- a/packages/studio/src/components/Timeline/TimelineSelection.tsx+++ b/packages/studio/src/components/Timeline/TimelineSelection.tsx@@ -614,6 +614,31 @@ export const getTimelineSelectionFromNodePathInfo = (export const getTimelineSelectionKey = getCanvasSelectionItemKey;+const multiSelectedSequenceNodePathInfosByItems = new WeakMap<+ readonly TimelineSelection[],+ readonly SequenceNodePathInfo[] | null+>();++export const getMultiSelectedSequenceNodePathInfos = (+ selectedItems: readonly TimelineSelection[],+): readonly SequenceNodePathInfo[] | null => {+ const cached = multiSelectedSequenceNodePathInfosByItems.get(selectedItems);+ if (cached !== undefined) {+ return cached;+ }++ // All selected clips and labels can share the same action targets.+ const nodePathInfos =+ selectedItems.length < 2 ||+ selectedItems.some((item) => item.type !== 'sequence')+ ? null+ : selectedItems.flatMap((item) =>+ item.type === 'sequence' ? [item.nodePathInfo] : [],+ );+ multiSelectedSequenceNodePathInfosByItems.set(selectedItems, nodePathInfos);+ return nodePathInfos;+};+const selectedKeysByItems = new WeakMap<readonly TimelineSelection[],ReadonlySet<string>diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsxindex 7bb43db189..d2405eb65f 100644--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx@@ -107,6 +107,7 @@ import {TimelineSceneRangeContext,} from './TimelineSceneRangeContext';import {+ getMultiSelectedSequenceNodePathInfos,getTimelineColor,getTimelineSequenceSelectionKey,isTimelineSelectionModifierEvent,@@ -1451,19 +1452,9 @@ const useTimelineSequenceState = (props: TimelineSequenceProps) => {const deleteTimelineItems = useDeleteTimelineItems();const {onSelect, selectable, selected, selectedItems} =useTimelineRowSelection(nodePathInfo);- const selectedSequenceNodePathInfos = useMemo(() => {- if (- !selected ||- selectedItems.length < 2 ||- selectedItems.some((item) => item.type !== 'sequence')- ) {- return null;- }-- return selectedItems.flatMap((item) =>- item.type === 'sequence' ? [item.nodePathInfo] : [],- );- }, [selected, selectedItems]);+ const selectedSequenceNodePathInfos = selected+ ? getMultiSelectedSequenceNodePathInfos(selectedItems)+ : null;const performSequenceDoubleClick = useCallback((e: React.MouseEvent<HTMLDivElement>) => {if (isTimelineSelectionModifierEvent(e)) {diff --git a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsxindex 46d2a46c57..c61f2163c7 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx@@ -108,6 +108,7 @@ import {TimelineLayerEye, TimelineLayerEyeSpacer} from './TimelineLayerEye';import {TimelineMediaInfo} from './TimelineMediaInfo';import {TimelineRowChrome} from './TimelineRowChrome';import {+ getMultiSelectedSequenceNodePathInfos,getTimelineColor,getTimelineSequenceSelectionKey,isTimelineSelectionModifierEvent,@@ -409,19 +410,9 @@ const TimelineSequenceItemInner: React.FC<{const {onSelect, selectable, selected, selectedItems, selectItem} =useTimelineRowSelection(nodePathInfo);const currentSelection = useCurrentTimelineSelectionStateAsRef();- const selectedSequenceNodePathInfos = useMemo(() => {- if (- !selected ||- selectedItems.length < 2 ||- selectedItems.some((item) => item.type !== 'sequence')- ) {- return null;- }-- return selectedItems.flatMap((item) =>- item.type === 'sequence' ? [item.nodePathInfo] : [],- );- }, [selected, selectedItems]);+ const selectedSequenceNodePathInfos = selected+ ? getMultiSelectedSequenceNodePathInfos(selectedItems)+ : null;const containsSelection = useTimelineRowContainsSelection(nodePathInfo);const [effectDropHovered, setEffectDropHovered] = useState(false);useEffect(() => {