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
Sync preview mode through sync-stores (#915)
Ivan Starkov8eb14be0c809
diff --git a/apps/designer/app/canvas/canvas.tsx b/apps/designer/app/canvas/canvas.tsxindex 32360857b8..985286a8cb 100644--- a/apps/designer/app/canvas/canvas.tsx+++ b/apps/designer/app/canvas/canvas.tsx@@ -33,6 +33,7 @@ import {useSetRootInstance,useSetStyles,useSubscribeScrollState,+ useIsPreviewMode,} from "~/shared/nano-states";import { usePublishScrollState } from "./shared/use-publish-scroll-state";import { useDragAndDrop } from "./shared/use-drag-drop";@@ -82,12 +83,6 @@ const useElementsTree = () => {}, [rootInstance, onChangeChildren]);};-const useSubscribePreviewMode = () => {- const [isPreviewMode, setIsPreviewMode] = useState<boolean>(false);- useSubscribe("previewMode", setIsPreviewMode);- return isPreviewMode;-};-const useAssets = (initialAssets: Array<Asset>) => {const [assets, setAssets] = useState(initialAssets);useSubscribe("updateAssets", setAssets);@@ -135,6 +130,7 @@ export const Canvas = ({ data }: CanvasProps): JSX.Element | null => {useSetRootInstance(data.tree.root);setParams(data.params ?? null);useCanvasStore(publish);+ const [isPreviewMode] = useIsPreviewMode();registerComponents(customComponents);@@ -142,7 +138,7 @@ export const Canvas = ({ data }: CanvasProps): JSX.Element | null => {// e.g. toggling preview is still needed in both modesuseShortcuts();- const isPreviewMode = useSubscribePreviewMode();+const elements = useElementsTree();if (elements === undefined) {diff --git a/apps/designer/app/canvas/shared/use-shortcuts.ts b/apps/designer/app/canvas/shared/use-shortcuts.tsindex 4d31b51b98..ca30963f6d 100644--- a/apps/designer/app/canvas/shared/use-shortcuts.ts+++ b/apps/designer/app/canvas/shared/use-shortcuts.ts@@ -8,6 +8,7 @@ import {selectedInstanceIdStore,selectedInstanceStore,useTextEditingInstanceId,+ isPreviewModeStore,} from "~/shared/nano-states";declare module "~/shared/pubsub" {@@ -18,7 +19,6 @@ declare module "~/shared/pubsub" {};openBreakpointsMenu: undefined;selectBreakpointFromShortcut: number;- togglePreviewMode: undefined;zoom: "zoomOut" | "zoomIn";}}@@ -29,7 +29,7 @@ type HandlerEvent = {};const togglePreviewMode = () => {- publish({ type: "togglePreviewMode" });+ isPreviewModeStore.set(!isPreviewModeStore.get());};const publishSelectBreakpoint = ({ key }: HandlerEvent) => {diff --git a/apps/designer/app/designer/features/topbar/menu/menu.tsx b/apps/designer/app/designer/features/topbar/menu/menu.tsxindex 2bf3317e03..24cd805a78 100644--- a/apps/designer/app/designer/features/topbar/menu/menu.tsx+++ b/apps/designer/app/designer/features/topbar/menu/menu.tsx@@ -30,6 +30,7 @@ import {import { useClientSettings } from "~/designer/shared/client-settings";import { dashboardPath } from "~/shared/router-utils";import { theme } from "@webstudio-is/design-system";+import { useIsPreviewMode } from "~/shared/nano-states";const ThemeMenuItem = () => {if (isFeatureEnabled("dark") === false) {@@ -96,6 +97,7 @@ export const Menu = ({ publish }: MenuProps) => {const navigate = useNavigate();const [, setIsShareOpen] = useIsShareDialogOpen();const [, setIsPublishOpen] = useIsPublishDialogOpen();+ const [isPreviewMode, setIsPreviewMode] = useIsPreviewMode();return (<DropdownMenu>@@ -235,9 +237,7 @@ export const Menu = ({ publish }: MenuProps) => {<ViewMenuItem /><DropdownMenuItemonSelect={() => {- publish({- type: "togglePreviewMode",- });+ setIsPreviewMode(!isPreviewMode);}}>Previewdiff --git a/apps/designer/app/designer/features/topbar/preview.tsx b/apps/designer/app/designer/features/topbar/preview.tsxindex 56c0077889..ee883d75da 100644--- a/apps/designer/app/designer/features/topbar/preview.tsx+++ b/apps/designer/app/designer/features/topbar/preview.tsx@@ -1,4 +1,3 @@-import { useSubscribe, type Publish } from "~/shared/pubsub";import { EyeOpenIcon } from "@webstudio-is/icons";import { Toggle } from "@webstudio-is/design-system";import { useIsPreviewMode } from "~/shared/nano-states";@@ -9,28 +8,12 @@ declare module "~/shared/pubsub" {}}-type PreviewButtonProps = {- publish: Publish;-};--export const PreviewButton = ({ publish }: PreviewButtonProps) => {+export const PreviewButton = () => {const [isPreviewMode, setIsPreviewMode] = useIsPreviewMode();- const setValue = (value: boolean) => {- setIsPreviewMode(value);- publish({- type: "previewMode",- payload: value,- });- };-- useSubscribe("togglePreviewMode", () => {- setValue(isPreviewMode === false);- });-return (<Toggle- onPressedChange={setValue}+ onPressedChange={setIsPreviewMode}pressed={isPreviewMode}aria-label="Toggle Preview">diff --git a/apps/designer/app/designer/features/topbar/topbar.tsx b/apps/designer/app/designer/features/topbar/topbar.tsxindex 06f405090b..254fb29895 100644--- a/apps/designer/app/designer/features/topbar/topbar.tsx+++ b/apps/designer/app/designer/features/topbar/topbar.tsx@@ -55,7 +55,7 @@ export const Topbar = ({ css, project, publish, designerUrl }: TopbarProps) => {}}><SyncStatus />- <PreviewButton publish={publish} />+ <PreviewButton />{isFeatureEnabled("share2") && (<ShareButton designerUrl={designerUrl} />)}diff --git a/apps/designer/app/shared/nano-states/nano-states.ts b/apps/designer/app/shared/nano-states/nano-states.tsindex c86fbef4e8..6f8c32ea33 100644--- a/apps/designer/app/shared/nano-states/nano-states.ts+++ b/apps/designer/app/shared/nano-states/nano-states.ts@@ -150,8 +150,8 @@ export const hoveredInstanceOutlineStore = atom<undefined | { component: string; rect: DOMRect }>(undefined);-const isPreviewModeContainer = atom<boolean>(false);-export const useIsPreviewMode = () => useValue(isPreviewModeContainer);+export const isPreviewModeStore = atom<boolean>(false);+export const useIsPreviewMode = () => useValue(isPreviewModeStore);const selectedInstanceOutlineContainer = atom<{visible: boolean;diff --git a/apps/designer/app/shared/sync/sync-stores.ts b/apps/designer/app/shared/sync/sync-stores.tsindex 5c7cd94bff..072997c70e 100644--- a/apps/designer/app/shared/sync/sync-stores.ts+++ b/apps/designer/app/shared/sync/sync-stores.ts@@ -11,6 +11,7 @@ import {selectedInstanceBrowserStyleStore,hoveredInstanceIdStore,hoveredInstanceOutlineStore,+ isPreviewModeStore,} from "~/shared/nano-states";type StoreData = {@@ -51,6 +52,7 @@ export const registerContainers = () => {);clientStores.set("hoveredInstanceIdStore", hoveredInstanceIdStore);clientStores.set("hoveredInstanceOutlineStore", hoveredInstanceOutlineStore);+ clientStores.set("isPreviewModeStore", isPreviewModeStore);};const syncStoresChanges = (name: SyncEventSource, publish: Publish) => {