🎥 Make videos programmatically with React
Studio: Slugify names when renaming folders
Igor Samokhovets631157032ad1
diff --git a/packages/studio/src/components/NewComposition/NewFolder.tsx b/packages/studio/src/components/NewComposition/NewFolder.tsxindex b595ce3d30..e2d282e553 100644--- a/packages/studio/src/components/NewComposition/NewFolder.tsx+++ b/packages/studio/src/components/NewComposition/NewFolder.tsx@@ -10,6 +10,7 @@ import React, {} from 'react';import {Internals, type _InternalTypes} from 'remotion';import {LIGHT_TEXT} from '../../helpers/colors';+import {slugifyName} from '../../helpers/slugify-name';import {validateNewFolderName} from '../../helpers/validate-new-folder-name';import {Spacing} from '../layout';import {ModalFooterContainer} from '../ModalFooter';@@ -73,13 +74,7 @@ export const NewFolder: React.FC<{[],);- const folderName = Internals.isFolderNameValid(newName)- ? newName- : newName- .normalize('NFD')- .replace(/[\u0300-\u036f]/g, '')- .replace(/[^a-zA-Z0-9\u4E00-\u9FFF-]+/g, '-')- .replace(/^-+|-+$/g, '');+ const folderName = slugifyName(newName);const folderNameErrMessage = folderName? validateNewFolderName({folders, newName: folderName, parentName}): 'Enter a name containing letters or numbers.';diff --git a/packages/studio/src/components/NewComposition/RenameFolder.tsx b/packages/studio/src/components/NewComposition/RenameFolder.tsxindex 0283758ab1..4b1c2f5bcc 100644--- a/packages/studio/src/components/NewComposition/RenameFolder.tsx+++ b/packages/studio/src/components/NewComposition/RenameFolder.tsx@@ -9,7 +9,9 @@ import React, {useState,} from 'react';import {Internals} from 'remotion';+import {LIGHT_TEXT} from '../../helpers/colors';import {getFolderId} from '../../helpers/get-folder-id';+import {slugifyName} from '../../helpers/slugify-name';import {validateFolderRename} from '../../helpers/validate-folder-rename';import {Spacing} from '../layout';import {ModalFooterContainer} from '../ModalFooter';@@ -52,23 +54,26 @@ export const RenameFolder: React.FC<{[],);- const folderNameErrMessage = validateFolderRename({- folders,- newName,- originalName: folderName,- parentName,- });+ const slug = slugifyName(newName);+ const folderNameErrMessage = slug+ ? validateFolderRename({+ folders,+ newName: slug,+ originalName: folderName,+ parentName,+ })+ : 'Enter a name containing letters or numbers.';- const valid = folderNameErrMessage === null && folderName !== newName;+ const valid = folderNameErrMessage === null && folderName !== slug;const codemod: RecastCodemod = useMemo(() => {return {type: 'rename-folder',folderName,parentName,- newName,+ newName: slug,};- }, [folderName, newName, parentName]);+ }, [folderName, slug, parentName]);const onSubmit: React.FormEventHandler<HTMLFormElement> = useCallback((e) => {e.preventDefault();@@ -95,6 +100,17 @@ export const RenameFolder: React.FC<{status="ok"rightAlign/>+ {slug && slug !== newName ? (+ <>+ <Spacing y={1} block />+ <div+ aria-live="polite"+ style={{fontSize: 12, color: LIGHT_TEXT}}+ >+ Will be renamed to {slug}+ </div>+ </>+ ) : null}{folderNameErrMessage ? (<><Spacing y={1} block />diff --git a/packages/studio/src/helpers/slugify-name.ts b/packages/studio/src/helpers/slugify-name.tsnew file mode 100644index 0000000000..678f05d6c4--- /dev/null+++ b/packages/studio/src/helpers/slugify-name.ts@@ -0,0 +1,11 @@+import {Internals} from 'remotion';++export const slugifyName = (name: string): string => {+ return Internals.isFolderNameValid(name)+ ? name+ : name+ .normalize('NFD')+ .replace(/[\u0300-\u036f]/g, '')+ .replace(/[^a-zA-Z0-9\u4E00-\u9FFF-]+/g, '-')+ .replace(/^-+|-+$/g, '');+};