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
feat: Add builderMode, add mode "edit" (#4376)
Ivan Starkov36ba02d30f5f
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex cb9feacb69..7c7a8aeb27 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -29,6 +29,8 @@ import {$publisherHost,$imageLoader,$textEditingInstanceSelector,+ $isDesignMode,+ $isContentMode,} from "~/shared/nano-states";import { $settings, type Settings } from "./shared/client-settings";import { builderUrl, getCanvasUrl } from "~/shared/router-utils";@@ -57,8 +59,11 @@ import { updateWebstudioData } from "~/shared/instance-utils";import { migrateWebstudioDataMutable } from "~/shared/webstudio-data-migrator";import { Loading, LoadingBackground } from "./shared/loading";import { mergeRefs } from "@react-aria/utils";-import { initCopyPaste } from "~/shared/copy-paste";import { CommandPanel } from "./features/command-panel";+import {+ initCopyPaste,+ initCopyPasteForContentEditMode,+} from "~/shared/copy-paste/init-copy-paste";registerContainers();@@ -281,6 +286,9 @@ export const Builder = ({});const isCloneDialogOpen = useStore($isCloneDialogOpen);const isPreviewMode = useStore($isPreviewMode);+ const isDesignMode = useStore($isDesignMode);+ const isContentMode = useStore($isContentMode);+const { onRef: onRefReadCanvas, onTransitionEnd } = useReadCanvasRect();useSetWindowTitle();@@ -295,12 +303,25 @@ export const Builder = ({useEffect(() => {const abortController = new AbortController();- // We need to initialize this in both canvas and builder,- // because the events will fire in either one, depending on where the focus is- // @todo we need to forward the events from canvas to builder and avoid importing this- // in both places- initCopyPaste(abortController);+ if (isDesignMode) {+ // We need to initialize this in both canvas and builder,+ // because the events will fire in either one, depending on where the focus is+ // @todo we need to forward the events from canvas to builder and avoid importing this+ // in both places+ initCopyPaste(abortController);+ }++ if (isContentMode) {+ initCopyPasteForContentEditMode(abortController);+ }++ return () => {+ abortController.abort();+ };+ }, [isContentMode, isDesignMode]);++ useEffect(() => {const unsubscribe = $loadingState.subscribe((loadingState) => {setLoadingState(loadingState);// We need to stop updating it once it's ready in case in the future it changes again.@@ -308,10 +329,7 @@ export const Builder = ({unsubscribe();}});- return () => {- unsubscribe();- abortController.abort();- };+ return unsubscribe;}, []);const canvasUrl = getCanvasUrl();@@ -399,7 +417,8 @@ export const Builder = ({/>)}</Workspace>- <AiCommandBar isPreviewMode={isPreviewMode} />++ {isDesignMode && <AiCommandBar />}</Main><SidePanel gridArea="sidebar"><SidebarLeft publish={publish} />diff --git a/apps/builder/app/builder/features/ai/ai-command-bar.tsx b/apps/builder/app/builder/features/ai/ai-command-bar.tsxindex fb93c47c49..1366b832f2 100644--- a/apps/builder/app/builder/features/ai/ai-command-bar.tsx+++ b/apps/builder/app/builder/features/ai/ai-command-bar.tsx@@ -61,7 +61,7 @@ const initialPrompts = ["Create a testimonials section on 2 rows. The first row has a heading and subheading, the second row has 3 testimonial cards with an image, headline, description and link.",];-export const AiCommandBar = ({ isPreviewMode }: { isPreviewMode: boolean }) => {+export const AiCommandBar = () => {const [value, setValue] = useState("");const [prompts, setPrompts] = useState<string[]>(initialPrompts);const isMenuOpen = getSetting("isAiMenuOpen");@@ -167,10 +167,6 @@ export const AiCommandBar = ({ isPreviewMode }: { isPreviewMode: boolean }) => {},});- if (isPreviewMode) {- return;- }-const handleAiRequest = async (prompt: string) => {if (abortController.current) {if (abortController.current.signal.aborted === false) {diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsxindex cd6d5b89e3..81921e2f90 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx@@ -28,6 +28,7 @@ import {$styles,$selectedBreakpointId,$selectedBreakpoint,+ $isContentMode,} from "~/shared/nano-states";import {$breakpointsMenuView,@@ -47,6 +48,7 @@ export const BreakpointsPopover = () => {const breakpoints = useStore($breakpoints);const selectedBreakpoint = useStore($selectedBreakpoint);const scale = useStore($scale);+ const isContentMode = useStore($isContentMode);if (selectedBreakpoint === undefined) {return null;@@ -183,18 +185,27 @@ export const BreakpointsPopover = () => {padding: theme.spacing[5],}}>- <Button- color="neutral"- css={{ flexGrow: 1 }}- onClick={(event) => {- event.preventDefault();- $breakpointsMenuView.set(- view === "initial" ? "editor" : "initial"- );- }}+ <Tooltip+ content={+ isContentMode+ ? "Editing is not allowed in content mode"+ : undefined+ }>- {view === "editor" ? "Done" : "Edit breakpoints"}- </Button>+ <Button+ color="neutral"+ css={{ flexGrow: 1 }}+ disabled={isContentMode}+ onClick={(event) => {+ event.preventDefault();+ $breakpointsMenuView.set(+ view === "initial" ? "editor" : "initial"+ );+ }}+ >+ {view === "editor" ? "Done" : "Edit breakpoints"}+ </Button>+ </Tooltip></Flex></>)}diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxindex fbbaebf117..6a20791893 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -24,6 +24,7 @@ import { FloatingPanelProvider } from "~/builder/shared/floating-panel";import {$registeredComponentMetas,$dragAndDropState,+ $isDesignMode,} from "~/shared/nano-states";import { NavigatorTree } from "~/builder/features/navigator";import type { Settings } from "~/builder/shared/client-settings";@@ -78,6 +79,7 @@ export const Inspector = ({ navigatorLayout }: InspectorProps) => {const metas = useStore($registeredComponentMetas);const selectedPage = useStore($selectedPage);const activeInspectorPanel = useStore($activeInspectorPanel);+ const isDesignMode = useStore($isDesignMode);if (navigatorLayout === "docked" && isDragging) {return <NavigatorTree />;@@ -100,7 +102,7 @@ export const Inspector = ({ navigatorLayout }: InspectorProps) => {type PanelName = "style" | "settings";const availablePanels = new Set<PanelName>();- if (documentType === "html" && (meta?.stylable ?? true)) {+ if (documentType === "html" && (meta?.stylable ?? true) && isDesignMode) {availablePanels.add("style");}// @todo hide root component settings untildiff --git a/apps/builder/app/builder/features/navigator/navigator-tree.tsx b/apps/builder/app/builder/features/navigator/navigator-tree.tsxindex 0a77ceaf91..35525e65d3 100644--- a/apps/builder/app/builder/features/navigator/navigator-tree.tsx+++ b/apps/builder/app/builder/features/navigator/navigator-tree.tsx@@ -36,6 +36,7 @@ import {$editingItemSelector,$hoveredInstanceSelector,$instances,+ $isContentMode,$props,$propsIndex,$propValuesByInstanceSelector,@@ -404,6 +405,10 @@ const getBuilderDropTarget = (};const canDrag = (instance: Instance) => {+ if ($isContentMode.get()) {+ return false;+ }+const meta = $registeredComponentMetas.get().get(instance.component);if (meta === undefined) {return true;diff --git a/apps/builder/app/builder/features/navigator/navigator.tsx b/apps/builder/app/builder/features/navigator/navigator.tsxindex 9b29a00399..cc4b9de822 100644--- a/apps/builder/app/builder/features/navigator/navigator.tsx+++ b/apps/builder/app/builder/features/navigator/navigator.tsx@@ -8,8 +8,11 @@ import {import { CrossIcon } from "@webstudio-is/icons";import { CssPreview } from "./css-preview";import { NavigatorTree } from "./navigator-tree";+import { $isDesignMode } from "~/shared/nano-states";+import { useStore } from "@nanostores/react";export const NavigatorPanel = ({ onClose }: { onClose: () => void }) => {+ const isDesignMode = useStore($isDesignMode);return (<><PanelTitle@@ -30,7 +33,7 @@ export const NavigatorPanel = ({ onClose }: { onClose: () => void }) => {<Flex grow direction="column" justify="end"><NavigatorTree /><Separator />- <CssPreview />+ {isDesignMode && <CssPreview />}</Flex></>);diff --git a/apps/builder/app/builder/features/pages/pages.tsx b/apps/builder/app/builder/features/pages/pages.tsxindex 28c8bfc03c..ca9335f14c 100644--- a/apps/builder/app/builder/features/pages/pages.tsx+++ b/apps/builder/app/builder/features/pages/pages.tsx@@ -27,7 +27,7 @@ import {} from "@webstudio-is/icons";import { ExtendedPanel } from "../../shared/extended-sidebar-panel";import { NewPageSettings, PageSettings } from "./page-settings";-import { $editingPageId, $pages } from "~/shared/nano-states";+import { $editingPageId, $isContentMode, $pages } from "~/shared/nano-states";import {getAllChildrenAndSelf,reparentOrphansMutable,@@ -334,6 +334,10 @@ const PagesTree = ({isLastChild={item.isLastChild}data={item}canDrag={() => {+ if ($isContentMode.get()) {+ return false;+ }+// forbid dragging home pageif (item.id === pages.homePage.id) {toast.error("Home page cannot be moved");diff --git a/apps/builder/app/builder/features/settings-panel/controls/text.tsx b/apps/builder/app/builder/features/settings-panel/controls/text.tsxindex b5410c6496..30a65265a9 100644--- a/apps/builder/app/builder/features/settings-panel/controls/text.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/text.tsx@@ -64,6 +64,7 @@ export const TextControl = ({onBlur={localValue.save}onSubmit={localValue.save}/>+<BindingPopoverscope={scope}aliases={aliases}diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex abd37dab0b..7179331a06 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -9,6 +9,7 @@ import {Separator,Flex,Box,+ Grid,} from "@webstudio-is/design-system";import {descendantComponent,@@ -18,11 +19,12 @@ import {$propValuesByInstanceSelector,$propsIndex,$props,+ $isDesignMode,+ $isContentMode,} from "~/shared/nano-states";import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";import { renderControl } from "../controls/combined";import { usePropsLogic, type PropAndMeta } from "./use-props-logic";-import { Row } from "../shared";import { serverSyncStore } from "~/shared/sync";import { $selectedInstanceKey } from "~/shared/awareness";@@ -155,41 +157,57 @@ type PropsSectionProps = {// A UI componet with minimum logic that can be demoed in Storybook etc.export const PropsSection = (props: PropsSectionProps) => {const { propsLogic: logic } = props;-const [addingProp, setAddingProp] = useState(false);+ const isDesignMode = useStore($isDesignMode);+ const isContentMode = useStore($isContentMode);const hasItems =logic.addedProps.length > 0 || addingProp || logic.initialProps.length > 0;+ const showPropertiesSection =+ isDesignMode || (isContentMode && logic.initialProps.length > 0);+return (<>- <Row css={{ py: theme.panel.paddingBlock }}>- {logic.systemProps.map((item) => renderProperty(props, item))}- </Row>+ <Grid+ css={{+ paddingBottom: theme.panel.paddingBlock,+ }}+ >+ {logic.systemProps.map((item) => (+ <Box+ key={item.propName}+ css={{ paddingInline: theme.panel.paddingInline }}+ >+ {renderProperty(props, item)}+ </Box>+ ))}+ </Grid><Separator />-- <CollapsibleSectionWithAddButton- label="Properties & Attributes"- onAdd={() => setAddingProp(true)}- hasItems={hasItems}- >- <Flex gap="1" direction="column">- {addingProp && (- <AddPropertyOrAttribute- availableProps={logic.availableProps}- onPropSelected={(propName) => {- setAddingProp(false);- logic.handleAdd(propName);- }}- />- )}- {logic.addedProps.map((item) =>- renderProperty(props, item, { deletable: true })- )}- {logic.initialProps.map((item) => renderProperty(props, item))}- </Flex>- </CollapsibleSectionWithAddButton>+ {showPropertiesSection && (+ <CollapsibleSectionWithAddButton+ label="Properties & Attributes"+ onAdd={isDesignMode ? () => setAddingProp(true) : undefined}+ hasItems={hasItems}+ >+ <Flex gap="1" direction="column">+ {addingProp && (+ <AddPropertyOrAttribute+ availableProps={logic.availableProps}+ onPropSelected={(propName) => {+ setAddingProp(false);+ logic.handleAdd(propName);+ }}+ />+ )}+ {logic.addedProps.map((item) =>+ renderProperty(props, item, { deletable: true })+ )}+ {logic.initialProps.map((item) => renderProperty(props, item))}+ </Flex>+ </CollapsibleSectionWithAddButton>+ )}</>);};diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.tsindex 668e8ed872..62e153a0d9 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts@@ -9,6 +9,7 @@ import {import type { PropValue } from "../shared";import { useStore } from "@nanostores/react";import {+ $isContentMode,$registeredComponentMetas,$registeredComponentPropsMetas,} from "~/shared/nano-states";@@ -152,6 +153,28 @@ export const usePropsLogic = ({updateProp,deleteProp,}: UsePropsLogicInput) => {+ const isContentMode = useStore($isContentMode);++ /**+ * In content edit mode we show only Image and Link props+ * In the future I hope the only thing we will show will be Components+ */+ const isPropVisible = (propName: string) => {+ const contentModeWhiteList: Partial<Record<string, string[]>> = {+ Image: ["src", "width", "height", "alt"],+ Link: ["href"],+ RichTextLink: ["href"],+ };++ if (!isContentMode) {+ return true;+ }++ const propsWhiteList = contentModeWhiteList[instance.component] ?? [];++ return propsWhiteList.includes(propName);+ };+const instanceMeta = useStore($registeredComponentMetas).get(instance.component);@@ -185,6 +208,7 @@ export const usePropsLogic = ({meta,};});+const canHaveTextContent =instanceMeta?.type === "container" &&instance.component !== collectionComponent;@@ -313,11 +337,13 @@ export const usePropsLogic = ({meta,/** Similar to Initial, but displayed as a separate group in UI etc.* Currentrly used only for the ID prop. */- systemProps,+ systemProps: systemProps.filter(({ propName }) => isPropVisible(propName)),/** Initial (not deletable) props */- initialProps,+ initialProps: initialProps.filter(({ propName }) =>+ isPropVisible(propName)+ ),/** Optional props that were added by user */- addedProps,+ addedProps: addedProps.filter(({ propName }) => isPropVisible(propName)),/** List of remaining props still available to add */availableProps: Array.from(unprocessedKnown.entries(),diff --git a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx b/apps/builder/app/builder/features/settings-panel/settings-panel.tsxindex b57b8622fa..07d1ffd7ef 100644--- a/apps/builder/app/builder/features/settings-panel/settings-panel.tsx+++ b/apps/builder/app/builder/features/settings-panel/settings-panel.tsx@@ -15,6 +15,7 @@ import { UpgradeIcon } from "@webstudio-is/icons";import { useStore } from "@nanostores/react";import { $userPlanFeatures } from "~/builder/shared/nano-states";import cmsUpgradeBanner from "./cms-upgrade-banner.svg?url";+import { $isDesignMode } from "~/shared/nano-states";export const SettingsPanelContainer = ({selectedInstance,@@ -22,11 +23,16 @@ export const SettingsPanelContainer = ({selectedInstance: Instance;}) => {const { allowDynamicData } = useStore($userPlanFeatures);+ const isDesignMode = useStore($isDesignMode);+return (<Box css={{ pt: theme.spacing[5] }}><SettingsSection />+<PropsSectionContainer selectedInstance={selectedInstance} />- <VariablesSection />++ {isDesignMode && <VariablesSection />}+{allowDynamicData === false && (<PanelBanner><imgdiff --git a/apps/builder/app/builder/features/topbar/editor.tsx b/apps/builder/app/builder/features/topbar/editor.tsxnew file mode 100644index 0000000000..67d3cd87ba--- /dev/null+++ b/apps/builder/app/builder/features/topbar/editor.tsx@@ -0,0 +1,24 @@+import { useStore } from "@nanostores/react";+import { TextIcon } from "@webstudio-is/icons";+import { ToolbarToggleItem, Tooltip } from "@webstudio-is/design-system";+import { $isContentMode } from "~/shared/nano-states";+import { emitCommand } from "~/builder/shared/commands";++export const EditorButton = () => {+ const isContentMode = useStore($isContentMode);++ return (+ <Tooltip content="Toggle editor">+ <ToolbarToggleItem+ value="editor"+ aria-label="Toggle editor"+ variant="preview"+ data-state={isContentMode ? "on" : "off"}+ onClick={() => emitCommand("toggleEditor")}+ tabIndex={0}+ >+ <TextIcon />+ </ToolbarToggleItem>+ </Tooltip>+ );+};diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsxindex 058d1efb78..ea269b4f00 100644--- a/apps/builder/app/builder/features/topbar/topbar.tsx+++ b/apps/builder/app/builder/features/topbar/topbar.tsx@@ -28,6 +28,8 @@ import { toggleActiveSidebarPanel } from "~/builder/shared/nano-states";import type { ReactNode } from "react";import { CloneButton } from "./clone";import { $selectedPage } from "~/shared/awareness";+import { EditorButton } from "./editor";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";const PagesButton = () => {const page = useStore($selectedPage);@@ -123,6 +125,7 @@ export const Topbar = ({ project, hasProPlan, css, loading }: TopbarProps) => {><ViewMode /><SyncStatus />+ {isFeatureEnabled("contentEditableMode") && <EditorButton />}<PreviewButton /><ShareButton projectId={project.id} hasProPlan={hasProPlan} /><PublishButton projectId={project.id} />diff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsxindex 513caf5df9..c40b8d723f 100644--- a/apps/builder/app/builder/shared/binding-popover.tsx+++ b/apps/builder/app/builder/shared/binding-popover.tsx@@ -45,7 +45,12 @@ import {type EditorApi,} from "./expression-editor";import { useSideOffset } from "./floating-panel";-import { $dataSourceVariables, computeExpression } from "~/shared/nano-states";+import {+ $dataSourceVariables,+ $isDesignMode,+ computeExpression,+} from "~/shared/nano-states";+import { useStore } from "@nanostores/react";export const evaluateExpressionWithinScope = (expression: string,@@ -360,6 +365,11 @@ export const BindingPopover = ({});const hasUnsavedChange = useRef<boolean>(false);const preventedClosing = useRef<boolean>(false);+ const isDesignMode = useStore($isDesignMode);++ if (!isDesignMode) {+ return;+ }const valueError = validate?.(evaluateExpressionWithinScope(value, scope));return (diff --git a/apps/builder/app/builder/shared/collapsible-section.tsx b/apps/builder/app/builder/shared/collapsible-section.tsxindex a357b0ee98..3076657c5e 100644--- a/apps/builder/app/builder/shared/collapsible-section.tsx+++ b/apps/builder/app/builder/shared/collapsible-section.tsx@@ -107,7 +107,7 @@ export const CollapsibleSectionWithAddButton = ({hasItems = true,...props}: Omit<CollapsibleSectionProps, "trigger" | "categoryProps"> & {- onAdd: () => void;+ onAdd?: () => void;/*** If set to `true`, dots aren't shown,@@ -139,15 +139,17 @@ export const CollapsibleSectionWithAddButton = ({<SectionTitledots={Array.isArray(hasItems) ? hasItems : []}suffix={- <SectionTitleButton- prefix={<PlusIcon />}- onClick={() => {- if (isOpenFinal === false) {- setIsOpen(true);- }- onAdd();- }}- />+ onAdd ? (+ <SectionTitleButton+ prefix={<PlusIcon />}+ onClick={() => {+ if (isOpenFinal === false) {+ setIsOpen(true);+ }+ onAdd();+ }}+ />+ ) : undefined}><SectionTitleLabel>{props.label}</SectionTitleLabel>diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex 380fa31bb1..be15992b73 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -1,10 +1,11 @@import { createCommandsEmitter, type Command } from "~/shared/commands-emitter";import {- $isPreviewMode,$editingItemSelector,$instances,$selectedInstanceSelector,$textEditingInstanceSelector,+ $builderMode,+ $isDesignMode,} from "~/shared/nano-states";import {$breakpointsMenuView,@@ -26,9 +27,9 @@ import {setActiveSidebarPanel,toggleActiveSidebarPanel,} from "./nano-states";-import { toast } from "@webstudio-is/design-system";import { selectInstance } from "~/shared/awareness";import { openCommandPanel } from "../features/command-panel";+import { builderApi } from "~/shared/builder-api";const makeBreakpointCommand = <CommandName extends string>(name: CommandName,@@ -44,6 +45,11 @@ const makeBreakpointCommand = <CommandName extends string>(});const deleteSelectedInstance = () => {+ if ($isDesignMode.get() === false) {+ builderApi.toast.info("Deleting is only allowed in design mode.");+ return;+ }+const textEditingInstanceSelector = $textEditingInstanceSelector.get();const selectedInstanceSelector = $selectedInstanceSelector.get();// cannot delete instance while editing@@ -123,8 +129,26 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({name: "togglePreview",defaultHotkeys: ["meta+shift+p", "ctrl+shift+p"],handler: () => {- $isPreviewMode.set($isPreviewMode.get() === false);setActiveSidebarPanel("auto");++ if ($builderMode.get() === "preview") {+ $builderMode.set("design");+ } else {+ $builderMode.set("preview");+ }+ },+ },+ {+ name: "toggleEditor",+ defaultHotkeys: ["meta+shift+e", "ctrl+shift+e"],+ handler: () => {+ setActiveSidebarPanel("auto");++ if ($builderMode.get() === "content") {+ $builderMode.set("design");+ } else {+ $builderMode.set("content");+ }},},{@@ -137,6 +161,12 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({name: "toggleComponentsPanel",defaultHotkeys: ["a"],handler: () => {+ if ($isDesignMode.get() === false) {+ builderApi.toast.info(+ "Components panel is only available in design mode."+ );+ return;+ }toggleActiveSidebarPanel("components");},disableHotkeyOnFormTags: true,@@ -155,6 +185,12 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({name: "openStylePanel",defaultHotkeys: ["s"],handler: () => {+ if ($isDesignMode.get() === false) {+ builderApi.toast.info(+ "Style panel is only available in design mode."+ );+ return;+ }$activeInspectorPanel.set("style");},disableHotkeyOnFormTags: true,@@ -208,13 +244,18 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({name: "duplicateInstance",defaultHotkeys: ["meta+d", "ctrl+d"],handler: () => {+ if ($isDesignMode.get() === false) {+ builderApi.toast.info("Duplicating is only allowed in design mode.");+ return;+ }+const instanceSelector = $selectedInstanceSelector.get();if (instanceSelector === undefined) {return;}const instances = $instances.get();if (isInstanceDetachable(instances, instanceSelector) === false) {- toast.error(+ builderApi.toast.error("This instance can not be moved outside of its parent component.");return;diff --git a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/sidebar-left/sidebar-left.tsxindex 789a3fb84b..989fe8671e 100644--- a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx+++ b/apps/builder/app/builder/sidebar-left/sidebar-left.tsx@@ -1,7 +1,11 @@import { useRef, useState, type ReactNode } from "react";import { Kbd, rawTheme, Text } from "@webstudio-is/design-system";import { useSubscribe, type Publish } from "~/shared/pubsub";-import { $dragAndDropState, $isPreviewMode } from "~/shared/nano-states";+import {+ $dragAndDropState,+ $isContentMode,+ $isPreviewMode,+} from "~/shared/nano-states";import { Flex } from "@webstudio-is/design-system";import { theme } from "@webstudio-is/design-system";import {@@ -83,6 +87,36 @@ type PanelConfig = {label: ReactNode;Icon: IconComponent;Panel: (props: { publish: Publish; onClose: () => void }) => ReactNode;+ visibility?: {+ content?: boolean; // if set, controls visibility in edit mode, if not the panel is visible+ // Probably other modes+ };+};++const isPanelVisible = (+ panel: Pick<PanelConfig, "visibility">,+ {+ isPreviewMode,+ isContentMode,+ }: { isPreviewMode: boolean; isContentMode: boolean }+) => {+ if (isPreviewMode) {+ return false;+ }++ const { visibility } = panel;++ // If visibility is not defined, the panel is always visible+ if (visibility === undefined) {+ return true;+ }++ if (isContentMode) {+ // If visibility.edit is not defined, the panel is visible+ return visibility.content ?? true;+ }++ return true;};const panels: PanelConfig[] = [@@ -96,6 +130,9 @@ const panels: PanelConfig[] = [),Icon: PlusIcon,Panel: ComponentsPanel,+ visibility: {+ content: false,+ },},{name: "pages",@@ -125,6 +162,9 @@ const panels: PanelConfig[] = [label: "Marketplace",Icon: ExtensionIcon,Panel: MarketplacePanel,+ visibility: {+ content: false,+ },},];@@ -137,6 +177,7 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {const dragAndDropState = useStore($dragAndDropState);const { Panel } = panels.find((item) => item.name === activePanel) ?? none;const isPreviewMode = useStore($isPreviewMode);+ const isContentMode = useStore($isContentMode);const tabsWrapperRef = useRef<HTMLDivElement>(null);const returnTabRef = useRef<SidebarPanelName | undefined>(undefined);@@ -182,6 +223,8 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {setActiveSidebarPanel("assets");});+ const modes = { isContentMode, isPreviewMode };+return (<SidebarTabsactivationMode="manual"@@ -201,20 +244,22 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {<ExternalDragDropMonitor /><div ref={tabsWrapperRef} style={{ display: "contents" }}><SidebarTabsList>- {panels.map(({ name, Icon, label }) => {- return (- <SidebarTabsTrigger- key={name}- label={label}- value={name}- onClick={() => {- toggleActiveSidebarPanel(name);- }}- >- <Icon size={rawTheme.spacing[10]} />- </SidebarTabsTrigger>- );- })}+ {panels+ .filter((panel) => isPanelVisible(panel, modes))+ .map(({ name, Icon, label }) => {+ return (+ <SidebarTabsTrigger+ key={name}+ label={label}+ value={name}+ onClick={() => {+ toggleActiveSidebarPanel(name);+ }}+ >+ <Icon size={rawTheme.spacing[10]} />+ </SidebarTabsTrigger>+ );+ })}</SidebarTabsList></div><AiTabTrigger />diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex da55731cb2..185774e8af 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -32,6 +32,7 @@ import {subscribeStyles,mountStyles,manageDesignModeStyles,+ manageContentEditModeStyles,} from "./shared/styles";import {WebstudioComponentCanvas,@@ -45,9 +46,14 @@ import {$registeredComponents,subscribeComponentHooks,$isPreviewMode,+ $isDesignMode,+ $isContentMode,} from "~/shared/nano-states";import { useDragAndDrop } from "./shared/use-drag-drop";-import { initCopyPaste } from "~/shared/copy-paste";+import {+ initCopyPaste,+ initCopyPasteForContentEditMode,+} from "~/shared/copy-paste/init-copy-paste";import { setDataCollapsed, subscribeCollapsedToPubSub } from "./collapsed";import { useWindowResizeDebounced } from "~/shared/dom-hooks";import { subscribeInstanceSelection } from "./instance-selection";@@ -181,6 +187,40 @@ const DesignMode = () => {return null;};+const ContentEditMode = () => {+ const debounceEffect = useDebounceEffect();+ const ref = useRef<Instances>();++ useEffect(() => {+ const abortController = new AbortController();+ subscribeScrollNewInstanceIntoView(+ debounceEffect,+ ref,+ abortController.signal+ );+ const unsubscribeSelected = subscribeSelected(debounceEffect);+ return () => {+ unsubscribeSelected();+ abortController.abort();+ };+ }, [debounceEffect]);++ useEffect(() => {+ const abortController = new AbortController();+ const options = { signal: abortController.signal };+ manageContentEditModeStyles(options);+ subscribeInstanceSelection(options);+ subscribeInstanceHovering(options);+ subscribeInspectorEdits(options);+ subscribeFontLoadingDone(options);+ initCopyPasteForContentEditMode(options);+ return () => {+ abortController.abort();+ };+ }, []);+ return null;+};+type CanvasProps = {params: Params;imageLoader: ImageLoader;@@ -188,7 +228,8 @@ type CanvasProps = {export const Canvas = ({ params, imageLoader }: CanvasProps) => {useCanvasStore(publish);- const isPreviewMode = useStore($isPreviewMode);+ const isDesignMode = useStore($isDesignMode);+ const isContentMode = useStore($isContentMode);useMount(() => {registerComponentLibrary({@@ -283,7 +324,8 @@ export const Canvas = ({ params, imageLoader }: CanvasProps) => {// Call hooks after render to ensure effects are last.// Helps improve outline calculations as all styles are then applied.}- {isPreviewMode === false && isInitialized && <DesignMode />}+ {isDesignMode && isInitialized && <DesignMode />}+ {isContentMode && isInitialized && <ContentEditMode />}</>);};diff --git a/apps/builder/app/canvas/instance-hovering.ts b/apps/builder/app/canvas/instance-hovering.tsindex 6178599e8f..2ae47b3087 100644--- a/apps/builder/app/canvas/instance-hovering.ts+++ b/apps/builder/app/canvas/instance-hovering.ts@@ -17,6 +17,7 @@ export const subscribeInstanceHovering = ({signal: AbortSignal;}) => {let hoveredElement: undefined | Element = undefined;+ let updateOnMouseMove = false;let isScrolling = false;const updateHoveredInstance = (element: Element) => {@@ -32,24 +33,40 @@ export const subscribeInstanceHovering = ({window.addEventListener("mouseover",- (event: MouseEvent) => {+ (event) => {if (event.target instanceof Element) {const element = event.target.closest(`[${idAttribute}]`) ?? undefined;if (element !== undefined) {clearTimeout(mouseOutTimeoutId);// store hovered element locally to update outline when scroll endshoveredElement = element;- updateHoveredInstance(element);+ updateOnMouseMove = true;}}},eventOptions);+ window.addEventListener(+ "mousemove",+ () => {+ // We want the hover outline to appear only if a mouse or trackpad action caused it, not from keyboard navigation.+ // Otherwise, when we leave the Lexical editor using the keyboard,+ // the mouseover event triggers on elements created after Lexical loses focus.+ // This causes an outline to appear on the element under the now-invisible mouse pointer+ // (as the browser hides the pointer on blur), creating some visual distraction.+ if (updateOnMouseMove && hoveredElement !== undefined) {+ updateHoveredInstance(hoveredElement);+ }+ updateOnMouseMove = false;+ },+ eventOptions+ );window.addEventListener("mouseout",() => {mouseOutTimeoutId = setTimeout(() => {+ updateOnMouseMove = false;hoveredElement = undefined;$hoveredInstanceSelector.set(undefined);$hoveredInstanceOutline.set(undefined);diff --git a/apps/builder/app/canvas/instance-selection.ts b/apps/builder/app/canvas/instance-selection.tsindex 30a9a8f737..b44cab9453 100644--- a/apps/builder/app/canvas/instance-selection.ts+++ b/apps/builder/app/canvas/instance-selection.ts@@ -1,6 +1,12 @@import { getInstanceSelectorFromElement } from "~/shared/dom-utils";import { findClosestEditableInstanceSelector } from "~/shared/instance-utils";-import { $instances, $registeredComponentMetas } from "~/shared/nano-states";+import {+ $hoveredInstanceOutline,+ $hoveredInstanceSelector,+ $instances,+ $isContentMode,+ $registeredComponentMetas,+} from "~/shared/nano-states";import { $textEditingInstanceSelector } from "~/shared/nano-states";import { emitCommand } from "./shared/commands";import { shallowEqual } from "shallow-equal";@@ -14,6 +20,109 @@ const isElementBeingEdited = (element: Element) => {return false;};+const handleSelect = (event: MouseEvent) => {+ const element = event.target;++ if (!(element instanceof Element)) {+ return;+ }++ if (isElementBeingEdited(element)) {+ return;+ }++ const instanceSelector = getInstanceSelectorFromElement(element);++ if (instanceSelector === undefined) {+ return;+ }++ // Prevent unnecessary updates (2 clicks are registered before a double click)+ if ($textEditingInstanceSelector.get() !== undefined) {+ $textEditingInstanceSelector.set(undefined);+ }++ // Prevent unnecessary updates (2 clicks are registered before a double click)+ if (!shallowEqual(instanceSelector, $awareness.get()?.instanceSelector)) {+ selectInstance(instanceSelector);+ }+};++const handleEdit = (event: MouseEvent) => {+ const element = event.target;++ if (!(element instanceof Element)) {+ return;+ }++ if (isElementBeingEdited(element)) {+ return;+ }++ const instanceSelector = getInstanceSelectorFromElement(element);++ if (instanceSelector === undefined) {+ return;+ }++ const instances = $instances.get();++ let editableInstanceSelector = findClosestEditableInstanceSelector(+ instanceSelector,+ instances,+ $registeredComponentMetas.get()+ );++ // Do not allow edit bindable text instances with expression children in Content Mode+ if (editableInstanceSelector !== undefined && $isContentMode.get()) {+ const instance = instances.get(editableInstanceSelector[0]);+ if (instance === undefined) {+ return false;+ }++ const hasExpressionChildren = instance.children.some(+ (child) => child.type === "expression"+ );++ if (hasExpressionChildren) {+ editableInstanceSelector = undefined;+ }+ }++ if (editableInstanceSelector === undefined) {+ // Handle non-editable instances in Content Mode:++ // Reset editing state when clicking from an editable text to a non-editable instance+ if ($textEditingInstanceSelector.get() !== undefined) {+ $textEditingInstanceSelector.set(undefined);+ }++ // Select the instance when no editable parent is found+ if (!shallowEqual(instanceSelector, $awareness.get()?.instanceSelector)) {+ selectInstance(instanceSelector);+ }++ return;+ }++ // Avoid redundant selection if the instance is already selected+ if (+ !shallowEqual($awareness.get()?.instanceSelector, editableInstanceSelector)+ ) {+ selectInstance(editableInstanceSelector);+ }++ $hoveredInstanceOutline.set(undefined);+ $hoveredInstanceSelector.set(undefined);++ $textEditingInstanceSelector.set({+ selector: editableInstanceSelector,+ reason: "click",+ mouseX: event.clientX,+ mouseY: event.clientY,+ });+};+export const subscribeInstanceSelection = ({signal,}: {@@ -22,33 +131,14 @@ export const subscribeInstanceSelection = ({addEventListener("click",(event) => {- const element = event.target;-emitCommand("clickCanvas");- if (!(element instanceof Element)) {- return;- }-- if (isElementBeingEdited(element)) {+ if ($isContentMode.get()) {+ handleEdit(event);return;}- const instanceSelector = getInstanceSelectorFromElement(element);-- if (instanceSelector === undefined) {- return;- }-- // Prevent unnecessary updates (2 clicks are registered before a double click)- if ($textEditingInstanceSelector.get() !== undefined) {- $textEditingInstanceSelector.set(undefined);- }-- // Prevent unnecessary updates (2 clicks are registered before a double click)- if (!shallowEqual(instanceSelector, $awareness.get()?.instanceSelector)) {- selectInstance(instanceSelector);- }+ handleSelect(event);},{ passive: true, signal });@@ -56,43 +146,7 @@ export const subscribeInstanceSelection = ({addEventListener("dblclick",(event) => {- const element = event.target;-- if (!(element instanceof Element)) {- return;- }-- if (isElementBeingEdited(element)) {- return;- }-- const instanceSelector = getInstanceSelectorFromElement(element);-- if (instanceSelector === undefined) {- return;- }-- const editableInstanceSelector = findClosestEditableInstanceSelector(- instanceSelector,- $instances.get(),- $registeredComponentMetas.get()- );-- if (editableInstanceSelector === undefined) {- return;- }-- // Prevent unnecessary updates (should already be selected during click)- if (!shallowEqual(instanceSelector, editableInstanceSelector)) {- selectInstance(editableInstanceSelector);- }-- $textEditingInstanceSelector.set({- selector: editableInstanceSelector,- reason: "click",- mouseX: event.clientX,- mouseY: event.clientY,- });+ handleEdit(event);},{ passive: true, signal });diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 78c398f387..bd7640bfac 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -28,7 +28,6 @@ import {$assets,$breakpoints,$instances,- $isPreviewMode,$props,$registeredComponentMetas,$selectedStyleState,@@ -38,7 +37,9 @@ import {import { setDifference } from "~/shared/shim";import { $ephemeralStyles, $params } from "../stores";import { canvasApi } from "~/shared/canvas-api";-import { $selectedInstance } from "~/shared/awareness";+import { $selectedInstance, $selectedPage } from "~/shared/awareness";+import { findAllEditableInstanceSelector } from "~/shared/instance-utils";+import type { InstanceSelector } from "~/shared/tree-utils";const userSheet = createRegularStyleSheet({ name: "user-styles" });const stateSheet = createRegularStyleSheet({ name: "state-styles" });@@ -60,23 +61,7 @@ export const mountStyles = () => {helpersSheet.render();};-// Helper styles on for canvas in design mode-// - Only instances that would collapse without helper should receive helper-// - Helper is removed when any CSS property is changed on that instance that would prevent collapsing, so that helper is not needed-// - Helper doesn't show on the preview or publish-// - Helper goes away if an instance inserted as a child-// - There is no need to set padding-right or padding-bottom if you just need a small div with a defined or layout-based size, as soon as div is not collapsing, helper should not apply-// - Padding will be only added on the side that would collapse otherwise-//-// For example when I add a div, it is a block element, it grows automatically full width but has 0 height, in this case spacing helper with padidng-top: 50px should apply, so that it doesn't collapse.-// If user sets `height: 100px` or does anything that would give it a height - we remove the helper padding right away, so user can actually see the height they set-//-// In other words we prevent elements from collapsing when they have 0 height or width by making them non-zero on canvas, but then we remove those paddings as soon as element doesn't collapse.-const helperStyles = [- // When double clicking into an element to edit text, it should not select the word.- `[${idAttribute}] {- user-select: none;- }`,+const helperStylesShared = [// Using :where allows to prevent increasing specificity, so that helper is overwritten by user styles.`[${idAttribute}]:where([${collapsedAttribute}]:not(body)) {outline: 1px dashed rgba(0,0,0,0.7);@@ -110,25 +95,110 @@ const helperStyles = [}`,];-const subscribePreviewMode = () => {- let isRendered = false;+// Helper styles on for canvas in design mode+// - Only instances that would collapse without helper should receive helper+// - Helper is removed when any CSS property is changed on that instance that would prevent collapsing, so that helper is not needed+// - Helper doesn't show on the preview or publish+// - Helper goes away if an instance inserted as a child+// - There is no need to set padding-right or padding-bottom if you just need a small div with a defined or layout-based size, as soon as div is not collapsing, helper should not apply+// - Padding will be only added on the side that would collapse otherwise+//+// For example when I add a div, it is a block element, it grows automatically full width but has 0 height, in this case spacing helper with padidng-top: 50px should apply, so that it doesn't collapse.+// If user sets `height: 100px` or does anything that would give it a height - we remove the helper padding right away, so user can actually see the height they set+//+// In other words we prevent elements from collapsing when they have 0 height or width by making them non-zero on canvas, but then we remove those paddings as soon as element doesn't collapse.+const helperStyles = [+ // When double clicking into an element to edit text, it should not select the word.+ `[${idAttribute}] {+ user-select: none;+ }`,+ ...helperStylesShared,+];- const unsubscribe = $isPreviewMode.subscribe((isPreviewMode) => {- helpersSheet.setAttribute("media", isPreviewMode ? "not all" : "all");- if (isRendered === false) {- for (const style of helperStyles) {- helpersSheet.addPlaintextRule(style);- }- helpersSheet.render();- isRendered = true;+// Find all editable elements and set cursor text inside+const helperStylesContentEdit = [+ `[${idAttribute}] {+ user-select: none;+}`,+ ...helperStylesShared,+];++const subscribeDesignModeHelperStyles = () => {+ helpersSheet.setAttribute("media", "all");++ for (const style of helperStyles) {+ helpersSheet.addPlaintextRule(style);+ }+ helpersSheet.render();++ return () => {+ helpersSheet.clear();+ helpersSheet.render();+ };+};++const subscribeContentEditModeHelperStyles = () => {+ helpersSheet.setAttribute("media", "all");++ for (const style of helperStylesContentEdit) {+ helpersSheet.addPlaintextRule(style);+ }++ // Show text cursor on all editable elements (including links and buttons)+ // to indicate they are editable in the content editor mode+ //+ // @todo Consider setting cursor: pointer on non-editable elements by default+ // to better distinguish clickable vs editable elements, needs more investigation+ const rootInstanceId = $selectedPage.get()?.rootInstanceId;+ if (rootInstanceId !== undefined) {+ const editableInstanceSelectors: InstanceSelector[] = [];+ const instances = $instances.get();++ findAllEditableInstanceSelector(+ rootInstanceId,+ [],+ instances,+ $registeredComponentMetas.get(),+ editableInstanceSelectors+ );++ // Group IDs into chunks of 20 since :is() allows for more efficient grouping+ const chunkSize = 20;+ for (let i = 0; i < editableInstanceSelectors.length; i += chunkSize) {+ const chunk = editableInstanceSelectors+ .slice(i, i + chunkSize)+ .filter((selector) => {+ const instance = instances.get(selector[0]);+ if (instance === undefined) {+ return false;+ }++ const hasExpressionChildren = instance.children.some(+ (child) => child.type === "expression"+ );++ if (hasExpressionChildren) {+ return false;+ }++ return true;+ });++ const selectors = chunk.map(+ (selector) => `[${idAttribute}="${selector[0]}"]`+ );++ helpersSheet.addPlaintextRule(+ `:is(${selectors.join(", ")}), :is(${selectors.join(", ")}) a { cursor: text; }`+ );}- });+ }++ helpersSheet.render();return () => {helpersSheet.clear();helpersSheet.render();- unsubscribe();- isRendered = false;};};@@ -315,10 +385,21 @@ export const subscribeStyles = () => {};};+export const manageContentEditModeStyles = ({+ signal,+}: {+ signal: AbortSignal;+}) => {+ const unsubscribePreviewMode = subscribeContentEditModeHelperStyles();+ signal.addEventListener("abort", () => {+ unsubscribePreviewMode();+ });+};+export const manageDesignModeStyles = ({ signal }: { signal: AbortSignal }) => {const unsubscribeStateStyles = subscribeStateStyles();const unsubscribeEphemeralStyle = subscribeEphemeralStyle();- const unsubscribePreviewMode = subscribePreviewMode();+ const unsubscribePreviewMode = subscribeDesignModeHelperStyles();signal.addEventListener("abort", () => {unsubscribeStateStyles();unsubscribeEphemeralStyle();diff --git a/apps/builder/app/routes/builder.$projectId.tsx b/apps/builder/app/routes/builder.$projectId.tsxindex e6ac3b5ccd..a92dcf520f 100644--- a/apps/builder/app/routes/builder.$projectId.tsx+++ b/apps/builder/app/routes/builder.$projectId.tsx@@ -18,7 +18,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {projectId: params.projectId,origin: request.url,authToken: url.searchParams.get("authToken") ?? undefined,- mode: url.searchParams.get("mode") === "preview" ? "preview" : "edit",+ mode: url.searchParams.get("mode") === "preview" ? "preview" : "design",}));};diff --git a/apps/builder/app/shared/copy-paste/index.ts b/apps/builder/app/shared/copy-paste/index.tsdeleted file mode 100644index afbe4642f3..0000000000--- a/apps/builder/app/shared/copy-paste/index.ts+++ /dev/null@@ -1 +0,0 @@-export { initCopyPaste } from "./init-copy-paste";diff --git a/apps/builder/app/shared/copy-paste/init-copy-paste.ts b/apps/builder/app/shared/copy-paste/init-copy-paste.tsindex 33e3bd98df..dadaab8984 100644--- a/apps/builder/app/shared/copy-paste/init-copy-paste.ts+++ b/apps/builder/app/shared/copy-paste/init-copy-paste.ts@@ -7,6 +7,7 @@ import * as instance from "./plugin-instance";import * as embedTemplate from "./plugin-embed-template";import * as markdown from "./plugin-markdown";import * as webflow from "./plugin-webflow/plugin-webflow";+import { builderApi } from "../builder-api";const isTextEditing = (event: ClipboardEvent) => {// Text is edited on the Canvas using the default Canvas text editor settings.@@ -150,3 +151,28 @@ export const initCopyPaste = ({ signal }: { signal: AbortSignal }) => {signal,});};++export const initCopyPasteForContentEditMode = ({+ signal,+}: {+ signal: AbortSignal;+}) => {+ const handleClipboard = (event: ClipboardEvent) => {+ if (validateClipboardEvent(event) === false) {+ return;+ }++ builderApi.toast.info(+ "Copying and pasting is allowed in design mode only."+ );+ };++ document.addEventListener("copy", handleClipboard, { signal });+ document.addEventListener("cut", handleClipboard, { signal });+ // Capture is required so we get the element before content-editable removes it+ // This way we can detect when we are inside content-editable and ignore the event+ document.addEventListener("paste", handleClipboard, {+ capture: true,+ signal,+ });+};diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.tsindex 0c6e66c154..0a8d87ffce 100644--- a/apps/builder/app/shared/nano-states/misc.ts+++ b/apps/builder/app/shared/nano-states/misc.ts@@ -297,7 +297,24 @@ export const $hoveredInstanceSelector = atom<undefined | InstanceSelector>(undefined);-export const $isPreviewMode = atom<boolean>(false);+const builderModes = ["design", "preview", "content"] as const;+export type BuilderMode = (typeof builderModes)[number];+export const isBuilderMode = (mode: string | null): mode is BuilderMode =>+ builderModes.includes(mode as BuilderMode);+export const $builderMode = atom<BuilderMode>("design");++export const $isPreviewMode = computed(+ $builderMode,+ (mode) => mode === "preview"+);+export const $isContentMode = computed(+ $builderMode,+ (mode) => mode === "content"+);+export const $isDesignMode = computed(+ $builderMode,+ (mode) => mode === "design"+);export const $authPermit = atom<AuthPermit>("view");export const $authTokenPermissions = atom<TokenPermissions>({diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.tsindex e0d8ed6fd3..23e2d5715c 100644--- a/apps/builder/app/shared/pages/use-switch-page.ts+++ b/apps/builder/app/shared/pages/use-switch-page.ts@@ -6,10 +6,13 @@ import {$pages,$project,$selectedPageHash,+ $builderMode,+ isBuilderMode,$isPreviewMode,} from "~/shared/nano-states";import { builderPath } from "~/shared/router-utils";import { $selectedPage, selectPage } from "../awareness";+import invariant from "tiny-invariant";const setPageStateFromUrl = () => {const searchParams = new URLSearchParams(window.location.search);@@ -19,7 +22,15 @@ const setPageStateFromUrl = () => {}const pageId = searchParams.get("pageId") ?? pages.homePage.id;- $isPreviewMode.set(searchParams.get("mode") === "preview");+ const mode = searchParams.get("mode");++ // Check in case of BuilderMode rename+ invariant(+ mode === null || isBuilderMode(mode),+ `Invalid search param mode: ${mode}`+ );++ $builderMode.set(isBuilderMode(mode) ? mode : "design");$selectedPageHash.set(searchParams.get("pageHash") ?? "");selectPage(pageId);diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 6b3adf974b..def2bdfd85 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -1,6 +1,7 @@import type { AUTH_PROVIDERS } from "~/shared/session";import { publicStaticEnv } from "~/env/env.static";import { getAuthorizationServerOrigin } from "./origins";+import type { BuilderMode } from "../nano-states/misc";const searchParams = (params: Record<string, string | undefined | null>) => {const searchParams = new URLSearchParams();@@ -37,7 +38,7 @@ export const builderUrl = (props: {pageId?: string;origin: string;authToken?: string;- mode?: "edit" | "preview";+ mode?: BuilderMode;}) => {const authServerOrigin = getAuthorizationServerOrigin(props.origin);diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsxindex 5fdc21d4a0..4dc93fdef7 100644--- a/apps/builder/app/shared/share-project/share-project.tsx+++ b/apps/builder/app/shared/share-project/share-project.tsx@@ -303,7 +303,7 @@ type SharedLinkItemType = {onDelete: () => void;builderUrl: (props: {authToken: string;- mode: "preview" | "edit";+ mode: "preview" | "design";}) => string;hasProPlan: boolean;};@@ -323,7 +323,7 @@ const SharedLinkItem = ({<CopyToClipboardtext={builderUrl({authToken: value.token,- mode: value.relation === "viewers" ? "preview" : "edit",+ mode: value.relation === "viewers" ? "preview" : "design",})}copyText="Copy link">diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tsindex 5f65711aed..f769fa78d1 100644--- a/apps/builder/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -22,7 +22,6 @@ import {$selectedInstanceIntanceToTag,$selectedInstanceRenderState,$hoveredInstanceSelector,- $isPreviewMode,$authTokenPermissions,$toastErrors,synchronizedCanvasStores,@@ -41,6 +40,7 @@ import {$uploadingFilesDataStore,$memoryProps,$detectedFontsWeights,+ $builderMode,} from "~/shared/nano-states";import { $ephemeralStyles } from "~/canvas/stores";import { $awareness } from "../awareness";@@ -115,7 +115,7 @@ export const registerContainers = () => {$selectedInstanceRenderState);clientStores.set("hoveredInstanceSelector", $hoveredInstanceSelector);- clientStores.set("isPreviewMode", $isPreviewMode);+ clientStores.set("builderMode", $builderMode);clientStores.set("authTokenPermissions", $authTokenPermissions);clientStores.set("toastErrors", $toastErrors);diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex fd679692a4..7e32615d75 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -6,4 +6,5 @@ export const cms = false;export const filters = false;export const xmlElement = false;export const staticExport = false;+export const contentEditableMode = false;export const command = false;