Skip to content

🎥 Make videos programmatically with React

Allow render outputs in Studio canvas tabs

Jonny Burgerdf10abf9216c
diff --git a/packages/studio/src/components/CanvasTabs.tsx b/packages/studio/src/components/CanvasTabs.tsx
index 7da5fbd2cf..1663801e15 100644
--- a/packages/studio/src/components/CanvasTabs.tsx
+++ b/packages/studio/src/components/CanvasTabs.tsx
@@ -43,6 +43,10 @@ import {useSelectComposition} from './InitialCompositionLoader';
import {InlineAction} from './InlineAction';
import {HORIZONTAL_SCROLLBAR_CLASSNAME} from './Menu/is-menu-item';
import type {ComboboxValue} from './NewComposition/ComboBox';
+import {
+ getDraggedRenderOutputCanvasContent,
+ RENDER_OUTPUT_TAB_DRAG_MIME_TYPE,
+} from './RenderQueue/use-render-output-file-drag';
import {Tab, Tabs} from './Tabs';
import {useResolvedStack} from './Timeline/use-resolved-stack';
import {useOpenInMenuApps} from './use-open-in-menu-apps';
@@ -697,12 +701,13 @@ export const CanvasTabs: React.FC = () => {
: targetIndex,
);
} else {
+ const dragTypes = Array.from(event.dataTransfer.types);
const isAsset =
- StudioProtocolInternals.getDragPreviewMetadata(
- event.dataTransfer.types,
- )?.type === 'asset';
+ StudioProtocolInternals.getDragPreviewMetadata(dragTypes)?.type ===
+ 'asset';
if (
!isAsset &&
+ !dragTypes.includes(RENDER_OUTPUT_TAB_DRAG_MIME_TYPE) &&
getCompositionDragPreviewMetadata(event.dataTransfer.types) === null
) {
setDropIndex(null);
@@ -774,7 +779,20 @@ export const CanvasTabs: React.FC = () => {
const compositionDrag = parseCompositionDragData(event.dataTransfer);
let content: CanvasContent;
- if (compositionDrag !== null) {
+ if (
+ Array.from(event.dataTransfer.types).includes(
+ RENDER_OUTPUT_TAB_DRAG_MIME_TYPE,
+ )
+ ) {
+ const renderOutput = getDraggedRenderOutputCanvasContent(
+ event.dataTransfer,
+ );
+ if (renderOutput === null) {
+ return;
+ }
+
+ content = renderOutput;
+ } else if (compositionDrag !== null) {
const composition = compositions.find(
(item) => item.id === compositionDrag.compositionId,
);
diff --git a/packages/studio/src/components/RenderQueue/use-render-output-file-drag.ts b/packages/studio/src/components/RenderQueue/use-render-output-file-drag.ts
index 34aebddb3a..f3c5ebb537 100644
--- a/packages/studio/src/components/RenderQueue/use-render-output-file-drag.ts
+++ b/packages/studio/src/components/RenderQueue/use-render-output-file-drag.ts
@@ -1,11 +1,24 @@
import {StudioProtocolInternals} from '@remotion/studio-protocol';
import type {DragEventHandler} from 'react';
import {useCallback, useEffect, useMemo, useState} from 'react';
+import type {CanvasContent} from 'remotion';
import {remotion_outputsBase} from '../../helpers/get-asset-metadata';
import type {AnyRenderJob} from './context';
import {isClientRenderJob} from './context';
const MAXIMUM_SAFE_FILE_DRAG_SIZE = 500 * 1024 * 1024;
+export const RENDER_OUTPUT_TAB_DRAG_MIME_TYPE =
+ 'application/vnd.remotion.render-output-tab';
+let draggedOutput: {jobId: string; content: CanvasContent} | null = null;
+
+export const getDraggedRenderOutputCanvasContent = (
+ dataTransfer: DataTransfer,
+): CanvasContent | null => {
+ return dataTransfer.getData(RENDER_OUTPUT_TAB_DRAG_MIME_TYPE) ===
+ draggedOutput?.jobId
+ ? (draggedOutput?.content ?? null)
+ : null;
+};
const getFilename = (outName: string) => {
return outName.split(/[/\\]/).at(-1) ?? outName;
@@ -103,6 +116,7 @@ export const useRenderOutputFileDrag = (job: AnyRenderJob) => {
const onDragStart: DragEventHandler<HTMLDivElement> = useCallback(
(event) => {
+ draggedOutput = null;
if (!canDrag) {
event.preventDefault();
return;
@@ -135,20 +149,48 @@ export const useRenderOutputFileDrag = (job: AnyRenderJob) => {
event.dataTransfer.setData(dragData.mimeType, dragData.payload);
}
+ event.dataTransfer.setData(RENDER_OUTPUT_TAB_DRAG_MIME_TYPE, job.id);
event.dataTransfer.setData(
'DownloadURL',
`${mimeType}:${filename}:${source}`,
);
+ if (isClientRenderJob(job)) {
+ if (job.status !== 'done' || !job.getBlob) {
+ event.preventDefault();
+ return;
+ }
+
+ draggedOutput = {
+ jobId: job.id,
+ content: {
+ type: 'output-blob',
+ displayName: job.outName,
+ getBlob: job.getBlob,
+ width: job.metadata.width,
+ height: job.metadata.height,
+ sizeInBytes: job.metadata.sizeInBytes,
+ },
+ };
+ } else {
+ draggedOutput = {
+ jobId: job.id,
+ content: {type: 'output', path: `/${job.outName}`},
+ };
+ }
+
setIsDragging(true);
} catch {
event.preventDefault();
}
},
- [canDrag, clientFile, job.outName],
+ [canDrag, clientFile, job],
);
const onDragEnd = useCallback(() => {
setIsDragging(false);
- }, []);
+ if (draggedOutput?.jobId === job.id) {
+ draggedOutput = null;
+ }
+ }, [job.id]);
return {canDrag, isDragging, onDragEnd, onDragStart};
};