Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

feat: Collapsible folders & nested deletion (#2776)

Oleg Isonenc82215109854
diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
index c6c41a4e69..0bc0f028df 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useEffect } from "react";
+import { type ReactNode, useEffect, useMemo } from "react";
import { useStore } from "@nanostores/react";
import { computed } from "nanostores";
import {
@@ -10,6 +10,9 @@ import {
ToggleGroupButton,
Select,
Tooltip,
+ SelectGroup,
+ SelectLabel,
+ SelectItem,
} from "@webstudio-is/design-system";
import {
AttachmentIcon,
@@ -18,8 +21,11 @@ import {
PageIcon,
PhoneIcon,
} from "@webstudio-is/icons";
-import type { Instance, Page } from "@webstudio-is/sdk";
-import { findTreeInstanceIds } from "@webstudio-is/sdk";
+import type { Folder, Instance, Page } from "@webstudio-is/sdk";
+import {
+ findParentFolderByChildId,
+ findTreeInstanceIds,
+} from "@webstudio-is/sdk";
import { $instances, $pages, $props } from "~/shared/nano-states";
import {
BindingControl,
@@ -36,6 +42,7 @@ import {
useBindingState,
} from "../shared";
import { SelectAsset } from "./select-asset";
+import { createRootFolder } from "@webstudio-is/project-build";
type UrlControlProps = ControlProps<"url">;
@@ -297,29 +304,42 @@ const $sections = computed(
);
const getId = (data: { id: string }) => data.id;
-const getName = (data: { name: string }) => data.name;
const getHash = (data: { hash: string }) => data.hash;
const getInstanceId = (data: { instanceId: string }) => data.instanceId;
const BasePage = ({ prop, onChange }: BaseControlProps) => {
const pages = useStore($pages);
+ const { allPages, pageSelectOptions } = useMemo(() => {
+ const allPages = pages ? [pages.homePage, ...pages.pages] : [];
+ const rootFolder = createRootFolder();
+ const pageSelectOptions = new Map<
+ Folder["id"],
+ { name: Folder["name"]; pages: Array<Page> }
+ >();
+ for (const page of allPages) {
+ const folder =
+ findParentFolderByChildId(page.id, pages?.folders ?? []) ?? rootFolder;
+ let group = pageSelectOptions.get(folder.id);
+ if (group === undefined) {
+ group = { name: folder.name, pages: [] };
+ pageSelectOptions.set(folder.id, group);
+ }
+ group.pages.push(page);
+ }
+ return { pageSelectOptions, allPages };
+ }, [pages]);
- const pageSelectOptions =
- pages === undefined ? [] : [pages.homePage, ...pages.pages];
-
- const pageSelectValue =
+ const selectedPageId =
prop?.type === "page"
- ? pageSelectOptions.find(
- (page) =>
- page.id ===
- (typeof prop.value === "string" ? prop.value : prop.value.pageId)
- )
+ ? typeof prop.value === "string"
+ ? prop.value
+ : prop.value.pageId
: undefined;
const sections = useStore($sections);
- const sectionSelectOptions = pageSelectValue
- ? sections.filter(({ pageId }) => pageId === pageSelectValue.id)
+ const sectionSelectOptions = selectedPageId
+ ? sections.filter(({ pageId }) => pageId === selectedPageId)
: sections;
const sectionInstanceId =
@@ -338,22 +358,35 @@ const BasePage = ({ prop, onChange }: BaseControlProps) => {
<>
<Row>
<Select
- value={pageSelectValue}
- options={pageSelectOptions}
- getLabel={getName}
- getValue={getId}
- onChange={({ id }) => onChange({ type: "page", value: id })}
+ value={selectedPageId}
+ options={allPages.map(getId)}
+ onChange={(id) => onChange({ type: "page", value: id })}
placeholder="Choose page"
fullWidth
- />
+ >
+ {Array.from(pageSelectOptions).map(([folderId, { name, pages }]) => {
+ return (
+ <SelectGroup key={folderId}>
+ <SelectLabel>{name}</SelectLabel>
+ {pages.map((page) => {
+ return (
+ <SelectItem key={page.id} value={page.id}>
+ {page.name}
+ </SelectItem>
+ );
+ })}
+ </SelectGroup>
+ );
+ })}
+ </Select>
</Row>
<Row>
<Select
- key={pageSelectValue?.id}
+ key={selectedPageId}
disabled={sectionSelectOptions.length === 0}
placeholder={
sectionSelectOptions.length === 0
- ? pageSelectValue
+ ? selectedPageId
? "Selected page has no sections"
: "No sections available"
: "Choose section"
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
index 850627af79..95f59dce30 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx
@@ -4,11 +4,15 @@ import { useStore } from "@nanostores/react";
import { useDebouncedCallback } from "use-debounce";
import { useUnmount } from "react-use";
import slugify from "slugify";
-import { Folder, Pages } from "@webstudio-is/sdk";
+import {
+ Folder,
+ Pages,
+ ROOT_FOLDER_ID,
+ findParentFolderByChildId,
+} from "@webstudio-is/sdk";
import {
theme,
Button,
- Box,
Label,
InputErrorsTooltip,
Tooltip,
@@ -18,6 +22,11 @@ import {
rawTheme,
Flex,
Select,
+ Dialog,
+ DialogContent,
+ Text,
+ DialogClose,
+ DialogTitle,
} from "@webstudio-is/design-system";
import {
ChevronDoubleLeftIcon,
@@ -30,14 +39,15 @@ import { $pages } from "~/shared/nano-states";
import { nanoid } from "nanoid";
import { serverSyncStore } from "~/shared/sync";
import { useEffectEvent } from "~/builder/features/ai/hooks/effect-event";
-import { removeByMutable } from "~/shared/array-utils";
import {
- findParentFolderByChildId,
- cleanupChildRefsMutable,
isSlugUsed,
registerFolderChildMutable,
+ deleteFolderWithChildrenMutable,
+ deletePageMutable,
+ filterSelfAndChildren,
} from "./page-utils";
-import { ROOT_FOLDER_ID } from "@webstudio-is/project-build";
+import { Form } from "./form";
+import { updateWebstudioData } from "~/shared/instance-utils";
const Values = Folder.pick({ name: true, slug: true }).extend({
parentFolderId: z.string(),
@@ -130,15 +140,9 @@ const FormFields = ({
return;
}
- // @todo this is a hack to get the scroll area to work needs to be removed
- const TOPBAR_HEIGHT = 40;
- const HEADER_HEIGHT = 40;
- const FOOTER_HEIGHT = 24;
- const SCROLL_AREA_DELTA = TOPBAR_HEIGHT + HEADER_HEIGHT + FOOTER_HEIGHT;
-
return (
- <Grid>
- <ScrollArea css={{ maxHeight: `calc(100vh - ${SCROLL_AREA_DELTA}px)` }}>
+ <Grid css={{ height: "100%" }}>
+ <ScrollArea>
<Grid gap={3} css={{ my: theme.spacing[5], mx: theme.spacing[8] }}>
<Grid gap={1}>
<Label htmlFor={fieldIds.name}>Folder Name</Label>
@@ -165,10 +169,7 @@ const FormFields = ({
<Select
tabIndex={1}
css={{ zIndex: theme.zIndices[1] }}
- options={pages.folders.filter(
- // Prevent selecting yourself as a parent
- ({ id }) => folderId !== id
- )}
+ options={filterSelfAndChildren(folderId, pages.folders)}
getValue={(folder) => folder.id}
getLabel={(folder) => folder.name}
value={pages.folders.find(
@@ -188,7 +189,7 @@ const FormFields = ({
<Flex align="center" css={{ gap: theme.spacing[3] }}>
Slug
<Tooltip
- content={"@todo tooltip content for slug"}
+ content={"Slug will be used as part of the path to the page"}
variant="wrapped"
>
<HelpIcon
@@ -323,17 +324,7 @@ const NewFolderSettingsView = ({
</>
}
/>
- <Box css={{ overflow: "auto" }}>
- <form
- onSubmit={(event) => {
- event.preventDefault();
- onSubmit();
- }}
- >
- {children}
- <input type="submit" hidden />
- </form>
- </Box>
+ <Form onSubmit={onSubmit}>{children}</Form>
</>
);
};
@@ -381,17 +372,6 @@ const updateFolder = (folderId: Folder["id"], values: Partial<Values>) => {
});
};
-const deleteFolder = (folderId: Folder["id"]) => {
- // @todo ask them if they want to delete all pages as well.
- serverSyncStore.createTransaction([$pages], (pages) => {
- if (pages === undefined) {
- return;
- }
- cleanupChildRefsMutable(folderId, pages.folders);
- removeByMutable(pages.folders, (folder) => folder.id === folderId);
- });
-};
-
export const FolderSettings = ({
onClose,
onDelete,
@@ -448,17 +428,29 @@ export const FolderSettings = ({
updateFolder(folderId, unsavedValues);
});
- const hanldeDelete = () => {
- deleteFolder(folderId);
- onDelete();
- };
-
if (folder === undefined) {
return null;
}
+ const handleDelete = () => {
+ updateWebstudioData((data) => {
+ const { pageIds } = deleteFolderWithChildrenMutable(
+ folderId,
+ data.pages.folders
+ );
+ pageIds.forEach((pageId) => {
+ deletePageMutable(pageId, data);
+ });
+ });
+ onDelete();
+ };
+
return (
- <FolderSettingsView onClose={onClose} onDelete={hanldeDelete}>
+ <FolderSettingsView
+ folder={folder}
+ onClose={onClose}
+ onDelete={handleDelete}
+ >
<FormFields
folderId={folderId}
errors={errors}
@@ -473,11 +465,24 @@ const FolderSettingsView = ({
onDelete,
onClose,
children,
+ folder,
}: {
onDelete: () => void;
onClose: () => void;
children: JSX.Element;
+ folder: Folder;
}) => {
+ const [showDeleteConfirmation, setShowDeleteConfirmation] =
+ useState<boolean>(false);
+
+ const hanldeRequestDelete = () => {
+ if (folder.children.length > 0) {
+ setShowDeleteConfirmation(true);
+ return;
+ }
+ onDelete();
+ };
+
return (
<>
<Header
@@ -488,7 +493,7 @@ const FolderSettingsView = ({
<Button
color="ghost"
prefix={<TrashIcon />}
- onClick={onDelete}
+ onClick={hanldeRequestDelete}
aria-label="Delete folder"
tabIndex={2}
/>
@@ -502,20 +507,64 @@ const FolderSettingsView = ({
tabIndex={2}
/>
</Tooltip>
+ {showDeleteConfirmation && (
+ <DeleteConfirmationDialog
+ folder={folder}
+ onClose={() => {
+ setShowDeleteConfirmation(false);
+ }}
+ onConfirm={onDelete}
+ />
+ )}
</>
}
/>
- <Box css={{ overflow: "auto" }}>
- <form
- onSubmit={(event) => {
- event.preventDefault();
- onClose?.();
- }}
- >
- {children}
- <input type="submit" hidden />
- </form>
- </Box>
+ <Form onSubmit={onClose}>{children}</Form>
</>
);
};
+
+type DeleteConfirmationDialogProps = {
+ onClose: () => void;
+ onConfirm: () => void;
+ folder: Folder;
+};
+
+const DeleteConfirmationDialog = ({
+ onClose,
+ onConfirm,
+ folder,
+}: DeleteConfirmationDialogProps) => {
+ return (
+ <Dialog
+ open
+ onOpenChange={(isOpen) => {
+ if (isOpen === false) {
+ onClose();
+ }
+ }}
+ >
+ <DialogContent css={{ zIndex: theme.zIndices[1] }}>
+ <Flex gap="3" direction="column" css={{ padding: theme.spacing[9] }}>
+ <Text>{`Delete folder "${folder.name}" including all of its pages?`}</Text>
+ <Flex direction="rowReverse" gap="2">
+ <DialogClose asChild>
+ <Button
+ color="destructive"
+ onClick={() => {
+ onConfirm();
+ }}
+ >
+ Delete
+ </Button>
+ </DialogClose>
+ <DialogClose asChild>
+ <Button color="ghost">Cancel</Button>
+ </DialogClose>
+ </Flex>
+ </Flex>
+ <DialogTitle>Delete confirmation</DialogTitle>
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/form.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/form.tsx
new file mode 100644
index 0000000000..540863b2f8
--- /dev/null
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/form.tsx
@@ -0,0 +1,20 @@
+export const Form = ({
+ onSubmit,
+ children,
+}: {
+ onSubmit: () => void;
+ children: JSX.Element;
+}) => {
+ return (
+ <form
+ onSubmit={(event) => {
+ event.preventDefault();
+ onSubmit();
+ }}
+ style={{ overflow: "auto" }}
+ >
+ {children}
+ <input type="submit" hidden />
+ </form>
+ );
+};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx
index f465553191..87a356c17d 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.stories.tsx
@@ -5,7 +5,7 @@ import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";
import { Grid, theme } from "@webstudio-is/design-system";
import { $assets, $project } from "~/shared/nano-states";
import { createDefaultPages } from "@webstudio-is/project-build";
-import { isRoot } from "./page-utils";
+import { isRoot } from "@webstudio-is/sdk";
export default {
component: PageSettings,
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
index 4261b19076..4514e33687 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx
@@ -16,8 +16,9 @@ import {
Folder,
getPagePath,
findPageByIdOrPath,
+ ROOT_FOLDER_ID,
+ findParentFolderByChildId,
} from "@webstudio-is/sdk";
-import { ROOT_FOLDER_ID } from "@webstudio-is/project-build";
import {
theme,
Button,
@@ -48,7 +49,6 @@ import {
import { useIds } from "~/shared/form-utils";
import { Header, HeaderSuffixSpacer } from "../../header";
import {
- deleteInstanceMutable,
getInstancesSlice,
insertInstancesSliceCopy,
updateWebstudioData,
@@ -60,12 +60,10 @@ import {
$pages,
$project,
$selectedInstanceSelector,
- $selectedPageId,
$dataSources,
$dataSourceVariables,
} from "~/shared/nano-states";
import { nanoid } from "nanoid";
-import { removeByMutable } from "~/shared/array-utils";
import { serverSyncStore } from "~/shared/sync";
import { SearchPreview } from "./search-preview";
import { ImageControl } from "~/builder/features/seo/image-control";
@@ -79,11 +77,8 @@ import {
parsePathnamePattern,
validatePathnamePattern,
} from "./url-pattern";
-import {
- cleanupChildRefsMutable,
- findParentFolderByChildId,
- registerFolderChildMutable,
-} from "./page-utils";
+import { registerFolderChildMutable, deletePageMutable } from "./page-utils";
+import { Form } from "./form";
const fieldDefaultValues = {
name: "Untitled",
@@ -332,15 +327,9 @@ const FormFields = ({
.replace(/\/+/g, "/");
const pageUrl = `https://${pageDomainAndPath}`;
- // @todo this is a hack to get the scroll area to work needs to be removed
- const TOPBAR_HEIGHT = 40;
- const HEADER_HEIGHT = 40;
- const FOOTER_HEIGHT = 24;
- const SCROLL_AREA_DELTA = TOPBAR_HEIGHT + HEADER_HEIGHT + FOOTER_HEIGHT;
-
return (
- <Grid>
- <ScrollArea css={{ maxHeight: `calc(100vh - ${SCROLL_AREA_DELTA}px)` }}>
+ <Grid css={{ height: "100%" }}>
+ <ScrollArea>
{/**
* ----------------------========<<<Page props>>>>========----------------------
*/}
@@ -781,17 +770,7 @@ const NewPageSettingsView = ({
</>
}
/>
- <Box css={{ overflow: "auto" }}>
- <form
- onSubmit={(event) => {
- event.preventDefault();
- onSubmit();
- }}
- >
- {children}
- <input type="submit" hidden />
- </form>
- </Box>
+ <Form onSubmit={onSubmit}>{children}</Form>
</>
);
};
@@ -913,28 +892,6 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {
);
};
-const deletePage = (pageId: Page["id"]) => {
- const pages = $pages.get();
- if (pages === undefined) {
- return;
- }
- // deselect page before deleting to avoid flash of content
- if ($selectedPageId.get() === pageId) {
- $selectedPageId.set(pages.homePage.id);
- $selectedInstanceSelector.set(undefined);
- }
- const rootInstanceId = findPageByIdOrPath(pageId, pages)?.rootInstanceId;
- if (rootInstanceId === undefined) {
- return;
- }
- updateWebstudioData((data) => {
- deleteInstanceMutable(data, [rootInstanceId]);
- const { pages } = data;
- removeByMutable(pages.pages, (page) => page.id === pageId);
- cleanupChildRefsMutable(pageId, pages.folders);
- });
-};
-
const duplicatePage = (pageId: Page["id"]) => {
const pages = $pages.get();
if (pages === undefined) {
@@ -1042,8 +999,10 @@ export const PageSettings = ({
});
const hanldeDelete = () => {
- deletePage(pageId);
- onDelete();
+ updateWebstudioData((data) => {
+ deletePageMutable(pageId, data);
+ onDelete();
+ });
};
if (page === undefined) {
@@ -1120,17 +1079,7 @@ const PageSettingsView = ({
</>
}
/>
- <Box css={{ overflow: "auto" }}>
- <form
- onSubmit={(event) => {
- event.preventDefault();
- onClose?.();
- }}
- >
- {children}
- <input type="submit" hidden />
- </form>
- </Box>
+ <Form onSubmit={onClose}>{children}</Form>
</>
);
};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
index c270795bc2..c451a3ad2c 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts
@@ -1,14 +1,16 @@
import { describe, expect, test } from "@jest/globals";
import {
cleanupChildRefsMutable,
- findParentFolderByChildId,
- isRoot,
+ deleteFolderWithChildrenMutable,
+ getAllChildrenAndSelf,
isSlugUsed,
registerFolderChildMutable,
reparentOrphansMutable,
toTreeData,
+ filterSelfAndChildren,
} from "./page-utils";
import { createDefaultPages } from "@webstudio-is/project-build";
+import { isRoot, type Folder } from "@webstudio-is/sdk";
describe("toTreeData", () => {
test("initial pages always has home pages and a root folder", () => {
@@ -262,39 +264,6 @@ describe("cleanupChildRefsMutable", () => {
});
});
-describe("findParentFolderByChildId", () => {
- const pages = createDefaultPages({
- rootInstanceId: "rootInstanceId",
- homePageId: "homePageId",
- });
- pages.folders.push({
- id: "folderId",
- name: "Folder 1",
- slug: "folder",
- children: ["folderId1"],
- });
- const rootFolder = pages.folders.find(isRoot);
- rootFolder?.children.push("folderId");
- pages.folders.push({
- id: "folderId1",
- name: "Folder 2",
- slug: "folder",
- children: [],
- });
- pages.folders.push({
- id: "folderId2",
- name: "Folder 3",
- slug: "folder",
- children: [],
- });
-
- test("find in root folder", () => {
- expect(findParentFolderByChildId("folderId", pages.folders)).toEqual(
- rootFolder
- );
- });
-});
-
describe("isSlugUsed", () => {
const { folders } = createDefaultPages({
rootInstanceId: "rootInstanceId",
@@ -395,3 +364,100 @@ describe("registerFolderChildMutable", () => {
expect(folder.children).toEqual(["folderId2"]);
});
});
+
+describe("getAllChildrenAndSelf", () => {
+ const folders: Array<Folder> = [
+ {
+ id: "1",
+ name: "1",
+ slug: "1",
+ children: ["2"],
+ },
+ {
+ id: "2",
+ name: "2",
+ slug: "2",
+ children: ["3", "page1"],
+ },
+ {
+ id: "3",
+ name: "3",
+ slug: "3",
+ children: ["page2"],
+ },
+ ];
+
+ test("get nested folders", () => {
+ const result = getAllChildrenAndSelf("1", folders, "folder");
+ expect(result).toEqual(["1", "2", "3"]);
+ });
+
+ test("get nested pages", () => {
+ const result = getAllChildrenAndSelf("1", folders, "page");
+ expect(result).toEqual(["page2", "page1"]);
+ });
+});
+
+describe("deleteFolderWithChildrenMutable", () => {
+ const folders = (): Array<Folder> => [
+ {
+ id: "1",
+ name: "1",
+ slug: "1",
+ children: ["2"],
+ },
+ {
+ id: "2",
+ name: "2",
+ slug: "2",
+ children: ["3", "page1"],
+ },
+ {
+ id: "3",
+ name: "3",
+ slug: "3",
+ children: [],
+ },
+ ];
+
+ test("delete empty folder", () => {
+ const result = deleteFolderWithChildrenMutable("3", folders());
+ expect(result).toEqual({ folderIds: ["3"], pageIds: [] });
+ });
+
+ test("delete folder with folders and pages", () => {
+ const result = deleteFolderWithChildrenMutable("1", folders());
+ expect(result).toEqual({
+ folderIds: ["1", "2", "3"],
+ pageIds: ["page1"],
+ });
+ });
+});
+
+describe("filterSelfAndChildren", () => {
+ const folders = [
+ {
+ id: "1",
+ name: "1",
+ slug: "1",
+ children: ["2"],
+ },
+ {
+ id: "2",
+ name: "2",
+ slug: "2",
+ children: ["page1"],
+ },
+ {
+ id: "3",
+ name: "3",
+ slug: "3",
+ children: [],
+ },
+ ];
+
+ test("filter self and child folders", () => {
+ const result = filterSelfAndChildren("1", folders);
+ expect(result).toEqual([folders[2]]);
+ });
+});
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
index 1856e1b7e0..34a7ab7a5b 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts
@@ -1,5 +1,19 @@
-import { ROOT_FOLDER_ID, createRootFolder } from "@webstudio-is/project-build";
-import { type Page, Pages, type Folder } from "@webstudio-is/sdk";
+import { createRootFolder } from "@webstudio-is/project-build";
+import {
+ type Page,
+ Pages,
+ type Folder,
+ findPageByIdOrPath,
+ ROOT_FOLDER_ID,
+ isRoot,
+ type WebstudioData,
+} from "@webstudio-is/sdk";
+import { removeByMutable } from "~/shared/array-utils";
+import { deleteInstanceMutable } from "~/shared/instance-utils";
+import {
+ $selectedInstanceSelector,
+ $selectedPageId,
+} from "~/shared/nano-states";
type TreePage = {
type: "page";
@@ -76,20 +90,6 @@ export const toTreeData = (
};
};
-/**
- * Find a folder that has has that id in the children.
- */
-export const findParentFolderByChildId = (
- id: Folder["id"] | Page["id"],
- folders: Array<Folder>
-): Folder | undefined => {
- for (const folder of folders) {
- if (folder.children.includes(id)) {
- return folder;
- }
- }
-};
-
/**
* When page or folder needs to be deleted or moved to a different parent,
* we want to cleanup any existing reference to it in current folder.
@@ -142,11 +142,6 @@ export const reparentOrphansMutable = (pages: Pages) => {
}
};
-/**
- * Returns true if folder is the root folder.
- */
-export const isRoot = (folder: Folder) => folder.id === ROOT_FOLDER_ID;
-
/**
* Returns true if folder's slug is unique within it's future parent folder.
* Needed to verify if the folder can be nested under the parent folder without modifying slug.
@@ -190,3 +185,79 @@ export const registerFolderChildMutable = (
cleanupChildRefsMutable(id, folders);
parentFolder?.children.push(id);
};
+
+/**
+ * Get all child folder ids of the current folder including itself.
+ */
+export const getAllChildrenAndSelf = (
+ id: Folder["id"] | Page["id"],
+ folders: Array<Folder>,
+ filter: "folder" | "page"
+) => {
+ const child = folders.find((folder) => folder.id === id);
+ const children: Array<Folder["id"]> = [];
+ const type = child === undefined ? "page" : "folder";
+
+ if (type === filter) {
+ children.push(id);
+ }
+
+ if (child) {
+ for (const childId of child.children) {
+ children.push(...getAllChildrenAndSelf(childId, folders, filter));
+ }
+ }
+ return children;
+};
+
+/**
+ * Deletes a page.
+ */
+export const deletePageMutable = (pageId: Page["id"], data: WebstudioData) => {
+ const { pages } = data;
+ // deselect page before deleting to avoid flash of content
+ if ($selectedPageId.get() === pageId) {
+ $selectedPageId.set(pages.homePage.id);
+ $selectedInstanceSelector.set(undefined);
+ }
+ const rootInstanceId = findPageByIdOrPath(pageId, pages)?.rootInstanceId;
+ if (rootInstanceId !== undefined) {
+ deleteInstanceMutable(data, [rootInstanceId]);
+ }
+ removeByMutable(pages.pages, (page) => page.id === pageId);
+ cleanupChildRefsMutable(pageId, pages.folders);
+};
+
+/**
+ * Deletes folder and child folders.
+ * Doesn't delete pages, only returns pageIds.
+ */
+export const deleteFolderWithChildrenMutable = (
+ folderId: Folder["id"],
+ folders: Array<Folder>
+) => {
+ const folderIds = getAllChildrenAndSelf(folderId, folders, "folder");
+ const pageIds = getAllChildrenAndSelf(folderId, folders, "page");
+ for (const folderId of folderIds) {
+ cleanupChildRefsMutable(folderId, folders);
+ removeByMutable(folders, (folder) => folder.id === folderId);
+ }
+
+ return {
+ folderIds,
+ pageIds,
+ };
+};
+
+/**
+ * Filter out folders that are children of the current folder or the current folder itself.
+ */
+export const filterSelfAndChildren = (
+ folderId: Folder["id"],
+ folders: Array<Folder>
+) => {
+ const folderIds = getAllChildrenAndSelf(folderId, folders, "folder");
+ return folders.filter((folder) => {
+ return folderIds.includes(folder.id) === false;
+ });
+};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
index 00bd51a8f4..324a9ec34d 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
@@ -29,6 +29,7 @@ import { NewPageSettings, PageSettings } from "./page-settings";
import { $pages, $selectedPageId } from "~/shared/nano-states";
import { switchPage } from "~/shared/pages";
import {
+ getAllChildrenAndSelf,
reparentOrphansMutable,
toTreeData,
type TreeData,
@@ -41,6 +42,8 @@ import {
import { isFeatureEnabled } from "@webstudio-is/feature-flags";
import { serverSyncStore } from "~/shared/sync";
import { useMount } from "~/shared/hook-utils/use-mount";
+import type { Folder } from "@webstudio-is/sdk";
+import { atom } from "nanostores";
type TabContentProps = {
onSetActiveTab: (tabName: TabName) => void;
@@ -64,15 +67,24 @@ const ItemSuffix = ({
itemId,
editingItemId,
onEdit,
+ type,
}: {
isParentSelected: boolean;
itemId: string;
editingItemId: string | undefined;
onEdit: (itemId: string | undefined) => void;
+ type: "folder" | "page";
}) => {
const isEditing = editingItemId === itemId;
- const menuLabel = isEditing ? "Close page settings" : "Open page settings";
+ const menuLabel =
+ type === "page"
+ ? isEditing
+ ? "Close page settings"
+ : "Open page settings"
+ : isEditing
+ ? "Close folder settings"
+ : "Open folder settings";
const buttonRef = useRef<HTMLButtonElement | null>(null);
@@ -119,6 +131,13 @@ const useReparentOrphans = () => {
});
};
+const isFolder = (id: string, folders: Array<Folder>) => {
+ return id === newFolderId || folders.some((folder) => folder.id === id);
+};
+
+// We want to keep the state when panel is closed and opened again.
+const $collapsedItems = atom<Set<string>>(new Set());
+
const PagesPanel = ({
onClose,
onCreateNewFolder,
@@ -138,8 +157,8 @@ const PagesPanel = ({
}) => {
const pages = useStore($pages);
const treeData = useMemo(() => pages && toTreeData(pages), [pages]);
+ const collapsedItems = useStore($collapsedItems);
useReparentOrphans();
-
const renderItem = useCallback(
(props: TreeItemRenderProps<TreeData>) => {
if (props.itemData.id === "root") {
@@ -153,6 +172,7 @@ const PagesPanel = ({
{...props}
suffix={
<ItemSuffix
+ type={props.itemData.type}
isParentSelected={props.isSelected ?? false}
itemId={props.itemData.id}
editingItemId={editingItemId}
@@ -179,8 +199,24 @@ const PagesPanel = ({
);
const selectTreeNode = useCallback(
- ([pageId]: ItemSelector) => onSelect(pageId),
- [onSelect]
+ ([itemId]: ItemSelector, all?: boolean) => {
+ const folders = pages?.folders ?? [];
+ if (isFolder(itemId, folders)) {
+ const items = all
+ ? getAllChildrenAndSelf(itemId, folders, "folder")
+ : [itemId];
+ const nextCollapsedItems = new Set(collapsedItems);
+ items.forEach((itemId) => {
+ collapsedItems.has(itemId)
+ ? nextCollapsedItems.delete(itemId)
+ : nextCollapsedItems.add(itemId);
+ });
+ $collapsedItems.set(nextCollapsedItems);
+ return;
+ }
+ onSelect(itemId);
+ },
+ [onSelect, pages?.folders, collapsedItems]
);
if (treeData === undefined || pages === undefined) {
@@ -232,7 +268,7 @@ const PagesPanel = ({
itemData={treeData.root}
renderItem={renderItem}
getItemChildren={([nodeId]) => {
- // It's the root.
+ // It's the root folder.
if (
nodeId === treeData.root.id &&
treeData.root.type === "folder"
@@ -243,10 +279,28 @@ const PagesPanel = ({
if (item?.type === "folder") {
return item.children;
}
+ // Page can't have children.
return [];
}}
isItemHidden={([itemId]) => itemId === treeData.root.id}
- getIsExpanded={() => true}
+ getIsExpanded={([itemId]) => {
+ return collapsedItems.has(itemId) === false;
+ }}
+ setIsExpanded={([itemId], value, all) => {
+ const nextCollapsedItems = new Set(collapsedItems);
+ if (itemId === undefined) {
+ return;
+ }
+ const items = all
+ ? getAllChildrenAndSelf(itemId, pages.folders, "folder")
+ : [itemId];
+ items.forEach((itemId) => {
+ value
+ ? nextCollapsedItems.delete(itemId)
+ : nextCollapsedItems.add(itemId);
+ });
+ $collapsedItems.set(nextCollapsedItems);
+ }}
/>
</Box>
</Flex>
@@ -331,12 +385,9 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
const [editingItemId, setEditingItemId] = useState<string>();
const pages = useStore($pages);
- if (currentPageId === undefined) {
+ if (currentPageId === undefined || pages === undefined) {
return null;
}
- const isEditingFolder =
- editingItemId === newFolderId ||
- pages?.folders.some((folder) => folder.id === editingItemId);
return (
<>
@@ -350,8 +401,11 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
onCreateNewPage={() =>
setEditingItemId(editingItemId === newPageId ? undefined : newPageId)
}
- onSelect={(pageId) => {
- switchPage(pageId);
+ onSelect={(itemId) => {
+ if (isFolder(itemId, pages.folders)) {
+ return;
+ }
+ switchPage(itemId);
onSetActiveTab("none");
}}
selectedPageId={currentPageId}
@@ -361,7 +415,7 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
{editingItemId && (
<SettingsPanel isOpen>
- {isEditingFolder ? (
+ {isFolder(editingItemId, pages.folders) ? (
<FolderEditor
editingFolderId={editingItemId}
setEditingFolderId={setEditingItemId}
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings-panel.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings-panel.tsx
index 93120a5ade..f732938679 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings-panel.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings-panel.tsx
@@ -2,7 +2,7 @@ import {
styled,
keyframes,
Collapsible,
- Box,
+ Flex,
} from "@webstudio-is/design-system";
import { theme } from "@webstudio-is/design-system";
@@ -61,17 +61,19 @@ export const SettingsPanel = ({
return (
<CollapsibleRoot open={isOpen}>
<CollapsibleContent>
- <Box
+ <Flex
+ direction="column"
+ grow
css={{
- flexGrow: 1,
+ position: "relative",
+ height: "100%",
width: theme.spacing[35],
background: theme.colors.backgroundPanel,
borderRight: `1px solid ${theme.colors.slate7}`,
- position: "relative",
}}
>
{children}
- </Box>
+ </Flex>
</CollapsibleContent>
</CollapsibleRoot>
);
diff --git a/packages/design-system/src/components/dialog.tsx b/packages/design-system/src/components/dialog.tsx
index c1c6cf3ad0..40bd97c593 100644
--- a/packages/design-system/src/components/dialog.tsx
+++ b/packages/design-system/src/components/dialog.tsx
@@ -36,7 +36,11 @@ export const DialogContent = forwardRef(
) => {
return (
<Primitive.Portal>
- <Primitive.Overlay className={overlayStyle({ css: overlayCss })} />
+ <Primitive.Overlay
+ className={overlayStyle({
+ css: { zIndex: css?.zIndex, ...overlayCss },
+ })}
+ />
<Primitive.Content
className={contentStyle({ className, css })}
{...props}
diff --git a/packages/design-system/src/components/tree/tree-node.tsx b/packages/design-system/src/components/tree/tree-node.tsx
index ca469e03b5..dae3a366fe 100644
--- a/packages/design-system/src/components/tree/tree-node.tsx
+++ b/packages/design-system/src/components/tree/tree-node.tsx
@@ -5,6 +5,7 @@ import {
useState,
forwardRef,
type ForwardRefRenderFunction,
+ type MouseEvent,
} from "react";
import {
ChevronFilledDownIcon,
@@ -235,7 +236,7 @@ export type TreeItemRenderProps<Data extends { id: string }> = {
dropTargetItemSelector?: ItemSelector;
parentIsSelected?: boolean;
isSelected?: boolean;
- onSelect?: (itemSelector: ItemSelector) => void;
+ onSelect?: (itemSelector: ItemSelector, all?: boolean) => void;
level: number;
isAlwaysExpanded: boolean;
shouldRenderExpandButton: boolean;
@@ -296,7 +297,10 @@ export const TreeItemBody = <Data extends { id: string }>({
return {};
}
return selectionEvent === "click"
- ? { handleClick: () => onSelect(itemSelector) }
+ ? {
+ handleClick: (event: MouseEvent) =>
+ onSelect(itemSelector, event.altKey),
+ }
: { handleFocus: () => onSelect(itemSelector) };
}, [selectionEvent, onSelect, itemSelector]);
diff --git a/packages/project-build/src/shared/pages-utils.ts b/packages/project-build/src/shared/pages-utils.ts
index 79d59cbf5e..2f4bff7c56 100644
--- a/packages/project-build/src/shared/pages-utils.ts
+++ b/packages/project-build/src/shared/pages-utils.ts
@@ -1,8 +1,6 @@
-import type { Pages, Folder } from "@webstudio-is/sdk";
+import { type Pages, type Folder, ROOT_FOLDER_ID } from "@webstudio-is/sdk";
import { nanoid } from "nanoid";
-export const ROOT_FOLDER_ID = "root";
-
export const createRootFolder = (
children: Folder["children"] = []
): Folder => ({
diff --git a/packages/sdk/src/page-utils.ts b/packages/sdk/src/page-utils.ts
index 73863bf651..4cd3979d10 100644
--- a/packages/sdk/src/page-utils.ts
+++ b/packages/sdk/src/page-utils.ts
@@ -1,5 +1,15 @@
import type { Folder, Page, Pages } from "./schema/pages";
+export const ROOT_FOLDER_ID = "root";
+
+/**
+ * Returns true if folder is the root folder.
+ */
+export const isRoot = (folder: Folder) => folder.id === ROOT_FOLDER_ID;
+
+/**
+ * Find a page by id or path.
+ */
export const findPageByIdOrPath = (
idOrPath: string,
pages: Pages
@@ -12,6 +22,20 @@ export const findPageByIdOrPath = (
);
};
+/**
+ * Find a folder that has has that id in the children.
+ */
+export const findParentFolderByChildId = (
+ id: Folder["id"] | Page["id"],
+ folders: Array<Folder>
+): Folder | undefined => {
+ for (const folder of folders) {
+ if (folder.children.includes(id)) {
+ return folder;
+ }
+ }
+};
+
/**
* Get a path from all folder slugs from root to the current folder or page.
*/
diff --git a/packages/sdk/src/page-utilts.test.ts b/packages/sdk/src/page-utilts.test.ts
index 5984918a19..03d7d3e265 100644
--- a/packages/sdk/src/page-utilts.test.ts
+++ b/packages/sdk/src/page-utilts.test.ts
@@ -1,6 +1,10 @@
import { describe, expect, test } from "@jest/globals";
import type { Pages } from "./schema/pages";
-import { findPageByIdOrPath, getPagePath } from "./page-utils";
+import {
+ findPageByIdOrPath,
+ findParentFolderByChildId,
+ getPagePath,
+} from "./page-utils";
const pages = {
meta: {},
@@ -105,3 +109,11 @@ describe("findPageByIdOrPath", () => {
expect(page).toEqual(pages.pages[0]);
});
});
+
+describe("findParentFolderByChildId", () => {
+ test("find in root folder", () => {
+ expect(
+ findParentFolderByChildId("folderId-1-1-1", pages.folders)?.id
+ ).toEqual("folderId-1-1");
+ });
+});