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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: render delete icon only in design mode for folder settings and duplicate icon for page settings #5038 (#5083)
Michael38678a442e07
diff --git a/apps/builder/app/builder/features/pages/folder-settings.tsx b/apps/builder/app/builder/features/pages/folder-settings.tsxindex 4ceabfc2b3..eee11c1723 100644--- a/apps/builder/app/builder/features/pages/folder-settings.tsx+++ b/apps/builder/app/builder/features/pages/folder-settings.tsx@@ -1,53 +1,53 @@-import { z } from "zod";-import { type FocusEventHandler, useState, useCallback, type JSX } from "react";import { useStore } from "@nanostores/react";-import { useDebouncedCallback } from "use-debounce";-import slugify from "slugify";-import {- Folder,- Pages,- ROOT_FOLDER_ID,- findParentFolderByChildId,-} from "@webstudio-is/sdk";import {- theme,Button,- Label,- InputErrorsTooltip,- Tooltip,- InputField,- Grid,- ScrollArea,- rawTheme,- Flex,Dialog,- DialogContent,- Text,DialogClose,+ DialogContent,DialogTitle,+ Flex,+ Grid,+ InputErrorsTooltip,+ InputField,+ Label,PanelTitle,+ ScrollArea,Separator,+ Text,TitleSuffixSpacer,+ Tooltip,+ rawTheme,+ theme,} from "@webstudio-is/design-system";import {ChevronsLeftIcon,- TrashIcon,InfoCircleIcon,+ TrashIcon,} from "@webstudio-is/icons";-import { useIds } from "~/shared/form-utils";-import { $pages } from "~/shared/nano-states";+import {+ Folder,+ Pages,+ ROOT_FOLDER_ID,+ findParentFolderByChildId,+} from "@webstudio-is/sdk";import { nanoid } from "nanoid";-import { serverSyncStore } from "~/shared/sync";+import { useCallback, useState, type FocusEventHandler, type JSX } 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 {- isSlugAvailable,- registerFolderChildMutable,deleteFolderWithChildrenMutable,deletePageMutable,+ isSlugAvailable,+ registerFolderChildMutable,} from "./page-utils";-import { Form } from "./form";-import { updateWebstudioData } from "~/shared/instance-utils";-import { useUnmount } from "~/shared/hook-utils/use-mount";const Values = Folder.pick({ name: true, slug: true }).extend({parentFolderId: z.string(),@@ -462,20 +462,24 @@ const FolderSettingsView = ({onDelete();};+ const isDesignMode = useStore($isDesignMode);+return (<><PanelTitlesuffix={<>- <Tooltip content="Delete folder" side="bottom">- <Button- color="ghost"- prefix={<TrashIcon />}- onClick={hanldeRequestDelete}- aria-label="Delete folder"- tabIndex={2}- />- </Tooltip>+ {isDesignMode && (+ <Tooltip content="Delete folder" side="bottom">+ <Button+ color="ghost"+ prefix={<TrashIcon />}+ onClick={hanldeRequestDelete}+ aria-label="Delete folder"+ tabIndex={2}+ />+ </Tooltip>+ )}<Tooltip content="Close folder settings" side="bottom"><Buttoncolor="ghost"diff --git a/apps/builder/app/builder/features/pages/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings.tsxindex 09648fd71a..d44f22559e 100644--- a/apps/builder/app/builder/features/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/pages/page-settings.tsx@@ -1597,16 +1597,17 @@ const PageSettingsView = ({/></Tooltip>)}-- <Tooltip content="Duplicate page" side="bottom">- <Button- color="ghost"- prefix={<CopyIcon />}- onClick={onDuplicate}- aria-label="Duplicate page"- tabIndex={2}- />- </Tooltip>+ {isDesignMode && (+ <Tooltip content="Duplicate page" side="bottom">+ <Button+ color="ghost"+ prefix={<CopyIcon />}+ onClick={onDuplicate}+ aria-label="Duplicate page"+ tabIndex={2}+ />+ </Tooltip>+ )}<Tooltip content="Close page settings" side="bottom"><Button