Skip to content

🎥 Make videos programmatically with React

Address composition edit review feedback

JonnyBurger2e52ec17af3e
diff --git a/packages/browser-studio/src/virtual-files.ts b/packages/browser-studio/src/virtual-files.ts
index a86352257d..04184174db 100644
--- a/packages/browser-studio/src/virtual-files.ts
+++ b/packages/browser-studio/src/virtual-files.ts
@@ -1,5 +1,8 @@
import {getBrowserReactRefreshVirtualFiles} from '@remotion/browser-bundler/compiler';
-import {REACT_REFRESH_FINISHED_EVENT} from '@remotion/studio-shared';
+import {
+ REACT_REFRESH_FINISHED_EVENT,
+ REACT_REFRESH_STARTED_EVENT,
+} from '@remotion/studio-shared';
export const browserStudioVirtualFilePaths = {
browserRequireShim: '/__remotion_browser_studio__/browser-require-shim.js',
@@ -33,6 +36,7 @@ if (RemotionRefreshRuntime.__remotionReactRefreshWrapped === null) {
const originalPerformReactRefresh = RemotionRefreshRuntime.performReactRefresh;
RemotionRefreshRuntime.__remotionReactRefreshWrapped = true;
RemotionRefreshRuntime.performReactRefresh = () => {
+ window.dispatchEvent(new Event(${JSON.stringify(REACT_REFRESH_STARTED_EVENT)}));
const result = originalPerformReactRefresh();
if (result !== null) {
window.dispatchEvent(new Event(${JSON.stringify(REACT_REFRESH_FINISHED_EVENT)}));
diff --git a/packages/studio-server/src/codemods/add-composition-to-file.ts b/packages/studio-server/src/codemods/add-composition-to-file.ts
index 8dfc326a6c..16bd0a9276 100644
--- a/packages/studio-server/src/codemods/add-composition-to-file.ts
+++ b/packages/studio-server/src/codemods/add-composition-to-file.ts
@@ -16,9 +16,11 @@ import {checkIfTypeScriptFile} from '../preview-server/routes/can-update-default
export const addCompositionToFile = async ({
filePath,
options,
+ remotionRoot,
}: {
filePath: string;
options: NewCompositionOptions;
+ remotionRoot: string;
}): Promise<CodemodResult> => {
checkIfTypeScriptFile(filePath);
const input = await readFile(filePath, 'utf-8');
@@ -28,7 +30,7 @@ export const addCompositionToFile = async ({
);
if (existsSync(componentFilePath)) {
throw new Error(
- `Cannot create ${componentFilePath} because it already exists`,
+ `Cannot create ${path.relative(remotionRoot, componentFilePath)} because it already exists`,
);
}
diff --git a/packages/studio-server/src/preview-server/routes/add-composition.ts b/packages/studio-server/src/preview-server/routes/add-composition.ts
index 09b1237770..e0504d8f81 100644
--- a/packages/studio-server/src/preview-server/routes/add-composition.ts
+++ b/packages/studio-server/src/preview-server/routes/add-composition.ts
@@ -47,6 +47,7 @@ export const addCompositionHandler: ApiHandler<
const result = await addCompositionToFile({
filePath,
options: request.options,
+ remotionRoot,
});
for (const change of result.changes) {
const currentContents = existsSync(change.filePath)
diff --git a/packages/studio-server/src/preview-server/routes/insert-element.ts b/packages/studio-server/src/preview-server/routes/insert-element.ts
index 2c4911facf..53440ecbb3 100644
--- a/packages/studio-server/src/preview-server/routes/insert-element.ts
+++ b/packages/studio-server/src/preview-server/routes/insert-element.ts
@@ -215,6 +215,7 @@ export const insertElementHandler: ApiHandler<
const codemodResult = await addCompositionToFile({
filePath: registrationFilePath,
options: newComposition.options,
+ remotionRoot,
});
const registrationFileNewContents =
codemodResult.changes.find(
diff --git a/packages/studio/src/components/CompositionSelector.tsx b/packages/studio/src/components/CompositionSelector.tsx
index ae14716145..b7bad74f47 100644
--- a/packages/studio/src/components/CompositionSelector.tsx
+++ b/packages/studio/src/components/CompositionSelector.tsx
@@ -26,6 +26,7 @@ import {
import {CompositionSelectorItem} from './CompositionSelectorItem';
import {ContextMenuForTarget} from './ContextMenu';
import {useSelectComposition} from './InitialCompositionLoader';
+import {showNotification} from './Notifications/NotificationCenter';
import {ExplorerQuickSwitcherTrigger} from './QuickSwitcher/ExplorerQuickSwitcherTrigger';
import {moveComposition, moveFolder} from './RenderQueue/actions';
import {getRootCompositionMenuItems} from './root-composition-menu-items';
@@ -343,7 +344,7 @@ export const CompositionSelector: React.FC = () => {
compositionSelectorDragDataToSymbolicatedStack(dragData),
undoRedoNavigation: null,
};
- await (source.type === 'composition'
+ const result = await (source.type === 'composition'
? moveComposition(
{...common, compositionId: source.compositionId},
controller.signal,
@@ -356,7 +357,15 @@ export const CompositionSelector: React.FC = () => {
},
controller.signal,
));
- } catch {}
+ if (!result.success) {
+ showNotification(result.reason, 4000);
+ }
+ } catch (error) {
+ showNotification(
+ error instanceof Error ? error.message : String(error),
+ 4000,
+ );
+ }
},
[stopCompositionListAutoScroll],
);
diff --git a/packages/studio/src/components/CompositionSelectorItem.tsx b/packages/studio/src/components/CompositionSelectorItem.tsx
index 85c9ebe69f..bd8019939f 100644
--- a/packages/studio/src/components/CompositionSelectorItem.tsx
+++ b/packages/studio/src/components/CompositionSelectorItem.tsx
@@ -56,6 +56,7 @@ import {ContextMenu} from './ContextMenu';
import {getFolderMenuItems} from './folder-menu-items';
import {COMPACT_CONTROL_ROW_HEIGHT, Row, Spacing} from './layout';
import type {ComboboxValue} from './NewComposition/ComboBox';
+import {showNotification} from './Notifications/NotificationCenter';
import {moveComposition, moveFolder} from './RenderQueue/actions';
import {SidebarRenderButton} from './SidebarRenderButton';
import {useResolvedStack} from './Timeline/use-resolved-stack';
@@ -621,6 +622,7 @@ export const CompositionSelectorItem: React.FC<{
));
if (!result.success) {
+ showNotification(result.reason, 4000);
return;
}
@@ -631,7 +633,12 @@ export const CompositionSelectorItem: React.FC<{
) {
toggleFolder(item.folderName, item.parentName);
}
- } catch {}
+ } catch (error) {
+ showNotification(
+ error instanceof Error ? error.message : String(error),
+ 4000,
+ );
+ }
},
[item, toggleFolder],
);