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: Context menus for navigator, canvas and tokens (#5511)

Oleg Isonend91aa5821e25
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index be410fe88e..7f39eecfad 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -79,6 +79,7 @@ import { SyncClient } from "~/shared/sync-client";
import { RemoteDialog } from "./features/help/remote-dialog";
import type { SidebarPanelName } from "./sidebar-left/types";
import { SidebarLeft } from "./sidebar-left/sidebar-left";
+import { useDisableContextMenu } from "./shared/use-disable-context-menu";
registerContainers();
@@ -296,6 +297,7 @@ export const Builder = ({
useToastErrors();
useEffect(subscribeCommands, []);
useEffect(subscribeResources, []);
+ useDisableContextMenu();
useUnmount(() => {
$pages.set(undefined);
diff --git a/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsx b/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsx
index 25562fabe7..755873da00 100644
--- a/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsx
+++ b/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsx
@@ -33,6 +33,7 @@ import {
$commandContent,
$isCommandPanelOpen,
closeCommandPanel,
+ openCommandPanel,
} from "../command-state";
import { useState } from "react";
import { BackButton } from "../shared/back-button";
@@ -302,6 +303,7 @@ const WrapComponentsList = () => {
};
export const showWrapComponentsList = () => {
+ openCommandPanel();
$commandContent.set(<WrapComponentsList />);
};
diff --git a/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsx b/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsx
index 447a6ac615..f09c5e46dc 100644
--- a/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsx
+++ b/apps/builder/app/builder/features/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.tsx
@@ -23,27 +23,6 @@ export const openKeyboardShortcutsDialog = () => {
// Additional shortcuts not in commands system but should be shown
const additionalShortcuts = [
- {
- name: "copy",
- label: "Copy",
- description: "Copy selected instance",
- category: "Navigator",
- defaultHotkeys: ["meta+c", "ctrl+c"],
- },
- {
- name: "cut",
- label: "Cut",
- description: "Cut selected instance",
- category: "Navigator",
- defaultHotkeys: ["meta+x", "ctrl+x"],
- },
- {
- name: "paste",
- label: "Paste",
- description: "Paste copied instance",
- category: "Navigator",
- defaultHotkeys: ["meta+v", "ctrl+v"],
- },
{
name: "expandNavigatorItem",
label: "Expand Navigator item",
diff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsx
index 9aba538b4a..ac2baef479 100644
--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx
+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx
@@ -1,5 +1,4 @@
import { useEffect, useRef } from "react";
-import { nanoid } from "nanoid";
import { atom, computed } from "nanostores";
import { mergeRefs } from "@react-aria/utils";
import { useStore } from "@nanostores/react";
@@ -54,7 +53,7 @@ import {
} from "~/shared/nano-states";
import type { InstanceSelector } from "~/shared/tree-utils";
import { serverSyncStore } from "~/shared/sync";
-import { reparentInstance } from "~/shared/instance-utils";
+import { reparentInstance, toggleInstanceShow } from "~/shared/instance-utils";
import { emitCommand } from "~/builder/shared/commands";
import { useContentEditable } from "~/shared/dom-hooks";
import {
@@ -71,6 +70,7 @@ import {
getInstanceLabel,
InstanceIcon,
} from "~/builder/shared/instance-label";
+import { InstanceContextMenu } from "~/builder/shared/instance-context-menu";
type TreeItemAncestor =
| undefined
@@ -320,24 +320,7 @@ const ShowToggle = ({
return;
}
const toggleShow = () => {
- const newValue = value === false;
- serverSyncStore.createTransaction([$props], (props) => {
- const { propsByInstanceId } = $propsIndex.get();
- const instanceProps = propsByInstanceId.get(instance.id);
- let showProp = instanceProps?.find((prop) => prop.name === showAttribute);
- if (showProp === undefined) {
- showProp = {
- id: nanoid(),
- instanceId: instance.id,
- name: showAttribute,
- type: "boolean",
- value: newValue,
- };
- }
- if (showProp.type === "boolean") {
- props.set(showProp.id, { ...showProp, value: newValue });
- }
- });
+ toggleInstanceShow(instance.id);
};
const EyeIcon = isAnimating ? AnimatedEyeOpenIcon : EyeOpenIcon;
@@ -740,59 +723,61 @@ export const NavigatorTree = () => {
}}
onExpand={(isExpanded) => handleExpand(item, isExpanded, false)}
>
- <TreeNode
- level={level}
- isSelected={selectedKey === key}
- isHighlighted={hoveredKey === key || dropTargetKey === key}
- isExpanded={item.isExpanded}
- isActionVisible={isAnimating}
- onExpand={(isExpanded, all) =>
- handleExpand(item, isExpanded, all)
- }
- nodeProps={{
- style: {
- opacity: item.isHidden ? 0.4 : undefined,
- color: item.isReusable
- ? rawTheme.colors.foregroundReusable
- : undefined,
- },
- }}
- buttonProps={{
- onMouseEnter: () => {
- $hoveredInstanceSelector.set(item.selector);
- $blockChildOutline.set(undefined);
- },
- onMouseLeave: () => $hoveredInstanceSelector.set(undefined),
- onClick: (event) =>
- selectInstanceAndClearSelection(item.selector, event),
- onFocus: (event) =>
- selectInstanceAndClearSelection(item.selector, event),
- onKeyDown: (event) => {
- if (event.key === "Enter") {
- emitCommand("editInstanceText");
- }
- },
- }}
- action={
- <ShowToggle
- instance={item.instance}
- value={show}
- isAnimating={isAnimating}
- />
- }
- >
- <TreeNodeContent
- instance={item.instance}
- isEditing={
- item.selector.join() === editingItemSelector?.join()
+ <InstanceContextMenu>
+ <TreeNode
+ level={level}
+ isSelected={selectedKey === key}
+ isHighlighted={hoveredKey === key || dropTargetKey === key}
+ isExpanded={item.isExpanded}
+ isActionVisible={isAnimating}
+ onExpand={(isExpanded, all) =>
+ handleExpand(item, isExpanded, all)
}
- onIsEditingChange={(isEditing) => {
- $editingItemSelector.set(
- isEditing === true ? item.selector : undefined
- );
+ nodeProps={{
+ style: {
+ opacity: item.isHidden ? 0.4 : undefined,
+ color: item.isReusable
+ ? rawTheme.colors.foregroundReusable
+ : undefined,
+ },
+ }}
+ buttonProps={{
+ onMouseEnter: () => {
+ $hoveredInstanceSelector.set(item.selector);
+ $blockChildOutline.set(undefined);
+ },
+ onMouseLeave: () => $hoveredInstanceSelector.set(undefined),
+ onClick: (event) =>
+ selectInstanceAndClearSelection(item.selector, event),
+ onFocus: (event) =>
+ selectInstanceAndClearSelection(item.selector, event),
+ onKeyDown: (event) => {
+ if (event.key === "Enter") {
+ emitCommand("editInstanceText");
+ }
+ },
}}
- />
- </TreeNode>
+ action={
+ <ShowToggle
+ instance={item.instance}
+ value={show}
+ isAnimating={isAnimating}
+ />
+ }
+ >
+ <TreeNodeContent
+ instance={item.instance}
+ isEditing={
+ item.selector.join() === editingItemSelector?.join()
+ }
+ onIsEditingChange={(isEditing) => {
+ $editingItemSelector.set(
+ isEditing === true ? item.selector : undefined
+ );
+ }}
+ />
+ </TreeNode>
+ </InstanceContextMenu>
</TreeSortableItem>
);
})}
diff --git a/apps/builder/app/builder/features/navigator/navigator.tsx b/apps/builder/app/builder/features/navigator/navigator.tsx
index cc7bbd4e1e..12235820fc 100644
--- a/apps/builder/app/builder/features/navigator/navigator.tsx
+++ b/apps/builder/app/builder/features/navigator/navigator.tsx
@@ -3,6 +3,7 @@ import { CssPreview } from "./css-preview";
import { NavigatorTree } from "./navigator-tree";
import { $isDesignMode } from "~/shared/nano-states";
import { useStore } from "@nanostores/react";
+import { InstanceContextMenu } from "~/builder/shared/instance-context-menu";
export const NavigatorPanel = (_props: { onClose: () => void }) => {
const isDesignMode = useStore($isDesignMode);
@@ -10,11 +11,13 @@ export const NavigatorPanel = (_props: { onClose: () => void }) => {
<>
<PanelTitle>Navigator</PanelTitle>
<Separator />
- <Flex grow direction="column" justify="end">
- <NavigatorTree />
- <Separator />
- {isDesignMode && <CssPreview />}
- </Flex>
+ <InstanceContextMenu>
+ <Flex grow direction="column" justify="end">
+ <NavigatorTree />
+ </Flex>
+ </InstanceContextMenu>
+ <Separator />
+ {isDesignMode && <CssPreview />}
</>
);
};
diff --git a/apps/builder/app/builder/features/pages/confirmation-dialogs.tsx b/apps/builder/app/builder/features/pages/confirmation-dialogs.tsx
new file mode 100644
index 0000000000..7233ee8f63
--- /dev/null
+++ b/apps/builder/app/builder/features/pages/confirmation-dialogs.tsx
@@ -0,0 +1,105 @@
+import {
+ Dialog,
+ DialogContent,
+ DialogTitle,
+ DialogClose,
+ Flex,
+ Text,
+ Button,
+ theme,
+} from "@webstudio-is/design-system";
+import type { Page, Folder } from "@webstudio-is/sdk";
+
+type DeletePageConfirmationDialogProps = {
+ onClose: () => void;
+ onConfirm: () => void;
+ page: Page;
+};
+
+export const DeletePageConfirmationDialog = ({
+ onClose,
+ onConfirm,
+ page,
+}: DeletePageConfirmationDialogProps) => {
+ return (
+ <Dialog
+ open
+ onOpenChange={(isOpen) => {
+ if (isOpen === false) {
+ onClose();
+ }
+ }}
+ >
+ <DialogContent>
+ <DialogTitle>Delete Page</DialogTitle>
+ <Flex gap="3" direction="column" css={{ padding: theme.panel.padding }}>
+ <Text>{`Are you sure you want to delete "${page.name}"?`}</Text>
+ <Text>
+ You can undo it even if you delete the page as long as you don't
+ reload.
+ </Text>
+ <Flex direction="rowReverse" gap="2">
+ <DialogClose>
+ <Button
+ color="destructive"
+ onClick={() => {
+ onConfirm();
+ }}
+ >
+ Delete Page
+ </Button>
+ </DialogClose>
+ <DialogClose>
+ <Button color="ghost">Cancel</Button>
+ </DialogClose>
+ </Flex>
+ </Flex>
+ </DialogContent>
+ </Dialog>
+ );
+};
+
+type DeleteFolderConfirmationDialogProps = {
+ onClose: () => void;
+ onConfirm: () => void;
+ folder: Folder;
+};
+
+export const DeleteFolderConfirmationDialog = ({
+ onClose,
+ onConfirm,
+ folder,
+}: DeleteFolderConfirmationDialogProps) => {
+ return (
+ <Dialog
+ open
+ onOpenChange={(isOpen) => {
+ if (isOpen === false) {
+ onClose();
+ }
+ }}
+ >
+ <DialogContent>
+ <DialogTitle>Delete confirmation</DialogTitle>
+ <Flex gap="3" direction="column" css={{ padding: theme.panel.padding }}>
+ <Text>{`Delete folder "${folder.name}" including all of its pages?`}</Text>
+ <Flex direction="rowReverse" gap="2">
+ <DialogClose>
+ <Button
+ color="destructive"
+ onClick={() => {
+ onConfirm();
+ }}
+ >
+ Delete
+ </Button>
+ </DialogClose>
+ <DialogClose>
+ <Button color="ghost">Cancel</Button>
+ </DialogClose>
+ </Flex>
+ </Flex>
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/apps/builder/app/builder/features/pages/folder-settings.tsx b/apps/builder/app/builder/features/pages/folder-settings.tsx
index 49173ce7f2..4e1918028c 100644
--- a/apps/builder/app/builder/features/pages/folder-settings.tsx
+++ b/apps/builder/app/builder/features/pages/folder-settings.tsx
@@ -1,9 +1,7 @@
import { useStore } from "@nanostores/react";
import {
Button,
- Dialog,
DialogClose,
- DialogContent,
DialogTitle,
Flex,
Grid,
@@ -12,13 +10,12 @@ import {
Label,
DialogTitleActions,
ScrollArea,
- Text,
TitleSuffixSpacer,
Tooltip,
rawTheme,
theme,
} from "@webstudio-is/design-system";
-import { InfoCircleIcon, TrashIcon } from "@webstudio-is/icons";
+import { InfoCircleIcon, TrashIcon, CopyIcon } from "@webstudio-is/icons";
import {
Folder,
Pages,
@@ -26,23 +23,17 @@ import {
findParentFolderByChildId,
} from "@webstudio-is/sdk";
import { nanoid } from "nanoid";
-import { useCallback, useState, type FocusEventHandler, type JSX } from "react";
+import { useCallback, useState, type FocusEventHandler } from "react";
import slugify from "slugify";
import { useDebouncedCallback } from "use-debounce";
import { z } from "zod";
import { useIds } from "~/shared/form-utils";
import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import { useUnmount } from "~/shared/hook-utils/use-mount";
-import { updateWebstudioData } from "~/shared/instance-utils";
import { $pages, $isDesignMode } from "~/shared/nano-states";
import { serverSyncStore } from "~/shared/sync";
import { Form } from "./form";
-import {
- deleteFolderWithChildrenMutable,
- deletePageMutable,
- isSlugAvailable,
- registerFolderChildMutable,
-} from "./page-utils";
+import { isSlugAvailable, registerFolderChildMutable } from "./page-utils";
const Values = Folder.pick({ name: true, slug: true }).extend({
parentFolderId: z.string(),
@@ -206,13 +197,16 @@ const nameToSlug = (name: string) => {
export const newFolderId = "new-folder";
export const NewFolderSettings = ({
- onClose,
+ onClose: _onClose,
onSuccess,
+ onRequestDelete,
}: {
onClose: () => void;
onSuccess: (folderId: Folder["id"]) => void;
+ onRequestDelete?: () => void;
}) => {
const pages = useStore($pages);
+ const isDesignMode = useStore($isDesignMode);
const [values, setValues] = useState<Values>({
...fieldDefaultValues,
@@ -220,6 +214,7 @@ export const NewFolderSettings = ({
});
const errors = validateValues(pages, values);
+
const handleSubmit = () => {
if (Object.keys(errors).length === 0) {
const folderId = nanoid();
@@ -228,54 +223,34 @@ export const NewFolderSettings = ({
}
};
- return (
- <NewFolderSettingsView
- onSubmit={handleSubmit}
- onClose={onClose}
- isSubmitting={false}
- >
- <FormFields
- autoSelect
- errors={errors}
- disabled={false}
- values={values}
- folderId={newFolderId}
- onChange={(value) => {
- setValues((values) => {
- const changes = { [value.field]: value.value };
-
- if (value.field === "name") {
- if (values.slug === nameToSlug(values.name)) {
- changes.slug = nameToSlug(value.value);
- }
- }
- return { ...values, ...changes };
- });
- }}
- />
- </NewFolderSettingsView>
- );
-};
+ const handleRequestDelete = () => {
+ if (onRequestDelete) {
+ onRequestDelete();
+ }
+ };
+
+ const isSubmitting = false;
-const NewFolderSettingsView = ({
- onSubmit,
- isSubmitting,
- children,
-}: {
- onSubmit: () => void;
- isSubmitting: boolean;
- onClose: () => void;
- children: JSX.Element;
-}) => {
return (
<>
<DialogTitle
suffix={
<DialogTitleActions>
+ {isDesignMode && onRequestDelete && (
+ <Tooltip content="Delete folder" side="bottom">
+ <Button
+ color="ghost"
+ prefix={<TrashIcon />}
+ onClick={handleRequestDelete}
+ aria-label="Delete folder"
+ tabIndex={2}
+ />
+ </Tooltip>
+ )}
<TitleSuffixSpacer />
<Button
state={isSubmitting ? "pending" : "auto"}
- onClick={onSubmit}
+ onClick={handleSubmit}
tabIndex={2}
>
{isSubmitting ? "Creating" : "Create folder"}
@@ -286,7 +261,27 @@ const NewFolderSettingsView = ({
>
New Folder Settings
</DialogTitle>
- <Form onSubmit={onSubmit}>{children}</Form>
+ <Form onSubmit={handleSubmit}>
+ <FormFields
+ autoSelect
+ errors={errors}
+ disabled={false}
+ values={values}
+ folderId={newFolderId}
+ onChange={(value) => {
+ setValues((values) => {
+ const changes = { [value.field]: value.value };
+
+ if (value.field === "name") {
+ if (values.slug === nameToSlug(values.name)) {
+ changes.slug = nameToSlug(value.value);
+ }
+ }
+ return { ...values, ...changes };
+ });
+ }}
+ />
+ </Form>
</>
);
};
@@ -336,16 +331,19 @@ const updateFolder = (folderId: Folder["id"], values: Partial<Values>) => {
export const FolderSettings = ({
onClose,
- onDelete,
+ onRequestDelete,
+ onDuplicate,
folderId,
}: {
onClose: () => void;
- onDelete: () => void;
+ onRequestDelete?: () => void;
+ onDuplicate?: (newFolderId: string) => void;
folderId: string;
}) => {
const pages = useStore($pages);
const folder = pages?.folders.find(({ id }) => id === folderId);
const [unsavedValues, setUnsavedValues] = useState<Partial<Values>>({});
+ const isDesignMode = useStore($isDesignMode);
const values: Values = {
...(pages ? toFormValues(folderId, pages.folders) : fieldDefaultValues),
@@ -394,136 +392,59 @@ export const FolderSettings = ({
return null;
}
- const handleDelete = () => {
- updateWebstudioData((data) => {
- const { pageIds } = deleteFolderWithChildrenMutable(
- folderId,
- data.pages.folders
- );
- pageIds.forEach((pageId) => {
- deletePageMutable(pageId, data);
- });
- });
- onDelete();
+ const handleRequestDelete = () => {
+ if (onRequestDelete) {
+ onRequestDelete();
+ }
};
- return (
- <FolderSettingsView
- folder={folder}
- onClose={onClose}
- onDelete={handleDelete}
- >
- <FormFields
- folderId={folderId}
- errors={errors}
- values={values}
- onChange={handleChange}
- />
- </FolderSettingsView>
- );
-};
-
-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;
+ const handleDuplicate = () => {
+ if (onDuplicate) {
+ onDuplicate(folderId);
}
- onDelete();
};
- const isDesignMode = useStore($isDesignMode);
-
return (
<>
<DialogTitle
suffix={
<DialogTitleActions>
- {isDesignMode && (
+ {isDesignMode && onRequestDelete && (
<Tooltip content="Delete folder" side="bottom">
<Button
color="ghost"
prefix={<TrashIcon />}
- onClick={hanldeRequestDelete}
+ onClick={handleRequestDelete}
aria-label="Delete folder"
tabIndex={2}
/>
</Tooltip>
)}
- <DialogClose />
- {showDeleteConfirmation && (
- <DeleteConfirmationDialog
- folder={folder}
- onClose={() => {
- setShowDeleteConfirmation(false);
- }}
- onConfirm={onDelete}
- />
+ {isDesignMode && onDuplicate && (
+ <Tooltip content="Duplicate folder" side="bottom">
+ <Button
+ color="ghost"
+ prefix={<CopyIcon />}
+ onClick={handleDuplicate}
+ aria-label="Duplicate folder"
+ tabIndex={2}
+ />
+ </Tooltip>
)}
+ <DialogClose />
</DialogTitleActions>
}
>
Folder Settings
</DialogTitle>
- <Form onSubmit={onClose}>{children}</Form>
+ <Form onSubmit={onClose}>
+ <FormFields
+ folderId={folderId}
+ errors={errors}
+ values={values}
+ onChange={handleChange}
+ />
+ </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>
- <Flex gap="3" direction="column" css={{ padding: theme.panel.padding }}>
- <Text>{`Delete folder "${folder.name}" including all of its pages?`}</Text>
- <Flex direction="rowReverse" gap="2">
- <DialogClose>
- <Button
- color="destructive"
- onClick={() => {
- onConfirm();
- }}
- >
- Delete
- </Button>
- </DialogClose>
- <DialogClose>
- <Button color="ghost">Cancel</Button>
- </DialogClose>
- </Flex>
- </Flex>
- <DialogTitle>Delete confirmation</DialogTitle>
- </DialogContent>
- </Dialog>
- );
-};
diff --git a/apps/builder/app/builder/features/pages/form.tsx b/apps/builder/app/builder/features/pages/form.tsx
index 40ba115529..ed76ab955b 100644
--- a/apps/builder/app/builder/features/pages/form.tsx
+++ b/apps/builder/app/builder/features/pages/form.tsx
@@ -11,7 +11,12 @@ export const Form = forwardRef<
event.preventDefault();
onSubmit();
}}
- style={{ overflow: "auto" }}
+ style={{
+ overflow: "auto",
+ flexGrow: 1,
+ display: "flex",
+ flexDirection: "column",
+ }}
>
{children}
<input type="submit" hidden />
diff --git a/apps/builder/app/builder/features/pages/page-context-menu.tsx b/apps/builder/app/builder/features/pages/page-context-menu.tsx
new file mode 100644
index 0000000000..ad2dba643f
--- /dev/null
+++ b/apps/builder/app/builder/features/pages/page-context-menu.tsx
@@ -0,0 +1,87 @@
+import { useState, type ReactNode } from "react";
+import {
+ ContextMenu,
+ ContextMenuContent,
+ ContextMenuItem,
+ ContextMenuTrigger,
+} from "@webstudio-is/design-system";
+import { duplicatePage, duplicateFolder } from "./page-utils";
+
+type PageContextMenuProps = {
+ children: ReactNode;
+ onRequestDeletePage: (pageId: string) => void;
+ onRequestDeleteFolder: (folderId: string) => void;
+};
+
+export const PageContextMenu = ({
+ children,
+ onRequestDeletePage,
+ onRequestDeleteFolder,
+}: PageContextMenuProps) => {
+ const [pageId, setPageId] = useState<string | undefined>();
+ const [folderId, setFolderId] = useState<string | undefined>();
+
+ const handleDuplicate = () => {
+ if (pageId) {
+ duplicatePage(pageId);
+ } else if (folderId) {
+ duplicateFolder(folderId);
+ }
+ };
+
+ return (
+ <>
+ <ContextMenu
+ onOpenChange={(open) => {
+ if (!open) {
+ setPageId(undefined);
+ setFolderId(undefined);
+ }
+ }}
+ >
+ <ContextMenuTrigger
+ asChild
+ onPointerDown={(event) => {
+ if (!(event.target instanceof HTMLElement)) {
+ return;
+ }
+ const button =
+ event.target.closest<HTMLElement>("[data-tree-button]");
+ const pageId = button?.getAttribute("data-page-id");
+ const folderId = button?.getAttribute("data-folder-id");
+ if (pageId) {
+ setPageId(pageId);
+ setFolderId(undefined);
+ } else if (folderId) {
+ setFolderId(folderId);
+ setPageId(undefined);
+ }
+ }}
+ >
+ {children}
+ </ContextMenuTrigger>
+ <ContextMenuContent>
+ <ContextMenuItem
+ onSelect={handleDuplicate}
+ disabled={!pageId && !folderId}
+ >
+ Duplicate
+ </ContextMenuItem>
+ <ContextMenuItem
+ onSelect={() => {
+ if (pageId) {
+ onRequestDeletePage(pageId);
+ } else if (folderId) {
+ onRequestDeleteFolder(folderId);
+ }
+ }}
+ destructive
+ disabled={!pageId && !folderId}
+ >
+ Delete
+ </ContextMenuItem>
+ </ContextMenuContent>
+ </ContextMenu>
+ </>
+ );
+};
diff --git a/apps/builder/app/builder/features/pages/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings.tsx
index 98075579c5..eba08ed076 100644
--- a/apps/builder/app/builder/features/pages/page-settings.tsx
+++ b/apps/builder/app/builder/features/pages/page-settings.tsx
@@ -55,9 +55,7 @@ import {
Switch,
TitleSuffixSpacer,
ProBadge,
- Dialog,
DialogClose,
- DialogContent,
DialogTitle,
DialogTitleActions,
} from "@webstudio-is/design-system";
@@ -69,7 +67,6 @@ import {
UploadIcon,
} from "@webstudio-is/icons";
import { useIds } from "~/shared/form-utils";
-import { updateWebstudioData } from "~/shared/instance-utils";
import {
$assets,
$instances,
@@ -103,7 +100,6 @@ import { SearchPreview } from "./search-preview";
import { SocialPreview } from "./social-preview";
import {
registerFolderChildMutable,
- deletePageMutable,
$pageRootScope,
duplicatePage,
isPathAvailable,
@@ -1457,7 +1453,7 @@ export const PageSettings = ({
}: {
onClose: () => void;
onDuplicate: (newPageId: string) => void;
- onDelete: () => void;
+ onDelete?: () => void;
pageId: string;
}) => {
const pages = useStore($pages);
@@ -1467,9 +1463,6 @@ export const PageSettings = ({
const [unsavedValues, setUnsavedValues] = useState<Partial<Values>>({});
- const [showDeleteConfirmation, setShowDeleteConfirmation] =
- useState<boolean>(false);
-
const values: Values = {
...(page ? toFormValues(page, pages, isHomePage) : fieldDefaultValues),
...unsavedValues,
@@ -1526,14 +1519,9 @@ export const PageSettings = ({
});
const handleRequestDelete = () => {
- setShowDeleteConfirmation(true);
- };
-
- const hanldeDelete = () => {
- updateWebstudioData((data) => {
- deletePageMutable(pageId, data);
- });
- onDelete();
+ if (onDelete) {
+ onDelete();
+ }
};
if (page === undefined) {
@@ -1563,71 +1551,10 @@ export const PageSettings = ({
>
<FormFields errors={errors} values={values} onChange={handleChange} />
</PageSettingsView>
- {showDeleteConfirmation && page && (
- <DeleteConfirmationDialog
- page={page}
- onClose={() => {
- setShowDeleteConfirmation(false);
- }}
- onConfirm={() => {
- setShowDeleteConfirmation(false);
- hanldeDelete();
- }}
- />
- )}
</>
);
};
-type DeleteConfirmationDialogProps = {
- onClose: () => void;
- onConfirm: () => void;
- page: Page;
-};
-
-const DeleteConfirmationDialog = ({
- onClose,
- onConfirm,
- page,
-}: DeleteConfirmationDialogProps) => {
- return (
- <Dialog
- open
- onOpenChange={(isOpen) => {
- if (isOpen === false) {
- onClose();
- }
- }}
- >
- <DialogContent>
- <Flex gap="3" direction="column" css={{ padding: theme.panel.padding }}>
- <Text>{`Are you sure you want to delete "${page.name}"?`}</Text>
- <Text>
- You can undo it even if you delete the page as long as you don't
- reload.
- </Text>
- <Flex direction="rowReverse" gap="2">
- <DialogClose>
- <Button
- color="destructive"
- onClick={() => {
- onConfirm();
- }}
- >
- Delete Page
- </Button>
- </DialogClose>
- <DialogClose>
- <Button color="ghost">Cancel</Button>
- </DialogClose>
- </Flex>
- </Flex>
- <DialogTitle>Delete Page</DialogTitle>
- </DialogContent>
- </Dialog>
- );
-};
-
const PageSettingsView = ({
onDelete,
onDuplicate,
diff --git a/apps/builder/app/builder/features/pages/page-utils.test.ts b/apps/builder/app/builder/features/pages/page-utils.test.ts
index cfa0cf541b..1061e45be7 100644
--- a/apps/builder/app/builder/features/pages/page-utils.test.ts
+++ b/apps/builder/app/builder/features/pages/page-utils.test.ts
@@ -1,6 +1,7 @@
import { describe, expect, test } from "vitest";
import { setEnv } from "@webstudio-is/feature-flags";
import { createDefaultPages } from "@webstudio-is/project-build";
+import type { Project } from "@webstudio-is/project";
import {
isRootFolder,
type Folder,
@@ -8,6 +9,7 @@ import {
type Page,
SYSTEM_VARIABLE_ID,
Resource,
+ type WebstudioData,
} from "@webstudio-is/sdk";
import {
cleanupChildRefsMutable,
@@ -19,11 +21,13 @@ import {
$pageRootScope,
isPathAvailable,
reparentPageOrFolderMutable,
+ deletePageMutable,
} from "./page-utils";
import {
$dataSourceVariables,
$dataSources,
$pages,
+ $project,
$resources,
} from "~/shared/nano-states";
import { registerContainers } from "~/shared/sync";
@@ -629,3 +633,332 @@ test("page root scope should provide page system variable value", () => {
]),
});
});
+
+describe("deletePageMutable", () => {
+ test("should delete a page from pages array", async () => {
+ const { pages: pagesData, register, p } = createPages();
+ register([p("page1", "/page1"), p("page2", "/page2")]);
+
+ // Create minimal WebstudioData
+ const data = {
+ pages: pagesData,
+ instances: new Map(),
+ } as unknown as WebstudioData;
+
+ deletePageMutable("page1", data);
+
+ expect(pagesData.pages.find((page) => page.id === "page1")).toBeUndefined();
+ expect(pagesData.pages.find((page) => page.id === "page2")).toBeDefined();
+ });
+
+ test("should delete page instance", async () => {
+ const { pages: pagesData, register, p } = createPages();
+ register([p("page1", "/page1")]);
+
+ const page = pagesData.pages.find((page) => page.id === "page1");
+ const rootInstanceId = page?.rootInstanceId;
+
+ // Create minimal WebstudioData with all required properties
+ const data = {
+ pages: pagesData,
+ instances: new Map([
+ [
+ rootInstanceId!,
+ {
+ id: rootInstanceId,
+ type: "instance",
+ component: "Body",
+ children: [],
+ },
+ ],
+ ]),
+ styleSources: new Map(),
+ styleSourceSelections: new Map(),
+ breakpoints: new Map(),
+ styles: new Map(),
+ props: new Map(),
+ dataSources: new Map(),
+ resources: new Map(),
+ } as unknown as WebstudioData;
+
+ deletePageMutable("page1", data);
+
+ expect(data.instances.has(rootInstanceId!)).toBe(false);
+ });
+
+ test("should remove page from folder children", async () => {
+ const { pages: pagesData, register, p, f } = createPages();
+ register([f("folder1", [p("page1", "/page1")])]);
+
+ const folder = pagesData.folders.find((folder) => folder.id === "folder1");
+ expect(folder?.children).toContain("page1");
+
+ // Create minimal WebstudioData
+ const data = {
+ pages: pagesData,
+ instances: new Map(),
+ } as unknown as WebstudioData;
+
+ deletePageMutable("page1", data);
+
+ expect(folder?.children).not.toContain("page1");
+ });
+});
+
+describe("isFolder", () => {
+ test("should return true for existing folder id", async () => {
+ const { pages: pagesData, register, f } = createPages();
+ register([f("folder1", [])]);
+
+ const { isFolder } = await import("./page-utils");
+ expect(isFolder("folder1", pagesData.folders)).toBe(true);
+ });
+
+ test("should return false for non-existing folder id", async () => {
+ const { pages: pagesData } = createPages();
+
+ const { isFolder } = await import("./page-utils");
+ expect(isFolder("nonexistent", pagesData.folders)).toBe(false);
+ });
+
+ test("should return false for page id", async () => {
+ const { pages: pagesData, register, p } = createPages();
+ register([p("page1", "/page1")]);
+
+ const { isFolder } = await import("./page-utils");
+ expect(isFolder("page1", pagesData.folders)).toBe(false);
+ });
+});
+
+describe("getStoredDropTarget", () => {
+ test("should return drop target with parent id", async () => {
+ const { pages: pagesData, register, f, p } = createPages();
+ register([f("folder1", [p("page1", "/page1")])]);
+ $pages.set(pagesData);
+
+ const { getStoredDropTarget } = await import("./page-utils");
+ // selector order is [item, parent, grandparent, ...]
+ const selector = ["page1", "folder1", ROOT_FOLDER_ID];
+ const dropTarget = { parentLevel: 1, beforeLevel: 1 };
+
+ const result = getStoredDropTarget(selector, dropTarget);
+
+ expect(result).toEqual({
+ parentId: "folder1",
+ beforeId: "folder1",
+ afterId: undefined,
+ indexWithinChildren: 0,
+ });
+ });
+
+ test("should calculate indexWithinChildren based on beforeId", async () => {
+ const { pages: pagesData, register, f, p } = createPages();
+ register([f("folder1", [p("page1", "/page1"), p("page2", "/page2")])]);
+ $pages.set(pagesData);
+
+ const { getStoredDropTarget } = await import("./page-utils");
+ const selector = ["page2", "folder1", ROOT_FOLDER_ID];
+ const dropTarget = { parentLevel: 1, beforeLevel: 0 };
+
+ const result = getStoredDropTarget(selector, dropTarget);
+
+ // beforeLevel: 0 means selector.at(-0-1) = selector.at(-1) = ROOT_FOLDER_ID
+ // But ROOT_FOLDER_ID is not in folder1's children, so indexWithinChildren = 0
+ expect(result?.indexWithinChildren).toBe(0);
+ });
+
+ test("should calculate indexWithinChildren based on afterId", async () => {
+ const { pages: pagesData, register, f, p } = createPages();
+ register([f("folder1", [p("page1", "/page1"), p("page2", "/page2")])]);
+ $pages.set(pagesData);
+
+ const { getStoredDropTarget } = await import("./page-utils");
+ const selector = ["page1", "folder1", ROOT_FOLDER_ID];
+ const dropTarget = { parentLevel: 1, afterLevel: 0 };
+
+ const result = getStoredDropTarget(selector, dropTarget);
+
+ // afterLevel: 0 means selector.at(-0-1) = selector.at(-1) = ROOT_FOLDER_ID
+ // But ROOT_FOLDER_ID is not in folder1's children, so indexWithinChildren = 0
+ expect(result?.indexWithinChildren).toBe(0);
+ });
+
+ test("should return undefined when parent id is undefined", async () => {
+ const { pages: pagesData } = createPages();
+ $pages.set(pagesData);
+
+ const { getStoredDropTarget } = await import("./page-utils");
+ const selector = ["page1"];
+ const dropTarget = { parentLevel: 5 };
+
+ const result = getStoredDropTarget(selector, dropTarget);
+
+ expect(result).toBeUndefined();
+ });
+});
+
+describe("canDrop", () => {
+ test("should allow dropping inside a folder", async () => {
+ const { pages: pagesData, register, f } = createPages();
+ register([f("folder1", [])]);
+
+ const { canDrop } = await import("./page-utils");
+ const dropTarget = {
+ parentId: "folder1",
+ indexWithinChildren: 1,
+ };
+
+ expect(canDrop(dropTarget, pagesData.folders)).toBe(true);
+ });
+
+ test("should forbid dropping on non-folder", async () => {
+ const { pages: pagesData, register, p } = createPages();
+ register([p("page1", "/page1")]);
+
+ const { canDrop } = await import("./page-utils");
+ const dropTarget = {
+ parentId: "page1",
+ indexWithinChildren: 0,
+ };
+
+ expect(canDrop(dropTarget, pagesData.folders)).toBe(false);
+ });
+
+ test("should forbid dropping at index 0 of root folder", async () => {
+ const { pages: pagesData } = createPages();
+
+ const { canDrop } = await import("./page-utils");
+ const dropTarget = {
+ parentId: ROOT_FOLDER_ID,
+ indexWithinChildren: 0,
+ };
+
+ expect(canDrop(dropTarget, pagesData.folders)).toBe(false);
+ });
+
+ test("should allow dropping at index > 0 of root folder", async () => {
+ const { pages: pagesData } = createPages();
+
+ const { canDrop } = await import("./page-utils");
+ const dropTarget = {
+ parentId: ROOT_FOLDER_ID,
+ indexWithinChildren: 1,
+ };
+
+ expect(canDrop(dropTarget, pagesData.folders)).toBe(true);
+ });
+});
+
+describe("duplicateFolder", () => {
+ $project.set({ id: "projectId" } as Project);
+
+ test("should duplicate a folder with deduplicated name", async () => {
+ const { pages: pagesData, register, f } = createPages();
+ register([f("folder1", [])]);
+
+ $pages.set(pagesData);
+ updateCurrentSystem(initialSystem);
+
+ const { duplicateFolder } = await import("./page-utils");
+ const newFolderId = duplicateFolder("folder1");
+
+ expect(newFolderId).toBeDefined();
+ const updatedPages = $pages.get()!;
+ const newFolder = updatedPages.folders.find(
+ (folder) => folder.id === newFolderId
+ );
+ expect(newFolder).toBeDefined();
+ expect(newFolder?.name).toBe("folder1 (1)");
+ expect(newFolder?.slug).toBe("folder1-1");
+ });
+
+ test("should duplicate a folder with pages", async () => {
+ const { pages: pagesData, register, f, p } = createPages();
+ register([f("folder1", [p("page1", "/page1"), p("page2", "/page2")])]);
+
+ $pages.set(pagesData);
+ updateCurrentSystem(initialSystem);
+
+ const { duplicateFolder } = await import("./page-utils");
+ const newFolderId = duplicateFolder("folder1");
+
+ expect(newFolderId).toBeDefined();
+ const updatedPages = $pages.get()!;
+ const newFolder = updatedPages.folders.find(
+ (folder) => folder.id === newFolderId
+ );
+ expect(newFolder).toBeDefined();
+ // Note: Page duplication is handled by insertPageCopyMutable from ~/shared/page-utils
+ // which requires full WebstudioData setup. Here we just verify the folder structure.
+ expect(newFolder?.children.length).toBeGreaterThan(0);
+ });
+
+ test("should duplicate a folder with nested folders", async () => {
+ const { pages: pagesData, register, f, p } = createPages();
+ register([
+ f("folder1", [
+ f("subfolder1", [p("page1", "/page1")]),
+ p("page2", "/page2"),
+ ]),
+ ]);
+
+ $pages.set(pagesData);
+ updateCurrentSystem(initialSystem);
+
+ const { duplicateFolder } = await import("./page-utils");
+ const newFolderId = duplicateFolder("folder1");
+
+ expect(newFolderId).toBeDefined();
+ const updatedPages = $pages.get()!;
+ const newFolder = updatedPages.folders.find(
+ (folder) => folder.id === newFolderId
+ );
+ expect(newFolder).toBeDefined();
+ expect(newFolder?.children.length).toBeGreaterThan(0);
+
+ // Check that subfolder was duplicated
+ const subFolderChild = newFolder?.children.find((childId) =>
+ updatedPages.folders.some((folder) => folder.id === childId)
+ );
+ expect(subFolderChild).toBeDefined();
+ const subFolder = updatedPages.folders.find(
+ (folder) => folder.id === subFolderChild
+ );
+ expect(subFolder).toBeDefined();
+ expect(subFolder?.name).toBe("subfolder1 (1)");
+ });
+
+ test("should deduplicate folder names correctly with existing copies", async () => {
+ const { pages: pagesData, register, f } = createPages();
+ register([f("folder1", "folder1", []), f("folder1 (1)", "folder1-1", [])]);
+
+ $pages.set(pagesData);
+ updateCurrentSystem(initialSystem);
+
+ const { duplicateFolder } = await import("./page-utils");
+ const newFolderId = duplicateFolder("folder1");
+
+ expect(newFolderId).toBeDefined();
+ const updatedPages = $pages.get()!;
+ const newFolder = updatedPages.folders.find(
+ (folder) => folder.id === newFolderId
+ );
+ expect(newFolder?.name).toBe("folder1 (2)");
+ expect(newFolder?.slug).toBe("folder1-2");
+ });
+
+ test("should register duplicated folder in parent folder", async () => {
+ const { pages: pagesData, register, f } = createPages();
+ register([f("folder1", [])]);
+
+ $pages.set(pagesData);
+ updateCurrentSystem(initialSystem);
+
+ const { duplicateFolder } = await import("./page-utils");
+ const newFolderId = duplicateFolder("folder1");
+
+ const updatedPages = $pages.get()!;
+ const rootFolder = updatedPages.folders.find(isRootFolder);
+ expect(rootFolder?.children).toContain(newFolderId);
+ });
+});
diff --git a/apps/builder/app/builder/features/pages/page-utils.ts b/apps/builder/app/builder/features/pages/page-utils.ts
index ee8405568c..6e9515b623 100644
--- a/apps/builder/app/builder/features/pages/page-utils.ts
+++ b/apps/builder/app/builder/features/pages/page-utils.ts
@@ -1,4 +1,5 @@
import { computed } from "nanostores";
+import { nanoid } from "nanoid";
import { createRootFolder } from "@webstudio-is/project-build";
import {
type Page,
@@ -300,3 +301,190 @@ export const duplicatePage = (pageId: Page["id"]) => {
});
return newPageId;
};
+
+const deduplicateName = (usedNames: Set<string>, name: string) => {
+ const { name: baseName = name, copyNumber } =
+ // extract a number from "name (copyNumber)"
+ name.match(/^(?<name>.+) \((?<copyNumber>\d+)\)$/)?.groups ?? {};
+ let nameNumber = Number(copyNumber ?? "0");
+ let newName: string;
+ do {
+ nameNumber += 1;
+ newName = `${baseName} (${nameNumber})`;
+ } while (usedNames.has(newName));
+ return newName;
+};
+
+const deduplicateSlug = (usedSlugs: Set<string>, slug: string) => {
+ // extract a number from "slug-N"
+ const { slug: baseSlug = slug, copyNumber } =
+ slug.match(/^(?<slug>.+)-(?<copyNumber>\d+)$/)?.groups ?? {};
+ let counter = Number(copyNumber ?? "0");
+ let newSlug: string;
+ do {
+ counter += 1;
+ newSlug = baseSlug ? `${baseSlug}-${counter}` : `copy-${counter}`;
+ } while (usedSlugs.has(newSlug));
+ return newSlug;
+};
+
+const insertFolderCopyMutable = ({
+ source,
+ target,
+}: {
+ source: { data: WebstudioData; folderId: Folder["id"] };
+ target: { data: WebstudioData; parentFolderId: Folder["id"] };
+}): Folder["id"] | undefined => {
+ const sourceFolder = source.data.pages.folders.find(
+ (folder) => folder.id === source.folderId
+ );
+ if (sourceFolder === undefined) {
+ return;
+ }
+
+ const parentFolder = target.data.pages.folders.find(
+ (folder) => folder.id === target.parentFolderId
+ );
+ const usedNames = new Set<string>();
+ const usedSlugs = new Set<string>();
+ for (const childId of parentFolder?.children ?? []) {
+ const childFolder = target.data.pages.folders.find(
+ (folder) => folder.id === childId
+ );
+ if (childFolder) {
+ usedNames.add(childFolder.name);
+ usedSlugs.add(childFolder.slug);
+ continue;
+ }
+ const childPage = target.data.pages.pages.find(
+ (page) => page.id === childId
+ );
+ if (childPage) {
+ usedNames.add(childPage.name);
+ }
+ }
+
+ // Create new folder with deduplicated name and slug
+ const newFolderId = nanoid();
+ const newFolder: Folder = {
+ id: newFolderId,
+ name: deduplicateName(usedNames, sourceFolder.name),
+ slug: deduplicateSlug(usedSlugs, sourceFolder.slug),
+ children: [],
+ };
+
+ // Add new folder to the folders array
+ target.data.pages.folders.push(newFolder);
+
+ // Register new folder in parent
+ for (const folder of target.data.pages.folders) {
+ if (folder.id === target.parentFolderId) {
+ folder.children.push(newFolderId);
+ }
+ }
+
+ // Duplicate all children (pages and nested folders)
+ for (const childId of sourceFolder.children) {
+ const childFolder = source.data.pages.folders.find(
+ (folder) => folder.id === childId
+ );
+
+ if (childFolder) {
+ // It's a nested folder - duplicate it recursively
+ insertFolderCopyMutable({
+ source: { data: source.data, folderId: childId },
+ target: { data: target.data, parentFolderId: newFolderId },
+ });
+ } else {
+ // It's a page - duplicate it
+ insertPageCopyMutable({
+ source: { data: source.data, pageId: childId },
+ target: { data: target.data, folderId: newFolderId },
+ });
+ }
+ }
+
+ return newFolderId;
+};
+
+export const duplicateFolder = (folderId: Folder["id"]) => {
+ const pages = $pages.get();
+ const currentFolder = findParentFolderByChildId(
+ folderId,
+ pages?.folders ?? []
+ );
+ if (currentFolder === undefined) {
+ return;
+ }
+ let newFolderId: undefined | string;
+ updateWebstudioData((data) => {
+ newFolderId = insertFolderCopyMutable({
+ source: { data, folderId },
+ target: { data, parentFolderId: currentFolder.id },
+ });
+ });
+ return newFolderId;
+};
+
+export const isFolder = (id: string, folders: Array<Folder>) => {
+ return folders.some((folder) => folder.id === id);
+};
+
+type DropTarget = {
+ parentId: string;
+ beforeId?: string;
+ afterId?: string;
+ indexWithinChildren: number;
+};
+
+type TreeDropTarget = {
+ parentLevel: number;
+ beforeLevel?: number;
+ afterLevel?: number;
+};
+
+export const getStoredDropTarget = (
+ selector: string[],
+ dropTarget: TreeDropTarget
+): undefined | DropTarget => {
+ const parentId = selector.at(-dropTarget.parentLevel - 1);
+ const beforeId =
+ dropTarget.beforeLevel === undefined
+ ? undefined
+ : selector.at(-dropTarget.beforeLevel - 1);
+ const afterId =
+ dropTarget.afterLevel === undefined
+ ? undefined
+ : selector.at(-dropTarget.afterLevel - 1);
+ const pages = $pages.get();
+ const parentFolder = pages?.folders.find((item) => item.id === parentId);
+ let indexWithinChildren = 0;
+ if (parentFolder) {
+ const beforeIndex = parentFolder.children.indexOf(beforeId ?? "");
+ const afterIndex = parentFolder.children.indexOf(afterId ?? "");
+ if (beforeIndex > -1) {
+ indexWithinChildren = beforeIndex;
+ } else if (afterIndex > -1) {
+ indexWithinChildren = afterIndex + 1;
+ }
+ }
+ if (parentId) {
+ return { parentId, beforeId, afterId, indexWithinChildren };
+ }
+};
+
+export const canDrop = (dropTarget: DropTarget, folders: Folder[]) => {
+ // allow dropping only inside folders
+ if (isFolder(dropTarget.parentId, folders) === false) {
+ return false;
+ }
+ // forbid dropping in the beginning of root folder
+ // which is always used by home page
+ if (
+ isRootFolder({ id: dropTarget.parentId }) &&
+ dropTarget.indexWithinChildren === 0
+ ) {
+ return false;
+ }
+ return true;
+};
diff --git a/apps/builder/app/builder/features/pages/pages.tsx b/apps/builder/app/builder/features/pages/pages.tsx
index 89434f846f..436fbed046 100644
--- a/apps/builder/app/builder/features/pages/pages.tsx
+++ b/apps/builder/app/builder/features/pages/pages.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
import { useStore } from "@nanostores/react";
import {
Tooltip,
@@ -27,6 +27,11 @@ import {
DynamicPageIcon,
} from "@webstudio-is/icons";
import { NewPageSettings, PageSettings } from "./page-settings";
+import { PageContextMenu } from "./page-context-menu";
+import {
+ DeletePageConfirmationDialog,
+ DeleteFolderConfirmationDialog,
+} from "./confirmation-dialogs";
import {
$editingPageId,
$isContentMode,
@@ -37,6 +42,12 @@ import {
getAllChildrenAndSelf,
reparentOrphansMutable,
reparentPageOrFolderMutable,
+ deletePageMutable,
+ deleteFolderWithChildrenMutable,
+ duplicateFolder,
+ isFolder,
+ getStoredDropTarget,
+ canDrop,
} from "./page-utils";
import {
FolderSettings,
@@ -50,6 +61,7 @@ import {
ROOT_FOLDER_ID,
type Folder,
type Page,
+ findPageByIdOrPath,
} from "@webstudio-is/sdk";
import { atom, computed } from "nanostores";
import { isPathnamePattern } from "~/builder/shared/url-pattern";
@@ -127,10 +139,6 @@ 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 $expandedItems = atom(new Set<string>());
@@ -165,36 +173,6 @@ type DropTarget = {
const $dropTarget = atom<undefined | DropTarget>();
-const getStoredDropTarget = (
- selector: string[],
- dropTarget: TreeDropTarget
-): undefined | DropTarget => {
- const parentId = selector.at(-dropTarget.parentLevel - 1);
- const beforeId =
- dropTarget.beforeLevel === undefined
- ? undefined
- : selector.at(-dropTarget.beforeLevel - 1);
- const afterId =
- dropTarget.afterLevel === undefined
- ? undefined
- : selector.at(-dropTarget.afterLevel - 1);
- const pages = $pages.get();
- const parentFolder = pages?.folders.find((item) => item.id === parentId);
- let indexWithinChildren = 0;
- if (parentFolder) {
- const beforeIndex = parentFolder.children.indexOf(beforeId ?? "");
- const afterIndex = parentFolder.children.indexOf(afterId ?? "");
- if (beforeIndex > -1) {
- indexWithinChildren = beforeIndex;
- } else if (afterIndex > -1) {
- indexWithinChildren = afterIndex + 1;
- }
- }
- if (parentId) {
- return { parentId, beforeId, afterId, indexWithinChildren };
- }
-};
-
const $flatPagesTree = computed(
[$pages, $expandedItems, $dropTarget],
(pagesData, expandedItems, dropTarget) => {
@@ -276,22 +254,6 @@ const $flatPagesTree = computed(
}
);
-const canDrop = (dropTarget: DropTarget, folders: Folder[]) => {
- // allow dropping only inside folders
- if (isFolder(dropTarget.parentId, folders) === false) {
- return false;
- }
- // forbid dropping in the beginning of root folder
- // which is always used by home page
- if (
- isRootFolder({ id: dropTarget.parentId }) &&
- dropTarget.indexWithinChildren === 0
- ) {
- return false;
- }
- return true;
-};
-
const PagesTree = ({
onSelect,
selectedPageId,
@@ -407,6 +369,14 @@ const PagesTree = ({
onSelect(item.id);
}
},
+ ...(item.type === "page" &&
+ item.id !== pages?.homePage.id && {
+ "data-page-id": item.id,
+ }),
+ ...(item.type === "folder" &&
+ !isRootFolder({ id: item.id }) && {
+ "data-folder-id": item.id,
+ }),
}}
action={
<ItemSuffix
@@ -457,6 +427,8 @@ const PageEditor = ({
onClose: () => void;
}) => {
const currentPage = useStore($selectedPage);
+ const pages = useStore($pages);
+ const [pageIdToDelete, setPageIdToDelete] = useState<string | undefined>();
if (editingPageId === newPageId) {
return (
@@ -470,26 +442,53 @@ const PageEditor = ({
);
}
+ const handleRequestDelete = () => {
+ if (pages) {
+ const page = findPageByIdOrPath(editingPageId, pages);
+ if (page) {
+ setPageIdToDelete(page.id);
+ }
+ }
+ };
+
+ const handleDelete = () => {
+ if (pageIdToDelete) {
+ updateWebstudioData((data) => {
+ deletePageMutable(pageIdToDelete, data);
+ });
+ }
+ onClose();
+ // switch to home page when deleted currently selected page
+ if (editingPageId === currentPage?.id) {
+ if (pages) {
+ selectPage(pages.homePage.id);
+ }
+ }
+ };
+
return (
- <PageSettings
- onClose={onClose}
- onDelete={() => {
- onClose();
- // switch to home page when deleted currently selected page
- if (editingPageId === currentPage?.id) {
- const pages = $pages.get();
- if (pages) {
- selectPage(pages.homePage.id);
- }
- }
- }}
- onDuplicate={(newPageId) => {
- onClose();
- selectPage(newPageId);
- }}
- pageId={editingPageId}
- key={editingPageId}
- />
+ <>
+ <PageSettings
+ onClose={onClose}
+ onDelete={handleRequestDelete}
+ onDuplicate={(newPageId) => {
+ onClose();
+ selectPage(newPageId);
+ }}
+ pageId={editingPageId}
+ key={editingPageId}
+ />
+ {pageIdToDelete && pages && (
+ <DeletePageConfirmationDialog
+ page={findPageByIdOrPath(pageIdToDelete, pages)!}
+ onClose={() => setPageIdToDelete(undefined)}
+ onConfirm={() => {
+ setPageIdToDelete(undefined);
+ handleDelete();
+ }}
+ />
+ )}
+ </>
);
};
@@ -500,6 +499,22 @@ const FolderEditor = ({
editingFolderId: string;
onClose: () => void;
}) => {
+ const pages = useStore($pages);
+ const [folderIdToDelete, setFolderIdToDelete] = useState<
+ string | undefined
+ >();
+
+ const handleRequestDelete = () => {
+ setFolderIdToDelete(editingFolderId);
+ };
+
+ const handleDuplicate = () => {
+ const newFolderId = duplicateFolder(editingFolderId);
+ if (newFolderId) {
+ $editingPageId.set(newFolderId);
+ }
+ };
+
if (editingFolderId === newFolderId) {
return (
<NewFolderSettings
@@ -510,13 +525,43 @@ const FolderEditor = ({
);
}
+ const handleDelete = () => {
+ if (folderIdToDelete) {
+ updateWebstudioData((data) => {
+ const { pageIds } = deleteFolderWithChildrenMutable(
+ folderIdToDelete,
+ data.pages.folders
+ );
+ pageIds.forEach((pageId) => {
+ deletePageMutable(pageId, data);
+ });
+ });
+ }
+ onClose();
+ };
+
+ const folder = pages?.folders.find(({ id }) => id === editingFolderId);
+
return (
- <FolderSettings
- onClose={onClose}
- onDelete={onClose}
- folderId={editingFolderId}
- key={editingFolderId}
- />
+ <>
+ <FolderSettings
+ onClose={onClose}
+ onRequestDelete={handleRequestDelete}
+ onDuplicate={handleDuplicate}
+ folderId={editingFolderId}
+ key={editingFolderId}
+ />
+ {folderIdToDelete && folder && (
+ <DeleteFolderConfirmationDialog
+ folder={folder}
+ onClose={() => setFolderIdToDelete(undefined)}
+ onConfirm={() => {
+ setFolderIdToDelete(undefined);
+ handleDelete();
+ }}
+ />
+ )}
+ </>
);
};
@@ -526,11 +571,47 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {
const pages = useStore($pages);
const isDesignMode = useStore($isDesignMode);
const containerRef = useRef<HTMLDivElement>(null);
+ const [pageIdToDelete, setPageIdToDelete] = useState<string | undefined>();
+ const [folderIdToDelete, setFolderIdToDelete] = useState<
+ string | undefined
+ >();
if (currentPage === undefined || pages === undefined) {
return;
}
+ const handlePageDeleteConfirm = () => {
+ if (pageIdToDelete) {
+ updateWebstudioData((data) => {
+ deletePageMutable(pageIdToDelete, data);
+ });
+ // Close settings if this page was being edited
+ if (editingItemId === pageIdToDelete) {
+ $editingPageId.set(undefined);
+ }
+ }
+ setPageIdToDelete(undefined);
+ };
+
+ const handleDeleteFolderConfirm = () => {
+ if (folderIdToDelete) {
+ updateWebstudioData((data) => {
+ const { pageIds } = deleteFolderWithChildrenMutable(
+ folderIdToDelete,
+ data.pages.folders
+ );
+ pageIds.forEach((pageId) => {
+ deletePageMutable(pageId, data);
+ });
+ });
+ // Close settings if this folder was being edited
+ if (editingItemId === folderIdToDelete) {
+ $editingPageId.set(undefined);
+ }
+ }
+ setFolderIdToDelete(undefined);
+ };
+
return (
<div ref={containerRef} data-floating-panel-container>
<PanelTitle
@@ -571,24 +652,32 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {
</PanelTitle>
<Separator />
- <PagesTree
- selectedPageId={currentPage.id}
- onSelect={(itemId) => {
- selectPage(itemId);
- onClose();
- }}
- editingItemId={editingItemId}
- onEdit={(itemId) => {
- // always select page when edit its settings
- if (itemId && isFolder(itemId, pages.folders) === false) {
- selectPage(itemId);
- }
- $editingPageId.set(itemId);
- }}
- />
+ <PageContextMenu
+ onRequestDeletePage={setPageIdToDelete}
+ onRequestDeleteFolder={setFolderIdToDelete}
+ >
+ <div>
+ <PagesTree
+ selectedPageId={currentPage.id}
+ onSelect={(itemId) => {
+ selectPage(itemId);
+ onClose();
+ }}
+ editingItemId={editingItemId}
+ onEdit={(itemId) => {
+ // always select page when edit its settings
+ if (itemId && isFolder(itemId, pages.folders) === false) {
+ selectPage(itemId);
+ }
+ $editingPageId.set(itemId);
+ }}
+ />
+ </div>
+ </PageContextMenu>
{editingItemId !== undefined && (
<FloatingPanel
content={
+ editingItemId === newFolderId ||
isFolder(editingItemId, pages.folders) ? (
<FolderEditor
editingFolderId={editingItemId}
@@ -613,6 +702,20 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {
<span style={{ display: "none" }} />
</FloatingPanel>
)}
+ {pageIdToDelete && (
+ <DeletePageConfirmationDialog
+ page={findPageByIdOrPath(pageIdToDelete, pages)!}
+ onClose={() => setPageIdToDelete(undefined)}
+ onConfirm={handlePageDeleteConfirm}
+ />
+ )}
+ {folderIdToDelete && (
+ <DeleteFolderConfirmationDialog
+ folder={pages.folders.find(({ id }) => id === folderIdToDelete)!}
+ onClose={() => setFolderIdToDelete(undefined)}
+ onConfirm={handleDeleteFolderConfirm}
+ />
+ )}
</div>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
index 0ffe08314d..1974f459d2 100644
--- a/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/style-source/style-source-control.tsx
@@ -11,7 +11,7 @@ import {
} from "@webstudio-is/design-system";
import { ChevronDownIcon } from "@webstudio-is/icons";
import type { StyleSource } from "@webstudio-is/sdk";
-import { type ReactNode } from "react";
+import { type ReactNode, useState } from "react";
import { useContentEditable } from "~/shared/dom-hooks";
const menuTriggerVisibilityVar = "--ws-style-source-menu-trigger-visibility";
@@ -85,11 +85,13 @@ const MenuTriggerGradient = styled(Box, {
type MenuProps = {
children: ReactNode;
+ open?: boolean;
+ onOpenChange?: (open: boolean) => void;
};
const Menu = (props: MenuProps) => {
return (
- <DropdownMenu modal>
+ <DropdownMenu modal open={props.open} onOpenChange={props.onOpenChange}>
<DropdownMenuTrigger asChild>
<MenuTrigger aria-label="Menu Button">
<MenuTriggerGradient />
@@ -310,6 +312,15 @@ export const StyleSourceControl = ({
onSelect,
}: StyleSourceControlProps) => {
const showMenu = isEditing === false && isDragging === false;
+ const [menuOpen, setMenuOpen] = useState(false);
+
+ const handleContextMenu = (event: React.MouseEvent) => {
+ if (showMenu && disabled === false && isEditing === false) {
+ event.preventDefault();
+ setMenuOpen(true);
+ }
+ };
+
return (
<Tooltip
content={error ? errors[error.type] : ""}
@@ -330,6 +341,7 @@ export const StyleSourceControl = ({
isEditing={isEditing}
tabIndex={-1}
onClick={onSelect}
+ onContextMenu={handleContextMenu}
>
{source === "local" ? (
<Flex justify="center" align="center">
@@ -357,7 +369,11 @@ export const StyleSourceControl = ({
{stateLabel !== undefined && (
<StyleSourceState source={source}>{stateLabel}</StyleSourceState>
)}
- {showMenu && <Menu>{menuItems}</Menu>}
+ {showMenu && (
+ <Menu open={menuOpen} onOpenChange={setMenuOpen}>
+ {menuItems}
+ </Menu>
+ )}
</StyleSourceContainer>
</Tooltip>
);
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/apply-scale.ts b/apps/builder/app/builder/features/workspace/canvas-tools/apply-scale.ts
similarity index 100%
rename from apps/builder/app/builder/features/workspace/canvas-tools/outline/apply-scale.ts
rename to apps/builder/app/builder/features/workspace/canvas-tools/apply-scale.ts
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-instance-context-menu.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-instance-context-menu.tsx
new file mode 100644
index 0000000000..422d5f1789
--- /dev/null
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-instance-context-menu.tsx
@@ -0,0 +1,65 @@
+import { useStore } from "@nanostores/react";
+import { $instanceContextMenu } from "~/shared/nano-states";
+import { useEffect, useRef } from "react";
+import { selectInstance } from "~/shared/awareness";
+import {
+ ContextMenu,
+ ContextMenuTrigger,
+ ContextMenuContent,
+} from "@webstudio-is/design-system";
+import { MenuItems } from "~/builder/shared/instance-context-menu";
+import { $scale, $canvasRect } from "~/builder/shared/nano-states";
+import { applyScale } from "./outline";
+
+export const CanvasInstanceContextMenu = () => {
+ const contextMenu = useStore($instanceContextMenu);
+ const scale = useStore($scale);
+ const canvasRect = useStore($canvasRect);
+ const triggerRef = useRef<HTMLDivElement>(null);
+
+ useEffect(() => {
+ if (contextMenu && triggerRef.current && canvasRect) {
+ selectInstance(contextMenu.instanceSelector);
+
+ // Calculate the scaled and offset position
+ const scaledPosition = applyScale(
+ {
+ left: contextMenu.position.x,
+ top: contextMenu.position.y,
+ width: 0,
+ height: 0,
+ },
+ scale
+ );
+
+ // Trigger context menu by dispatching a contextmenu event with proper coordinates
+ const event = new MouseEvent("contextmenu", {
+ bubbles: true,
+ cancelable: true,
+ view: window,
+ clientX: canvasRect.left + scaledPosition.left,
+ clientY: canvasRect.top + scaledPosition.top,
+ });
+ triggerRef.current.dispatchEvent(event);
+ }
+ }, [contextMenu, canvasRect, scale]);
+
+ const handleOpenChange = (open: boolean) => {
+ if (!open) {
+ $instanceContextMenu.set(undefined);
+ }
+ };
+
+ if (!contextMenu || !canvasRect) {
+ return;
+ }
+
+ return (
+ <ContextMenu onOpenChange={handleOpenChange}>
+ <ContextMenuTrigger ref={triggerRef} style={{ display: "none" }} />
+ <ContextMenuContent>
+ <MenuItems />
+ </ContextMenuContent>
+ </ContextMenu>
+ );
+};
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx
index 8b00691581..0e547a8459 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx
@@ -20,6 +20,7 @@ import { applyScale } from "./outline";
import { $clampingRect, $scale } from "~/builder/shared/nano-states";
import { BlockChildHoveredInstanceOutline } from "./outline/block-instance-outline";
import { TextEditorContextMenu } from "./block-editor-context-menu";
+import { CanvasInstanceContextMenu } from "./canvas-instance-context-menu";
const containerStyle = css({
position: "absolute",
@@ -84,6 +85,7 @@ export const CanvasTools = () => {
<CollaborativeInstanceOutline />
<BlockChildHoveredInstanceOutline />
<TextEditorContextMenu />
+ <CanvasInstanceContextMenu />
</>
)}
</>
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx
index 2790f85079..e1f69b42b8 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/block-instance-outline.tsx
@@ -41,7 +41,7 @@ import { useEffectEvent } from "~/shared/hook-utils/effect-event";
import { getInstancePath } from "~/shared/awareness";
import { insertTemplateAt } from "./block-utils";
import { Outline } from "./outline";
-import { applyScale } from "./apply-scale";
+import { applyScale } from "../apply-scale";
import {
getInstanceLabel,
InstanceIcon,
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx
index 731181a648..f45671af96 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx
@@ -1,7 +1,7 @@
import { useStore } from "@nanostores/react";
import { $collaborativeInstanceRect } from "~/shared/nano-states";
import { Outline } from "./outline";
-import { applyScale } from "./apply-scale";
+import { applyScale } from "../apply-scale";
import { $scale, $clampingRect } from "~/builder/shared/nano-states";
import { $ephemeralStyles } from "~/canvas/stores";
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx
index 8529466fbb..bdacd66bd2 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx
@@ -13,7 +13,7 @@ import { findClosestSlot } from "~/shared/instance-utils";
import { isDescendantOrSelf } from "~/shared/tree-utils";
import { Outline } from "./outline";
import { Label } from "./label";
-import { applyScale } from "./apply-scale";
+import { applyScale } from "../apply-scale";
export const HoveredInstanceOutline = () => {
const instances = useStore($instances);
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts b/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts
index 162cadf721..3e555b516c 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/index.ts
@@ -1,4 +1,4 @@
export { SelectedInstanceOutline } from "./selected-instance-outline";
export { HoveredInstanceOutline } from "./hovered-instance-outline";
export { CollaborativeInstanceOutline } from "./collaborative-instance-outline";
-export { applyScale } from "./apply-scale";
+export { applyScale } from "../apply-scale";
diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx
index 5fd7424781..ce250b02fd 100644
--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx
+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx
@@ -7,7 +7,7 @@ import {
import { $textEditingInstanceSelector } from "~/shared/nano-states";
import { isDescendantOrSelf } from "~/shared/tree-utils";
import { Outline } from "./outline";
-import { applyScale } from "./apply-scale";
+import { applyScale } from "../apply-scale";
import { $clampingRect, $scale } from "~/builder/shared/nano-states";
import { findClosestSlot } from "~/shared/instance-utils";
import { $ephemeralStyles } from "~/canvas/stores";
diff --git a/apps/builder/app/builder/shared/commands.test.tsx b/apps/builder/app/builder/shared/commands.test.tsx
index d36156748b..f141f792ff 100644
--- a/apps/builder/app/builder/shared/commands.test.tsx
+++ b/apps/builder/app/builder/shared/commands.test.tsx
@@ -11,7 +11,7 @@ import {
} from "~/shared/nano-states";
import { registerContainers } from "~/shared/sync";
import { $awareness, selectInstance } from "~/shared/awareness";
-import { deleteSelectedInstance, replaceWith, unwrap } from "./commands";
+import { deleteSelectedInstance, replaceWith } from "./commands";
registerContainers();
@@ -189,59 +189,3 @@ describe("replace with", () => {
);
});
});
-
-describe("unwrap", () => {
- test("unwrap instance", () => {
- $instances.set(
- renderData(
- <$.Body ws:id="body">
- <$.Box ws:id="box">
- <$.Image ws:id="image" />
- <$.Text ws:id="text">text</$.Text>
- </$.Box>
- </$.Body>
- ).instances
- );
- selectInstance(["box", "body"]);
- unwrap();
- expect($instances.get()).toEqual(
- renderData(
- <$.Body ws:id="body">
- <$.Image ws:id="image" />
- <$.Text ws:id="text">text</$.Text>
- </$.Body>
- ).instances
- );
- });
-
- test("avoid unwrapping textual instance", () => {
- const { instances } = renderData(
- <$.Body ws:id="body">
- <$.Text ws:id="text1">text</$.Text>
- <$.Text ws:id="text2">
- <$.Bold ws:id="bold">bold</$.Bold>
- </$.Text>
- </$.Body>
- );
- $instances.set(instances);
- selectInstance(["text1", "body"]);
- unwrap();
- selectInstance(["text2", "body"]);
- unwrap();
- expect($instances.get()).toEqual(instances);
- });
-
- test("avoid unwrapping constrained instances", () => {
- const { instances } = renderData(
- <$.Body ws:id="body">
- <$.List ws:id="list">
- <$.ListItem ws:id="listitem"></$.ListItem>
- </$.List>
- </$.Body>
- );
- $instances.set(instances);
- selectInstance(["list", "body"]);
- unwrap();
- expect($instances.get()).toEqual(instances);
- });
-});
diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.ts
index 8ddccb66cb..4ef98ddc5c 100644
--- a/apps/builder/app/builder/shared/commands.ts
+++ b/apps/builder/app/builder/shared/commands.ts
@@ -27,6 +27,8 @@ import {
insertWebstudioFragmentAt,
insertWebstudioFragmentCopy,
updateWebstudioData,
+ unwrapInstanceMutable,
+ canUnwrapInstance,
} from "~/shared/instance-utils";
import type { InstanceSelector } from "~/shared/tree-utils";
import { serverSyncStore } from "~/shared/sync";
@@ -44,10 +46,7 @@ import { builderApi } from "~/shared/builder-api";
import { getSetting, setSetting } from "./client-settings";
import { findAvailableVariables } from "~/shared/data-variables";
import { atom } from "nanostores";
-import {
- findClosestNonTextualContainer,
- isTreeSatisfyingContentModel,
-} from "~/shared/content-model";
+import { isTreeSatisfyingContentModel } from "~/shared/content-model";
import { generateFragmentFromHtml } from "~/shared/html";
import { generateFragmentFromTailwind } from "~/shared/tailwind/tailwind";
import { denormalizeSrcProps } from "~/shared/copy-paste/asset-upload";
@@ -59,6 +58,12 @@ import { openDeleteUnusedTokensDialog } from "~/builder/shared/style-source-util
import { openDeleteUnusedDataVariablesDialog } from "~/builder/shared/data-variable-utils";
import { openDeleteUnusedCssVariablesDialog } from "~/builder/shared/css-variable-utils";
import { openKeyboardShortcutsDialog } from "~/builder/features/keyboard-shortcuts-dialog";
+import {
+ copyInstance,
+ pasteInstance,
+ cutInstance,
+} from "~/shared/copy-paste/init-copy-paste";
+import { toggleInstanceShow } from "~/shared/instance-utils";
export const $styleSourceInputElement = atom<HTMLInputElement | undefined>();
@@ -204,47 +209,34 @@ export const replaceWith = (component: string, tag?: string) => {
}
};
-export const unwrap = () => {
+const unwrap = () => {
const instancePath = $selectedInstancePath.get();
- // global root or body are selected
- if (instancePath === undefined || instancePath.length === 1) {
+ if (instancePath === undefined || !canUnwrapInstance(instancePath)) {
return;
}
+
const [selectedItem, parentItem] = instancePath;
+
try {
updateWebstudioData((data) => {
- const instanceSelector = findClosestNonTextualContainer({
- metas: $registeredComponentMetas.get(),
- props: data.props,
- instances: data.instances,
- instanceSelector: selectedItem.instanceSelector,
- });
- if (selectedItem.instanceSelector.join() !== instanceSelector.join()) {
- toast.error(`Cannot unwrap textual instance`);
- throw Error("Abort transaction");
- }
- const parentInstance = data.instances.get(parentItem.instance.id);
- const selectedInstance = data.instances.get(selectedItem.instance.id);
- data.instances.delete(selectedItem.instance.id);
- if (parentInstance && selectedInstance) {
- const index = parentInstance.children.findIndex(
- (child) =>
- child.type === "id" && child.value === selectedItem.instance.id
- );
- parentInstance.children.splice(index, 1, ...selectedInstance.children);
- }
- const matches = isTreeSatisfyingContentModel({
+ const result = unwrapInstanceMutable({
instances: data.instances,
props: data.props,
metas: $registeredComponentMetas.get(),
- instanceSelector: parentItem.instanceSelector,
+ selectedItem,
+ parentItem,
});
- if (matches === false) {
- toast.error(`Cannot unwrap instance`);
+
+ if (!result.success) {
+ toast.error(result.error ?? "Cannot unwrap instance");
throw Error("Abort transaction");
}
});
- selectInstance(parentItem.instanceSelector);
+ // After unwrap, select the child that replaced the parent
+ selectInstance([
+ selectedItem.instance.id,
+ ...parentItem.instanceSelector.slice(1),
+ ]);
} catch {
// do nothing
}
@@ -454,6 +446,41 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({
makeBreakpointCommand("selectBreakpoint7", 7),
makeBreakpointCommand("selectBreakpoint8", 8),
makeBreakpointCommand("selectBreakpoint9", 9),
+ {
+ name: "copy",
+ description: "Copy selected instance",
+ category: "Navigator",
+ defaultHotkeys: ["meta+c", "ctrl+c"],
+ disableOnInputLikeControls: true,
+ handler: copyInstance,
+ },
+ {
+ name: "paste",
+ description: "Paste copied instance",
+ category: "Navigator",
+ defaultHotkeys: ["meta+v", "ctrl+v"],
+ disableOnInputLikeControls: true,
+ handler: pasteInstance,
+ },
+ {
+ name: "cut",
+ description: "Cut selected instance",
+ category: "Navigator",
+ defaultHotkeys: ["meta+x", "ctrl+x"],
+ disableOnInputLikeControls: true,
+ handler: cutInstance,
+ },
+ {
+ name: "toggleShow",
+ description: "Toggle instance visibility",
+ category: "Navigator",
+ handler: () => {
+ const instancePath = $selectedInstancePath.get();
+ if (instancePath?.[0]) {
+ toggleInstanceShow(instancePath[0].instance.id);
+ }
+ },
+ },
{
name: "deleteInstanceBuilder",
label: "Delete Instance",
diff --git a/apps/builder/app/builder/shared/instance-context-menu.tsx b/apps/builder/app/builder/shared/instance-context-menu.tsx
new file mode 100644
index 0000000000..14135ee1ff
--- /dev/null
+++ b/apps/builder/app/builder/shared/instance-context-menu.tsx
@@ -0,0 +1,202 @@
+import type { ReactNode } from "react";
+import { useStore } from "@nanostores/react";
+import {
+ ContextMenu,
+ ContextMenuContent,
+ ContextMenuItem,
+ ContextMenuItemRightSlot,
+ ContextMenuSeparator,
+ ContextMenuTrigger,
+ theme,
+ Kbd,
+ Box,
+} from "@webstudio-is/design-system";
+import { showAttribute } from "@webstudio-is/react-sdk";
+import { emitCommand } from "./commands";
+import {
+ $selectedInstancePath,
+ $selectedPage,
+ getInstanceKey,
+} from "~/shared/awareness";
+import { canUnwrapInstance } from "~/shared/instance-utils";
+import { $propValuesByInstanceSelector } from "~/shared/nano-states";
+import { ROOT_INSTANCE_ID } from "@webstudio-is/sdk";
+import type { InstancePath } from "~/shared/awareness";
+
+const getMenuPermissions = (instancePath: InstancePath | undefined) => {
+ const instanceId = instancePath?.[0]?.instance.id;
+ const rootInstanceId = $selectedPage.get()?.rootInstanceId;
+
+ const isRoot = instanceId === ROOT_INSTANCE_ID;
+ const isBody = instanceId === rootInstanceId;
+ const isRootOrBody = isRoot || isBody;
+ const canUnwrap = instancePath ? canUnwrapInstance(instancePath) : false;
+
+ return {
+ canCopy: !isRootOrBody,
+ canPaste: !isRoot,
+ canCut: !isRootOrBody,
+ canDuplicate: !isRootOrBody,
+ canHide: !isRoot,
+ canRename: !isRoot,
+ canWrap: !isRootOrBody,
+ canUnwrap,
+ canDelete: !isRootOrBody,
+ };
+};
+
+export const MenuItems = () => {
+ const instancePath = useStore($selectedInstancePath);
+ const propValues = useStore($propValuesByInstanceSelector);
+
+ const instanceSelector = instancePath?.[0]?.instanceSelector;
+
+ const show = instanceSelector
+ ? Boolean(
+ propValues.get(getInstanceKey(instanceSelector))?.get(showAttribute) ??
+ true
+ )
+ : true;
+
+ const permissions = getMenuPermissions(instancePath);
+
+ return (
+ <Box css={{ width: theme.spacing[28] }}>
+ <ContextMenuItem
+ disabled={!permissions.canCopy}
+ onSelect={() => {
+ emitCommand("copy");
+ }}
+ >
+ Copy
+ <ContextMenuItemRightSlot>
+ <Kbd value={["meta", "c"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ <ContextMenuItem
+ disabled={!permissions.canPaste}
+ onSelect={() => {
+ emitCommand("paste");
+ }}
+ >
+ Paste
+ <ContextMenuItemRightSlot>
+ <Kbd value={["meta", "v"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ <ContextMenuItem
+ disabled={!permissions.canCut}
+ onSelect={() => {
+ emitCommand("cut");
+ }}
+ >
+ Cut
+ <ContextMenuItemRightSlot>
+ <Kbd value={["meta", "x"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ <ContextMenuItem
+ disabled={!permissions.canDuplicate}
+ onSelect={() => {
+ emitCommand("duplicateInstance");
+ }}
+ >
+ Duplicate
+ <ContextMenuItemRightSlot>
+ <Kbd value={["meta", "d"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ <ContextMenuSeparator />
+ <ContextMenuItem
+ disabled={!permissions.canHide}
+ onSelect={() => {
+ emitCommand("toggleShow");
+ }}
+ >
+ {show ? "Hide" : "Show"}
+ </ContextMenuItem>
+ <ContextMenuItem
+ disabled={!permissions.canRename}
+ onSelect={() => {
+ emitCommand("editInstanceLabel");
+ }}
+ >
+ Rename
+ <ContextMenuItemRightSlot>
+ <Kbd value={["meta", "e"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ <ContextMenuItem
+ disabled={!permissions.canWrap}
+ onSelect={() => {
+ emitCommand("wrap");
+ }}
+ >
+ Wrap
+ </ContextMenuItem>
+ <ContextMenuItem
+ disabled={!permissions.canUnwrap}
+ onSelect={() => {
+ emitCommand("unwrap");
+ }}
+ >
+ Unwrap
+ </ContextMenuItem>
+ <ContextMenuSeparator />
+ <ContextMenuItem
+ onSelect={() => {
+ emitCommand("focusStyleSources");
+ }}
+ >
+ Add token
+ <ContextMenuItemRightSlot>
+ <Kbd value={["meta", "enter"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ <ContextMenuItem
+ onSelect={() => {
+ emitCommand("openSettingsPanel");
+ }}
+ >
+ Open settings
+ <ContextMenuItemRightSlot>
+ <Kbd value={["d"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ <ContextMenuSeparator />
+ <ContextMenuItem
+ disabled={!permissions.canDelete}
+ destructive
+ onSelect={() => {
+ emitCommand("deleteInstanceBuilder");
+ }}
+ >
+ Delete
+ <ContextMenuItemRightSlot>
+ <Kbd value={["delete"]} />
+ </ContextMenuItemRightSlot>
+ </ContextMenuItem>
+ </Box>
+ );
+};
+
+export const InstanceContextMenu = ({ children }: { children: ReactNode }) => {
+ return (
+ <ContextMenu>
+ <ContextMenuTrigger
+ asChild
+ onPointerDown={(event) => {
+ if (!(event.target instanceof HTMLElement)) {
+ return;
+ }
+ event.target.closest<HTMLElement>("[data-tree-button]")?.click();
+ }}
+ >
+ {children}
+ </ContextMenuTrigger>
+ <ContextMenuContent>
+ <MenuItems />
+ </ContextMenuContent>
+ </ContextMenu>
+ );
+};
diff --git a/apps/builder/app/builder/shared/use-disable-context-menu.ts b/apps/builder/app/builder/shared/use-disable-context-menu.ts
new file mode 100644
index 0000000000..e22aafeb90
--- /dev/null
+++ b/apps/builder/app/builder/shared/use-disable-context-menu.ts
@@ -0,0 +1,42 @@
+import { useEffect } from "react";
+
+/**
+ * Disables the default browser context menu throughout the application,
+ * except for interactive elements like links, inputs, textareas, etc.
+ *
+ * Users expect to see Webstudio's custom context menu when right-clicking,
+ * not the browser's default menu. This hook prevents confusion by ensuring
+ * only the application's context menu appears, while still allowing the
+ * browser menu for interactive elements where it's useful (e.g., copy/paste
+ * in inputs, open link in new tab).
+ */
+export const useDisableContextMenu = () => {
+ useEffect(() => {
+ const handleContextMenu = (event: MouseEvent) => {
+ const target = event.target as HTMLElement;
+
+ // Allow context menu for interactive elements
+ const interactiveSelectors = [
+ "input",
+ "textarea",
+ "select",
+ "a[href]",
+ '[contenteditable="true"]',
+ "pre",
+ ];
+
+ const isInteractive = interactiveSelectors.some((selector) =>
+ target.closest(selector)
+ );
+
+ if (!isInteractive) {
+ event.preventDefault();
+ }
+ };
+
+ document.addEventListener("contextmenu", handleContextMenu);
+ return () => {
+ document.removeEventListener("contextmenu", handleContextMenu);
+ };
+ }, []);
+};
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index f285328f47..d028f9ec36 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -74,6 +74,7 @@ import { subscribeScrollbarSize } from "./scrollbar-width";
import { compareMedia } from "@webstudio-is/css-engine";
import { builderApi } from "~/shared/builder-api";
import { useDebounceEffect } from "@webstudio-is/design-system";
+import { subscribeInstanceContextMenu } from "./instance-context-menu";
registerContainers();
@@ -302,6 +303,8 @@ export const Canvas = () => {
useEffect(subscribeInterceptedEvents, []);
+ useEffect(subscribeInstanceContextMenu, []);
+
const components = useStore($registeredComponents);
const instances = useStore($instances);
const elements = useElementsTree(components, instances);
diff --git a/apps/builder/app/canvas/instance-context-menu.ts b/apps/builder/app/canvas/instance-context-menu.ts
new file mode 100644
index 0000000000..a7707ec47d
--- /dev/null
+++ b/apps/builder/app/canvas/instance-context-menu.ts
@@ -0,0 +1,25 @@
+import { selectorIdAttribute } from "@webstudio-is/react-sdk";
+import { $instanceContextMenu } from "~/shared/nano-states";
+
+export const subscribeInstanceContextMenu = () => {
+ const handleContextMenu = (event: MouseEvent) => {
+ const target = event.target as HTMLElement;
+ const element = target.closest(`[${selectorIdAttribute}]`);
+ const selectorId = element?.getAttribute(selectorIdAttribute);
+
+ if (selectorId) {
+ event.preventDefault();
+ const instanceSelector = selectorId.split(",");
+ $instanceContextMenu.set({
+ position: { x: event.clientX, y: event.clientY },
+ instanceSelector,
+ });
+ }
+ };
+
+ document.addEventListener("contextmenu", handleContextMenu);
+
+ return () => {
+ document.removeEventListener("contextmenu", handleContextMenu);
+ };
+};
diff --git a/apps/builder/app/shared/copy-paste/init-copy-paste.ts b/apps/builder/app/shared/copy-paste/init-copy-paste.ts
index 2226ee32d2..7d3696b9e0 100644
--- a/apps/builder/app/shared/copy-paste/init-copy-paste.ts
+++ b/apps/builder/app/shared/copy-paste/init-copy-paste.ts
@@ -163,3 +163,23 @@ export const initCopyPasteForContentEditMode = ({
signal,
});
};
+
+// Public API for programmatic copy/paste/cut operations
+export const copyInstance = () => {
+ const data = instanceText.onCopy?.();
+ if (data) {
+ navigator.clipboard.writeText(data);
+ }
+};
+
+export const pasteInstance = async () => {
+ const text = await navigator.clipboard.readText();
+ instanceText.onPaste?.(text);
+};
+
+export const cutInstance = () => {
+ const data = instanceText.onCut?.();
+ if (data) {
+ navigator.clipboard.writeText(data);
+ }
+};
diff --git a/apps/builder/app/shared/instance-utils.test.tsx b/apps/builder/app/shared/instance-utils.test.tsx
index a5b7eb3196..641b687caa 100644
--- a/apps/builder/app/shared/instance-utils.test.tsx
+++ b/apps/builder/app/shared/instance-utils.test.tsx
@@ -28,6 +28,7 @@ import {
portalComponent,
elementComponent,
} from "@webstudio-is/sdk";
+import { showAttribute } from "@webstudio-is/react-sdk";
import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";
import {
deleteInstanceMutable,
@@ -41,7 +42,11 @@ import {
insertWebstudioElementAt,
buildInstancePath,
wrapIn,
+ toggleInstanceShow,
+ unwrapInstanceMutable,
+ canUnwrapInstance,
} from "./instance-utils";
+import type { InstancePath } from "./awareness";
import {
$assets,
$breakpoints,
@@ -1787,3 +1792,348 @@ describe("buildInstancePath", () => {
expect(result).toEqual(["Main Body", "Navigation"]);
});
});
+
+describe("toggleInstanceShow", () => {
+ test("creates show prop with false value when it doesn't exist", () => {
+ const { instances } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="box"></$.Box>
+ </$.Body>
+ );
+ $instances.set(instances);
+ $props.set(new Map());
+ $pages.set(createDefaultPages({ rootInstanceId: "body" }));
+
+ toggleInstanceShow("box");
+
+ const props = $props.get();
+ const showProp = Array.from(props.values()).find(
+ (prop) => prop.instanceId === "box" && prop.name === showAttribute
+ );
+ expect(showProp).toEqual({
+ id: expect.any(String),
+ instanceId: "box",
+ name: showAttribute,
+ type: "boolean",
+ value: false,
+ });
+ });
+
+ test("toggles show prop from true to false", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="box" ws:show={true}></$.Box>
+ </$.Body>
+ );
+ $instances.set(instances);
+ $props.set(props);
+ $pages.set(createDefaultPages({ rootInstanceId: "body" }));
+
+ toggleInstanceShow("box");
+
+ const updatedProps = $props.get();
+ const showProp = Array.from(updatedProps.values()).find(
+ (prop) => prop.instanceId === "box" && prop.name === showAttribute
+ );
+ expect(showProp?.type).toBe("boolean");
+ if (showProp?.type === "boolean") {
+ expect(showProp.value).toBe(false);
+ }
+ });
+
+ test("toggles show prop from false to true", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="box" ws:show={false}></$.Box>
+ </$.Body>
+ );
+ $instances.set(instances);
+ $props.set(props);
+ $pages.set(createDefaultPages({ rootInstanceId: "body" }));
+
+ toggleInstanceShow("box");
+
+ const updatedProps = $props.get();
+ const showProp = Array.from(updatedProps.values()).find(
+ (prop) => prop.instanceId === "box" && prop.name === showAttribute
+ );
+ expect(showProp?.type).toBe("boolean");
+ if (showProp?.type === "boolean") {
+ expect(showProp.value).toBe(true);
+ }
+ });
+});
+
+describe("unwrap instance", () => {
+ test("unwraps instance and moves children to parent", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="parent">
+ <$.Box ws:id="wrapper">
+ <$.Box ws:id="child1"></$.Box>
+ <$.Box ws:id="child2"></$.Box>
+ </$.Box>
+ </$.Box>
+ </$.Body>
+ );
+
+ const selectedItem = {
+ instanceSelector: ["wrapper", "parent", "body"],
+ instance: instances.get("wrapper")!,
+ };
+ const parentItem = {
+ instanceSelector: ["parent", "body"],
+ instance: instances.get("parent")!,
+ };
+
+ const result = unwrapInstanceMutable({
+ instances,
+ props,
+ metas: defaultMetasMap,
+ selectedItem,
+ parentItem,
+ });
+
+ expect(result.success).toBe(true);
+ expect(instances.has("parent")).toBe(false);
+ const bodyInstance = instances.get("body")!;
+ expect(bodyInstance.children).toEqual([{ type: "id", value: "wrapper" }]);
+ });
+
+ test("fails to unwrap textual instance", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="box">
+ <$.Paragraph ws:id="paragraph">
+ <$.Bold ws:id="bold">text</$.Bold>
+ </$.Paragraph>
+ </$.Box>
+ </$.Body>
+ );
+
+ const selectedItem = {
+ instanceSelector: ["bold", "paragraph", "box", "body"],
+ instance: instances.get("bold")!,
+ };
+ const parentItem = {
+ instanceSelector: ["paragraph", "box", "body"],
+ instance: instances.get("paragraph")!,
+ };
+
+ const result = unwrapInstanceMutable({
+ instances,
+ props,
+ metas: defaultMetasMap,
+ selectedItem,
+ parentItem,
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.error).toBe("Cannot unwrap textual instance");
+ });
+
+ test("fails to unwrap if content model is violated", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="outerBox">
+ <$.Form ws:id="form">
+ <$.Box ws:id="innerBox">
+ <$.Form ws:id="nestedForm"></$.Form>
+ </$.Box>
+ </$.Form>
+ </$.Box>
+ </$.Body>
+ );
+
+ const selectedItem = {
+ instanceSelector: ["form", "outerBox", "body"],
+ instance: instances.get("form")!,
+ };
+ const parentItem = {
+ instanceSelector: ["outerBox", "body"],
+ instance: instances.get("outerBox")!,
+ };
+
+ const result = unwrapInstanceMutable({
+ instances,
+ props,
+ metas: defaultMetasMap,
+ selectedItem,
+ parentItem,
+ });
+
+ expect(result.success).toBe(false);
+ expect(result.error).toBe("Cannot unwrap instance");
+ });
+
+ test("unwrapping replaces parent with selected in grandparent", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="parent">
+ <$.Box ws:id="child"></$.Box>
+ </$.Box>
+ </$.Body>
+ );
+
+ const selectedItem = {
+ instanceSelector: ["child", "parent", "body"],
+ instance: instances.get("child")!,
+ };
+ const parentItem = {
+ instanceSelector: ["parent", "body"],
+ instance: instances.get("parent")!,
+ };
+
+ const result = unwrapInstanceMutable({
+ instances,
+ props,
+ metas: defaultMetasMap,
+ selectedItem,
+ parentItem,
+ });
+
+ expect(result.success).toBe(true);
+ expect(instances.has("parent")).toBe(false);
+ expect(instances.has("child")).toBe(true);
+ const bodyInstance = instances.get("body")!;
+ expect(bodyInstance.children).toEqual([{ type: "id", value: "child" }]);
+ });
+
+ test("unwrapping removes selected from parent and moves it to grandparent", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="parent">
+ <$.Image ws:id="image"></$.Image>
+ <$.Link ws:id="link"></$.Link>
+ </$.Box>
+ </$.Body>
+ );
+
+ const selectedItem = {
+ instanceSelector: ["image", "parent", "body"],
+ instance: instances.get("image")!,
+ };
+ const parentItem = {
+ instanceSelector: ["parent", "body"],
+ instance: instances.get("parent")!,
+ };
+
+ const result = unwrapInstanceMutable({
+ instances,
+ props,
+ metas: defaultMetasMap,
+ selectedItem,
+ parentItem,
+ });
+
+ expect(result.success).toBe(true);
+ expect(instances.has("parent")).toBe(true); // Parent still exists
+ expect(instances.has("image")).toBe(true);
+ expect(instances.has("link")).toBe(true);
+
+ const bodyInstance = instances.get("body")!;
+ expect(bodyInstance.children).toEqual([
+ { type: "id", value: "parent" },
+ { type: "id", value: "image" },
+ ]);
+
+ const parentInstance = instances.get("parent")!;
+ expect(parentInstance.children).toEqual([{ type: "id", value: "link" }]);
+ });
+});
+
+describe("canUnwrapInstance", () => {
+ beforeEach(() => {
+ $project.set({ id: "projectId" } as Project);
+ $registeredComponentMetas.set(defaultMetasMap);
+ });
+
+ test("returns true for unwrappable instance", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="parent">
+ <$.Box ws:id="wrapper">
+ <$.Box ws:id="child"></$.Box>
+ </$.Box>
+ </$.Box>
+ </$.Body>
+ );
+
+ $instances.set(instances);
+ $props.set(props);
+ const pages = createDefaultPages({ rootInstanceId: "body" });
+ $pages.set(pages);
+ $awareness.set({ pageId: pages.homePage.id });
+
+ const instancePath = [
+ {
+ instanceSelector: ["wrapper", "parent", "body"],
+ instance: instances.get("wrapper")!,
+ },
+ {
+ instanceSelector: ["parent", "body"],
+ instance: instances.get("parent")!,
+ },
+ ] satisfies InstancePath;
+
+ expect(canUnwrapInstance(instancePath)).toBe(true);
+ });
+
+ test("returns false if parent is root instance", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Box ws:id="box"></$.Box>
+ </$.Body>
+ );
+
+ $instances.set(instances);
+ $props.set(props);
+ $registeredComponentMetas.set(defaultMetasMap);
+ const pages = createDefaultPages({ rootInstanceId: "body" });
+ $pages.set(pages);
+ $awareness.set({ pageId: pages.homePage.id });
+
+ const instancePath = [
+ {
+ instanceSelector: ["box", "body"],
+ instance: instances.get("box")!,
+ },
+ {
+ instanceSelector: ["body"],
+ instance: instances.get("body")!,
+ },
+ ] satisfies InstancePath;
+
+ expect(canUnwrapInstance(instancePath)).toBe(false);
+ });
+
+ test("returns false for textual instance", () => {
+ const { instances, props } = renderData(
+ <$.Body ws:id="body">
+ <$.Paragraph ws:id="paragraph">
+ <$.Bold ws:id="bold">text</$.Bold>
+ </$.Paragraph>
+ </$.Body>
+ );
+
+ $instances.set(instances);
+ $props.set(props);
+ $registeredComponentMetas.set(defaultMetasMap);
+ const pages = createDefaultPages({ rootInstanceId: "body" });
+ $pages.set(pages);
+ $awareness.set({ pageId: pages.homePage.id });
+
+ const instancePath = [
+ {
+ instanceSelector: ["bold", "paragraph", "body"],
+ instance: instances.get("bold")!,
+ },
+ {
+ instanceSelector: ["paragraph", "body"],
+ instance: instances.get("paragraph")!,
+ },
+ ] satisfies InstancePath;
+
+ expect(canUnwrapInstance(instancePath)).toBe(false);
+ });
+});
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index 3bc29312e1..b6fc6e344e 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -2,6 +2,7 @@ import { current, isDraft } from "immer";
import { nanoid } from "nanoid";
import { toast } from "@webstudio-is/design-system";
import { equalMedia, type StyleValue } from "@webstudio-is/css-engine";
+import { showAttribute } from "@webstudio-is/react-sdk";
import {
type Instances,
type StyleSource,
@@ -610,6 +611,157 @@ export const deleteInstanceMutable = (
return true;
};
+export const unwrapInstanceMutable = ({
+ instances,
+ props,
+ metas,
+ selectedItem,
+ parentItem,
+}: {
+ instances: Map<string, Instance>;
+ props: Props;
+ metas: Map<string, WsComponentMeta>;
+ selectedItem: {
+ instanceSelector: InstanceSelector;
+ instance: { id: string };
+ };
+ parentItem: { instanceSelector: InstanceSelector; instance: { id: string } };
+}): { success: boolean; error?: string } => {
+ const instanceSelector = findClosestNonTextualContainer({
+ metas,
+ props,
+ instances,
+ instanceSelector: parentItem.instanceSelector,
+ });
+ if (parentItem.instanceSelector.join() !== instanceSelector.join()) {
+ return { success: false, error: "Cannot unwrap textual instance" };
+ }
+ const parentInstance = instances.get(parentItem.instance.id);
+ const selectedInstance = instances.get(selectedItem.instance.id);
+ if (!parentInstance || !selectedInstance) {
+ return { success: false, error: "Instance not found" };
+ }
+
+ // Get grandparent to replace parent with selected
+ const grandparentId = parentItem.instanceSelector[1];
+ if (!grandparentId) {
+ return { success: false, error: "Cannot unwrap instance at root level" };
+ }
+ const grandparentInstance = instances.get(grandparentId);
+ if (!grandparentInstance) {
+ return { success: false, error: "Grandparent instance not found" };
+ }
+
+ // Remove selected instance from parent's children
+ const selectedIndexInParent = parentInstance.children.findIndex(
+ (child) => child.type === "id" && child.value === selectedItem.instance.id
+ );
+ if (selectedIndexInParent !== -1) {
+ parentInstance.children.splice(selectedIndexInParent, 1);
+ }
+
+ // If parent has no more children, delete it
+ if (parentInstance.children.length === 0) {
+ instances.delete(parentItem.instance.id);
+ }
+
+ // Add selected instance to grandparent at parent's position
+ const parentIndex = grandparentInstance.children.findIndex(
+ (child) => child.type === "id" && child.value === parentItem.instance.id
+ );
+ if (parentIndex !== -1) {
+ if (parentInstance.children.length === 0) {
+ // Replace parent with selected if parent is now empty
+ grandparentInstance.children[parentIndex] = {
+ type: "id",
+ value: selectedItem.instance.id,
+ };
+ } else {
+ // Insert selected after parent if parent still has children
+ grandparentInstance.children.splice(parentIndex + 1, 0, {
+ type: "id",
+ value: selectedItem.instance.id,
+ });
+ }
+ }
+
+ const matches = isTreeSatisfyingContentModel({
+ instances,
+ props,
+ metas,
+ instanceSelector: [
+ selectedItem.instance.id,
+ ...parentItem.instanceSelector.slice(1),
+ ],
+ });
+ if (matches === false) {
+ return { success: false, error: "Cannot unwrap instance" };
+ }
+
+ return { success: true };
+};
+
+export const canUnwrapInstance = (instancePath: InstancePath) => {
+ // global root or body are selected
+ if (instancePath.length < 2) {
+ return false;
+ }
+ const [, parentItem] = instancePath;
+
+ // Prevent unwrapping if parent is the root instance (e.g., Body)
+ const rootInstanceId = $selectedPage.get()?.rootInstanceId;
+ if (
+ rootInstanceId !== undefined &&
+ parentItem.instance.id === rootInstanceId
+ ) {
+ return false;
+ }
+
+ // Check if parent is inside a textual container
+ const instances = $instances.get();
+ const props = $props.get();
+ const metas = $registeredComponentMetas.get();
+
+ const instanceSelector = findClosestNonTextualContainer({
+ metas,
+ props,
+ instances,
+ instanceSelector: parentItem.instanceSelector,
+ });
+
+ if (parentItem.instanceSelector.join() !== instanceSelector.join()) {
+ return false;
+ }
+
+ return true;
+};
+
+export const toggleInstanceShow = (instanceId: Instance["id"]) => {
+ serverSyncStore.createTransaction([$props], (props) => {
+ const allProps = Array.from(props.values());
+ const instanceProps = allProps.filter(
+ (prop) => prop.instanceId === instanceId
+ );
+ let showProp = instanceProps.find((prop) => prop.name === showAttribute);
+
+ // Toggle the show value
+ const newValue = showProp?.type === "boolean" ? !showProp.value : false;
+
+ if (showProp === undefined) {
+ showProp = {
+ id: nanoid(),
+ instanceId,
+ name: showAttribute,
+ type: "boolean",
+ value: newValue,
+ };
+ }
+ if (showProp.type === "boolean") {
+ props.set(showProp.id, { ...showProp, value: newValue });
+ }
+ });
+};
+
export const wrapIn = (component: string, tag?: string) => {
const instancePath = $selectedInstancePath.get();
// global root or body are selected
diff --git a/apps/builder/app/shared/nano-states/canvas.ts b/apps/builder/app/shared/nano-states/canvas.ts
index ab4c6ea97a..b4758161f8 100644
--- a/apps/builder/app/shared/nano-states/canvas.ts
+++ b/apps/builder/app/shared/nano-states/canvas.ts
@@ -73,6 +73,15 @@ export const $blockChildOutline = atom<undefined | BlockChildOutline>(
undefined
);
+export type InstanceContextMenu = {
+ position: { x: number; y: number };
+ instanceSelector: InstanceSelector;
+};
+
+export const $instanceContextMenu = atom<undefined | InstanceContextMenu>(
+ undefined
+);
+
export const findBlockChildSelector = (instanceSelector: InstanceSelector) => {
const instances = $instances.get();
let blockChildSelector: InstanceSelector | undefined = undefined;
diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.ts
index 9fd1a67479..5558323d18 100644
--- a/apps/builder/app/shared/sync/sync-stores.ts
+++ b/apps/builder/app/shared/sync/sync-stores.ts
@@ -44,6 +44,7 @@ import {
$registeredComponentMetas,
$registeredTemplates,
$modifierKeys,
+ $instanceContextMenu,
} from "~/shared/nano-states";
import { $ephemeralStyles } from "~/canvas/stores";
import {
@@ -133,6 +134,7 @@ export const createObjectPool = () => {
),
new NanostoresSyncObject("hoveredInstanceOutline", $hoveredInstanceOutline),
new NanostoresSyncObject("blockChildOutline", $blockChildOutline),
+ new NanostoresSyncObject("instanceContextMenu", $instanceContextMenu),
new NanostoresSyncObject("modifierKeys", $modifierKeys),
new NanostoresSyncObject(
"collaborativeInstanceSelector",