Skip to content

Open source CapCut alternative.

TypeScript

feat(site): rename folders from their titles

David Lec2da13fe7b6c
diff --git a/site/src/cut/components/LibraryView.tsx b/site/src/cut/components/LibraryView.tsx
index c4792c1a..15dd75bf 100644
--- a/site/src/cut/components/LibraryView.tsx
+++ b/site/src/cut/components/LibraryView.tsx
@@ -859,6 +859,17 @@ export function LibraryView() {
selected.has(a.id) ? pick : { ...NO_PICK, items: [a] };
useDeleteKey(rootRef, pickSize > 0 ? () => setDeleting(pick) : null);
const ctx = useSelectionMenu({ picked: selected, setPicked: setSelected, shown: order });
+ const renameFolder = async (id: string, name: string) => {
+ const r = folders.find((f) => f.id === id)?.residency;
+ if (!r || !live(r)) return;
+ patch((d) => ({
+ ...d,
+ folders: d.folders.map((f) =>
+ f.id === id ? { ...f, name } : f,
+ ),
+ }));
+ await updateLibraryFolder(r, id, { name }).catch(() => void reload());
+ };
// What the open right-click menu acts on.
const ctxSet: DeleteSet = ctx.menu
? {
@@ -978,6 +989,7 @@ export function LibraryView() {
<FolderCrumb
root="Library"
trail={trail}
+ onRename={openOwner && live(openOwner) ? renameFolder : undefined}
mime={LIBRARY_MOVE_MIME}
folderMime={LIBRARY_FOLDER_MOVE_MIME}
onGo={gotoFolder}
@@ -1047,17 +1059,7 @@ export function LibraryView() {
const f = await createLibraryFolder(name, newShelf, newParent);
patch((d) => ({ ...d, folders: [...d.folders, f] }));
}}
- onRename={async (id, name) => {
- const r = folders.find((f) => f.id === id)?.residency;
- if (!r || !live(r)) return;
- patch((d) => ({
- ...d,
- folders: d.folders.map((f) =>
- f.id === id ? { ...f, name } : f,
- ),
- }));
- await updateLibraryFolder(r, id, { name }).catch(() => void reload());
- }}
+ onRename={renameFolder}
// A folder in a pick with others takes the pick to the confirm;
// alone, itself.
onDelete={(id) => {
diff --git a/site/src/cut/components/NotesView.tsx b/site/src/cut/components/NotesView.tsx
index e10c47f7..f4ff15b1 100644
--- a/site/src/cut/components/NotesView.tsx
+++ b/site/src/cut/components/NotesView.tsx
@@ -285,6 +285,15 @@ export function NotesView({ library, ref }: Props = {}) {
void saveNoteLabel(id, name).catch(() => reload());
};
+ const renameFolder = async (id: string, name: string) => {
+ const parentId = folders.find((f) => f.id === id)?.parentId ?? null;
+ patchNotes(client, (prev) => ({
+ ...prev,
+ folders: prev.folders.map((f) => (f.id === id ? { ...f, name } : f)),
+ }));
+ await settleFolder(id);
+ await saveNoteFolder(id, { name, parentId }).catch(() => reload());
+ };
/** Delete a label. Every note wearing it — the open draft too — lets it
* go. */
const removeLabel = (id: string) => {
@@ -493,6 +502,7 @@ export function NotesView({ library, ref }: Props = {}) {
<FolderCrumb
root="Notes"
trail={trail}
+ onRename={renameFolder}
mime={NOTES_MOVE_MIME}
folderMime={NOTE_FOLDERS_MOVE_MIME}
onGo={gotoFolder}
@@ -549,15 +559,7 @@ export function NotesView({ library, ref }: Props = {}) {
folderWrites.current.delete(folder.id);
}
}}
- onRename={async (id, name) => {
- const parentId = folders.find((f) => f.id === id)?.parentId ?? null;
- patchNotes(client, (prev) => ({
- ...prev,
- folders: prev.folders.map((f) => (f.id === id ? { ...f, name } : f)),
- }));
- await settleFolder(id);
- await saveNoteFolder(id, { name, parentId }).catch(() => reload());
- }}
+ onRename={renameFolder}
onDelete={async (id) => {
// What the folder held comes up one level, the way the server
// files it.
diff --git a/site/src/cut/components/ProjectsHome.tsx b/site/src/cut/components/ProjectsHome.tsx
index 6883f7c9..6bf2b209 100644
--- a/site/src/cut/components/ProjectsHome.tsx
+++ b/site/src/cut/components/ProjectsHome.tsx
@@ -1043,6 +1043,7 @@ export function ProjectsHome() {
<FolderCrumb
root="Projects"
trail={trail}
+ onRename={folderOwner && live(folderOwner) ? (id, name) => renameFolder(folderOwner, id, name) : undefined}
mime={PROJECT_MIME}
folderMime={PROJECT_FOLDER_MIME}
onGo={gotoFolder}
diff --git a/site/src/cut/components/SidePanel.tsx b/site/src/cut/components/SidePanel.tsx
index a3b3de59..09714e9b 100644
--- a/site/src/cut/components/SidePanel.tsx
+++ b/site/src/cut/components/SidePanel.tsx
@@ -1044,6 +1044,7 @@ function ProjectFilesPanel({
<FolderCrumb
className="text-sm"
root="Project Files"
+ onRename={!readOnly ? (id, name) => useEditor.getState().renameMediaFolder(id, name) : undefined}
trail={[
{ id: openFolder, name: folders.find((f) => f.id === openFolder)?.name ?? "Folder" },
]}
@@ -1830,6 +1831,12 @@ function LibraryPanel({ projectId }: { projectId: string }) {
const all = assets;
const shown = all.filter((a) => folderOf(a) === openFolder);
+ const renameFolder = async (id: string, name: string) => {
+ const r = folders.find((f) => f.id === id)?.residency;
+ if (!r || !reachable(r)) return;
+ patch((d) => ({ ...d, folders: d.folders.map((f) => f.id === id ? { ...f, name } : f) }));
+ await updateLibraryFolder(r, id, { name }).catch(() => void reload());
+ };
const bothShelves = availableResidencies().length > 1;
const shownTemplates = templates.filter((t) => (t.folderId ?? null) === openFolder);
// The shelf at this level: the folders filed here. At the top the Camera
@@ -1955,6 +1962,7 @@ function LibraryPanel({ projectId }: { projectId: string }) {
className="text-sm"
root="Library"
trail={trail}
+ onRename={openFolder !== CAMERA_ROLL_FOLDER ? renameFolder : undefined}
mime={LIBRARY_MOVE_MIME}
folderMime={LIBRARY_FOLDER_MOVE_MIME}
onGo={setOpenFolder}
@@ -1986,15 +1994,7 @@ function LibraryPanel({ projectId }: { projectId: string }) {
renaming={renamingFolder}
onRenamingChange={setRenamingFolder}
onOpen={(id) => setOpenFolder(id)}
- onRename={async (id, name) => {
- const r = folders.find((f) => f.id === id)?.residency;
- if (!r) return;
- patch((d) => ({
- ...d,
- folders: d.folders.map((f) => (f.id === id ? { ...f, name } : f)),
- }));
- await updateLibraryFolder(r, id, { name }).catch(() => void reload());
- }}
+ onRename={renameFolder}
// A folder in a pick with others takes the pick to the
// confirm; alone, itself.
onDelete={(id) => {
diff --git a/site/src/cut/components/desktopFolders.tsx b/site/src/cut/components/desktopFolders.tsx
index 8b90750d..07495a03 100644
--- a/site/src/cut/components/desktopFolders.tsx
+++ b/site/src/cut/components/desktopFolders.tsx
@@ -294,6 +294,42 @@ function CrumbStep({
);
}
+function FolderTitle({ name, onRename }: { name: string; onRename: (name: string) => void | Promise<void> }) {
+ const [draft, setDraft] = useState<string | null>(null);
+ const draftRef = useRef<string | null>(null);
+ const [error, setError] = useState(false);
+ const finish = () => {
+ const value = draftRef.current;
+ draftRef.current = null;
+ setDraft(null);
+ const next = value?.trim();
+ if (!next || next === name) return;
+ void Promise.resolve().then(() => onRename(next)).catch(() => setError(true));
+ };
+ return (
+ <span className="min-w-0">
+ {draft !== null ? (
+ <input
+ autoFocus
+ aria-label="Folder name"
+ className="h-7 w-52 max-w-full rounded-md border border-input bg-transparent px-2 outline-none select-text focus:border-ring"
+ value={draft}
+ onFocus={(e) => e.currentTarget.select()}
+ onChange={(e) => { draftRef.current = e.target.value; setDraft(e.target.value); }}
+ onBlur={finish}
+ onKeyDown={(e) => {
+ if (e.key === "Enter") { e.preventDefault(); finish(); }
+ if (e.key === "Escape") { e.preventDefault(); draftRef.current = null; setDraft(null); }
+ }}
+ />
+ ) : (
+ <button type="button" title="Rename folder" className="max-w-full cursor-text truncate rounded-md px-1 hover:bg-muted" onClick={() => { setError(false); draftRef.current = name; setDraft(name); }}>{name}</button>
+ )}
+ {error && <span role="alert" className="ml-2 text-xs font-normal text-destructive">Could not rename folder.</span>}
+ </span>
+ );
+}
+
/** The breadcrumb shown while a folder is open: the root, then every folder
* on the way down to the open one. Each step above the open folder is a
* button and a drop target, so a selection can be dragged back out to any
@@ -304,6 +340,7 @@ export function FolderCrumb({
mime,
folderMime,
onGo,
+ onRename,
onDrop,
onDropFolders,
className,
@@ -315,6 +352,7 @@ export function FolderCrumb({
/** Set when folders themselves are dragged; steps then take those drops too. */
folderMime?: string;
onGo: (id: string | null) => void;
+ onRename?: (id: string, name: string) => void | Promise<void>;
onDrop: (ids: string[], id: string | null) => void;
onDropFolders?: (ids: string[], id: string | null) => void;
className?: string;
@@ -349,7 +387,7 @@ export function FolderCrumb({
{open && (
<>
<span className="text-muted-foreground/50">/</span>
- <span className="truncate">{open.name}</span>
+ {onRename ? <FolderTitle key={open.id} name={open.name} onRename={(name) => onRename(open.id, name)} /> : <span className="truncate">{open.name}</span>}
</>
)}
</div>