🎥 Make videos programmatically with React
Disable unsupported inspector actions for transitions
JonnyBurgere5b3bbbe418c
diff --git a/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsx b/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsxindex 287b301ff6..d1101706bf 100644--- a/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/MultiSequenceInspector.tsx@@ -128,6 +128,7 @@ export const MultiSequenceInspector: React.FC<{displayName: track?.sequence.displayName ?? null,line: null,singleChildComponent: track?.sequence.singleChildComponent ?? null,+ isTransition: track?.sequence.timelineTrack?.role === 'transition',};});}, [overrideIdToNodePathMappings, selections, sequences]);diff --git a/packages/studio/src/components/InspectorPanel/SequencePrecomposeAction.tsx b/packages/studio/src/components/InspectorPanel/SequencePrecomposeAction.tsxindex 58309d312c..28dd0b14af 100644--- a/packages/studio/src/components/InspectorPanel/SequencePrecomposeAction.tsx+++ b/packages/studio/src/components/InspectorPanel/SequencePrecomposeAction.tsx@@ -28,6 +28,7 @@ export const SequencePrecomposeAction: React.FC<{readonly displayName: string | null;readonly line: number | null;readonly singleChildComponent: unknown;+ readonly isTransition: boolean;}[];readonly sourceActionsDisabled: boolean;}> = ({targets, sourceActionsDisabled}) => {@@ -44,6 +45,7 @@ export const SequencePrecomposeAction: React.FC<{({singleChildComponent}) =>getConnectedCompositions({compositions, singleChildComponent}).length > 0,);+ const hasTransition = targets.some((target) => target.isTransition);const resolvedCompositionLocation = useResolvedStack(composition?.stack ?? null,);@@ -60,6 +62,7 @@ export const SequencePrecomposeAction: React.FC<{const onPrecompose = useCallback(() => {if (busy ||+ hasTransition ||!canChangeSource ||hasConnectedComposition ||targets.length === 0@@ -144,6 +147,7 @@ export const SequencePrecomposeAction: React.FC<{compositionId,compositions,hasConnectedComposition,+ hasTransition,setSelectedModal,targets,]);@@ -154,7 +158,7 @@ export const SequencePrecomposeAction: React.FC<{return (<InspectorQuickAction- disabled={busy}+ disabled={busy || hasTransition}onClick={onPrecompose}renderIcon={(color) => <FilmIcon color={color} style={iconStyle} />}>diff --git a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsxindex 167615c7ef..59136e83c9 100644--- a/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx+++ b/packages/studio/src/components/InspectorPanel/SequenceSelectionInspector.tsx@@ -156,6 +156,8 @@ const SequenceSourceQuickActions: React.FC<{});const sourceActionsDisabled =previewServerState.type !== 'connected' || !isStudioInteractivityEnabled();+ const isTransition = track.sequence.timelineTrack?.role === 'transition';+ const duplicateDisabled = sourceActionsDisabled || isTransition;const mediaSequence =track.sequence.type === 'video' || track.sequence.type === 'audio'? track.sequence@@ -229,14 +231,14 @@ const SequenceSourceQuickActions: React.FC<{videoMattingDisabledReason,]);const onDuplicate = useCallback(() => {- if (sourceActionsDisabled) {+ if (duplicateDisabled) {return;}duplicateSequencesFromSource([selection.nodePathInfo], confirm).catch(() => undefined,);- }, [confirm, selection.nodePathInfo, sourceActionsDisabled]);+ }, [confirm, duplicateDisabled, selection.nodePathInfo]);const onDelete = useCallback(() => {if (sourceActionsDisabled) {return;@@ -346,7 +348,7 @@ const SequenceSourceQuickActions: React.FC<{</InspectorQuickAction>) : null}<InspectorQuickAction- disabled={sourceActionsDisabled}+ disabled={duplicateDisabled}iconContainerStyle={largeInspectorActionIconContainerStyle}onClick={onDuplicate}renderIcon={(color) => (@@ -372,6 +374,7 @@ const SequenceSourceQuickActions: React.FC<{displayName: track.sequence.displayName,line: validatedLocation.line,singleChildComponent: track.sequence.singleChildComponent,+ isTransition,},]}sourceActionsDisabled={sourceActionsDisabled}@@ -509,6 +512,8 @@ const SequenceExpandedInspector: React.FC<{displayName: track.sequence.displayName,line: null,singleChildComponent: track.sequence.singleChildComponent,+ isTransition:+ track.sequence.timelineTrack?.role === 'transition',},]}sourceActionsDisabled={diff --git a/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsx b/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsxindex 6d255cf55e..f8c1701339 100644--- a/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsx+++ b/packages/studio/src/components/InspectorPanel/SequenceWrapAction.tsx@@ -48,6 +48,7 @@ export const SequenceWrapAction: React.FC<{);const {sequence} = track;const [busy, setBusy] = useState(false);+ const isTransition = sequence.timelineTrack?.role === 'transition';const canWrapInHtmlInCanvas =sequence.type === 'sequence' &&!nodePathInfo.supportsEffects &&@@ -59,6 +60,7 @@ export const SequenceWrapAction: React.FC<{async (wrapper: HtmlInCanvasWrapper) => {if (busy ||+ isTransition ||!canWrapInHtmlInCanvas ||sourceActionsDisabled ||canvasContent?.type !== 'composition'@@ -198,6 +200,7 @@ export const SequenceWrapAction: React.FC<{},[busy,+ isTransition,canWrapInHtmlInCanvas,canvasContent,nodePathInfo.sequenceSubscriptionKey,@@ -223,7 +226,7 @@ export const SequenceWrapAction: React.FC<{return (<><InspectorQuickAction- disabled={busy || sourceActionsDisabled}+ disabled={busy || sourceActionsDisabled || isTransition}iconContainerStyle={largeInspectorActionIconContainerStyle}onClick={() => onWrap('HtmlInCanvas')}renderIcon={(color) => (@@ -237,7 +240,7 @@ export const SequenceWrapAction: React.FC<{HTML-in-canvas</InspectorQuickAction><InspectorQuickAction- disabled={busy || sourceActionsDisabled}+ disabled={busy || sourceActionsDisabled || isTransition}iconContainerStyle={largeInspectorActionIconContainerStyle}onClick={() => onWrap('HtmlInCanvasMotionBlur')}renderIcon={(color) => (