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 preview mode toggle and sync (#1865)
Ivan Starkov1a21c4d3c317
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex f9e8a46a23..02140a8fa2 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -30,7 +30,6 @@ import {useSetBreakpoints,useSetDataSources,useSetInstances,- useSetIsPreviewMode,useSetPages,useSetProps,useSetStyles,@@ -265,7 +264,7 @@ export const Builder = ({version: build.version,});useSharedShortcuts({ source: "builder" });- useSetIsPreviewMode(authPermit === "view");+const [isPreviewMode] = useIsPreviewMode();usePublishShortcuts(publish);const { onRef: onRefReadCanvas, onTransitionEnd } = useReadCanvasRect();diff --git a/apps/builder/app/builder/features/topbar/preview.tsx b/apps/builder/app/builder/features/topbar/preview.tsxindex 8d63fbee17..76f6569b12 100644--- a/apps/builder/app/builder/features/topbar/preview.tsx+++ b/apps/builder/app/builder/features/topbar/preview.tsx@@ -16,6 +16,7 @@ export const PreviewButton = () => {value="preview"aria-label="Toggle Preview"variant="preview"+ data-state={isPreviewMode ? "on" : "off"}onClick={() => setIsPreviewMode(isPreviewMode === false)}tabIndex={0}>diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 5dcb876892..aa1e650999 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -347,11 +347,6 @@ export const hoveredInstanceSelectorStore = atom<undefined | InstanceSelector>(export const isPreviewModeStore = atom<boolean>(false);export const useIsPreviewMode = () => useValue(isPreviewModeStore);-export const useSetIsPreviewMode = (isPreviewMode: boolean) => {- useSyncInitializeOnce(() => {- isPreviewModeStore.set(isPreviewMode);- });-};const authPermitStore = atom<AuthPermit>("view");export const useAuthPermit = () => useValue(authPermitStore);diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.tsindex b9d5076fdf..f26ed55ad1 100644--- a/apps/builder/app/shared/pages/use-switch-page.ts+++ b/apps/builder/app/shared/pages/use-switch-page.ts@@ -10,6 +10,7 @@ import {selectedPageIdStore,selectedPageHashStore,selectedInstanceSelectorStore,+ isPreviewModeStore,} from "~/shared/nano-states";import { builderPath } from "~/shared/router-utils";import { useSyncInitializeOnce } from "../hook-utils";@@ -37,6 +38,8 @@ const setPageStateFromUrl = () => {const pageId = searchParams.get("pageId") ?? pages?.homePage.id;const pageHash = searchParams.get("pageHash") ?? "";+ isPreviewModeStore.set(searchParams.get("mode") === "preview");+switchPage(pageId, pageHash);};@@ -53,6 +56,7 @@ export const useSyncPageUrl = () => {const navigate = useNavigate();const page = useStore(selectedPageStore);const pageHash = useStore(selectedPageHashStore);+ const isPreviewMode = useStore(isPreviewModeStore);// Get pageId and pageHash from URLuseSyncInitializeOnce(() => {@@ -78,9 +82,14 @@ export const useSyncPageUrl = () => {const searchParamsPageId = searchParams.get("pageId") ?? pages.homePage.id;const searchParamsPageHash = searchParams.get("pageHash") ?? "";+ const searchParamsIsPreviewMode = searchParams.get("mode") === "preview";// Do not navigate on popstate change- if (searchParamsPageId === page.id && searchParamsPageHash === pageHash) {+ if (+ searchParamsPageId === page.id &&+ searchParamsPageHash === pageHash &&+ searchParamsIsPreviewMode === isPreviewMode+ ) {return;}@@ -90,7 +99,8 @@ export const useSyncPageUrl = () => {pageId: page.id === pages.homePage.id ? undefined : page.id,authToken: authTokenStore.get(),pageHash: pageHash === "" ? undefined : pageHash,+ mode: isPreviewMode ? "preview" : undefined,}));- }, [navigate, page, pageHash]);+ }, [isPreviewMode, navigate, page, pageHash]);};diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 211bdb6d77..a52953f8dc 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -19,16 +19,19 @@ export const builderPath = ({pageId,authToken,pageHash,+ mode,}: {projectId: string;pageId?: string;authToken?: string;pageHash?: string;+ mode?: "preview";}) => {return `/builder/${projectId}${searchParams({pageId,authToken,pageHash,+ mode,})}`;};