Skip to content

🎥 Make videos programmatically with React

Studio: Expand parent after creating subfolder

Jonny Burger6890f08d2f85
diff --git a/packages/example/e2e/studio.test.mts b/packages/example/e2e/studio.test.mts
index 97b79ca3d0..6b130e51dd 100644
--- a/packages/example/e2e/studio.test.mts
+++ b/packages/example/e2e/studio.test.mts
@@ -1455,6 +1455,7 @@ test.describe('visual mode', () => {
'.__remotion-composition-selector-item[role="button"][title="visual-controls"]',
);
await expect(parentFolder).toBeVisible({timeout: 15_000});
+ await expect(parentFolder).toHaveAttribute('aria-expanded', 'false');
await parentFolder.click({button: 'right'});
await page
.getByRole('button', {name: 'New folder...', exact: true})
@@ -1485,6 +1486,14 @@ test.describe('visual mode', () => {
);
})
.toBe(true);
+
+ await expect(parentFolder).toHaveAttribute('aria-expanded', 'true');
+ const newFolder = page.getByRole('button', {
+ name: newFolderName,
+ exact: true,
+ });
+ await expect(newFolder).toBeVisible();
+ await expect(newFolder).toHaveAttribute('aria-expanded', 'false');
} finally {
fs.writeFileSync(rootFile, originalSource);
}
diff --git a/packages/studio/src/components/NewComposition/NewFolder.tsx b/packages/studio/src/components/NewComposition/NewFolder.tsx
index 1dfb459407..3c7021572c 100644
--- a/packages/studio/src/components/NewComposition/NewFolder.tsx
+++ b/packages/studio/src/components/NewComposition/NewFolder.tsx
@@ -9,8 +9,14 @@ import React, {
useState,
} from 'react';
import {Internals, type _InternalTypes} from 'remotion';
+import {
+ getKeysToExpand,
+ splitParentIntoNameAndParent,
+} from '../../helpers/create-folder-tree';
+import {persistExpandedFolders} from '../../helpers/persist-open-folders';
import {slugifyName} from '../../helpers/slugify-name';
import {validateNewFolderName} from '../../helpers/validate-new-folder-name';
+import {FolderContext} from '../../state/folders';
import {Spacing} from '../layout';
import {ModalFooterContainer} from '../ModalFooter';
import {ModalHeader} from '../ModalHeader';
@@ -61,6 +67,7 @@ export const NewFolder: React.FC<{
readonly stack: string | null;
}> = ({parentName, stack}) => {
const {folders} = useContext(Internals.CompositionManager);
+ const {setCompositionFoldersExpanded} = useContext(FolderContext);
const [newName, setName] = useState(() =>
getUniqueFolderName({folders, parentName}),
);
@@ -96,6 +103,30 @@ export const NewFolder: React.FC<{
const onSubmit: React.FormEventHandler<HTMLFormElement> = useCallback((e) => {
e.preventDefault();
}, []);
+ const onSuccess = useCallback(() => {
+ if (parentName === null) {
+ return;
+ }
+
+ const parentFolder = splitParentIntoNameAndParent(parentName);
+ const parentFolderName = parentFolder.name;
+ if (parentFolderName === null) {
+ return;
+ }
+
+ setCompositionFoldersExpanded((previousState) => {
+ const foldersExpanded = {...previousState};
+ for (const key of getKeysToExpand(
+ parentFolderName,
+ parentFolder.parent,
+ )) {
+ foldersExpanded[key] = true;
+ }
+
+ persistExpandedFolders('compositions', foldersExpanded);
+ return foldersExpanded;
+ });
+ }, [parentName, setCompositionFoldersExpanded]);
return (
<DismissableModal>
@@ -151,7 +182,7 @@ export const NewFolder: React.FC<{
codemod={codemod}
stack={stack}
valid={valid}
- onSuccess={null}
+ onSuccess={onSuccess}
fallbackToRootFile
applyCodemod={({signal, symbolicatedStack}) =>
applyCodemod({