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.

Sync initial client store from builder to canvas (#1224)

Bogdan Chadkin40b2000d2e4a
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index baa5f8450c..607d80d6bf 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -30,8 +30,10 @@ import {
} from "./features/workspace";
import { usePublishShortcuts } from "./shared/shortcuts";
import {
+ selectedPageStore,
useDragAndDropState,
useIsPreviewMode,
+ useSetAssets,
useSetAuthPermit,
useSetAuthToken,
useSetBreakpoints,
@@ -47,6 +49,7 @@ import { Navigator } from "./features/sidebar-left";
import { getBuildUrl } from "~/shared/router-utils";
import { useCopyPaste } from "~/shared/copy-paste";
import { AssetsProvider } from "./shared/assets";
+import type { Asset } from "@webstudio-is/asset-uploader";
registerContainers();
@@ -248,6 +251,7 @@ export type BuilderProps = {
pages: Pages;
pageId: string;
build: Build;
+ assets: Asset[];
buildOrigin: string;
authReadToken: string;
authToken?: string;
@@ -259,6 +263,7 @@ export const Builder = ({
pages,
pageId,
build,
+ assets,
buildOrigin,
authReadToken,
authToken,
@@ -271,6 +276,8 @@ export const Builder = ({
useSetStyleSourceSelections(build.styleSourceSelections);
useSetInstances(build.instances);
+ useSetAssets(assets);
+
useSetAuthToken(authToken);
useSetAuthPermit(authPermit);
useSetProject(project);
@@ -313,6 +320,8 @@ export const Builder = ({
return page;
}, [pages, pageId]);
+ selectedPageStore.set(page);
+
const canvasUrl = getBuildUrl({
buildOrigin,
project,
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index 0a8ef52c66..a2ef9d6ac2 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -26,8 +26,6 @@ import {
useRootInstance,
useSubscribeScrollState,
useIsPreviewMode,
- useSetAssets,
- useSetSelectedPage,
} from "~/shared/nano-states";
import { usePublishScrollState } from "./shared/use-publish-scroll-state";
import { useDragAndDrop } from "./shared/use-drag-drop";
@@ -96,8 +94,6 @@ export const Canvas = ({
getComponent,
}: CanvasProps): JSX.Element | null => {
const isBuilderReady = useSubscribeBuilderReady();
- useSetAssets(data.assets);
- useSetSelectedPage(data.page);
setParams(data.params ?? null);
useCanvasStore(publish);
const [isPreviewMode] = useIsPreviewMode();
diff --git a/apps/builder/app/routes/builder/$projectId.tsx b/apps/builder/app/routes/builder/$projectId.tsx
index e1ba13cb61..ab74049fca 100644
--- a/apps/builder/app/routes/builder/$projectId.tsx
+++ b/apps/builder/app/routes/builder/$projectId.tsx
@@ -9,6 +9,7 @@ import { ErrorMessage } from "~/shared/error";
import { sentryException } from "~/shared/sentry";
import { getBuildOrigin } from "~/shared/router-utils";
import { type BuilderProps, Builder, links } from "~/builder";
+import { loadByProject } from "@webstudio-is/asset-uploader/server";
export { links };
@@ -43,6 +44,7 @@ export const loader = async ({
}
const devBuild = await loadBuildByProjectId(project.id, "dev");
+ const assets = await loadByProject(project.id, context);
const pages = devBuild.pages;
@@ -54,6 +56,7 @@ export const loader = async ({
pages,
pageId: pageIdParam || devBuild.pages.homePage.id,
build: devBuild,
+ assets,
buildOrigin: getBuildOrigin(request),
authReadToken,
authToken,
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index 9e22187c4f..e258bf9821 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -41,11 +41,6 @@ const useValue = <T>(atom: WritableAtom<T>) => {
};
export const selectedPageStore = atom<undefined | Page>(undefined);
-export const useSetSelectedPage = (page: Page) => {
- useSyncInitializeOnce(() => {
- selectedPageStore.set(page);
- });
-};
export const instancesStore = atom<Map<InstancesItem["id"], InstancesItem>>(
new Map()
diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.ts
index 3f727049cf..64fcd6ef89 100644
--- a/apps/builder/app/shared/sync/sync-stores.ts
+++ b/apps/builder/app/shared/sync/sync-stores.ts
@@ -171,21 +171,6 @@ const syncStoresState = (name: SyncEventSource, publish: Publish) => {
export const useCanvasStore = (publish: Publish) => {
useEffect(() => {
- const data = [];
- for (const [namespace, store] of clientStores) {
- data.push({
- namespace,
- value: store.get(),
- });
- }
- publish({
- type: "sendStoreData",
- payload: {
- source: "canvas",
- data,
- },
- });
-
const unsubscribeStoresState = syncStoresState("canvas", publish);
const unsubscribeStoresChanges = syncStoresChanges("canvas", publish);
@@ -212,6 +197,12 @@ export const useBuilderStore = (publish: Publish) => {
value: container.get(),
});
}
+ for (const [namespace, store] of clientStores) {
+ data.push({
+ namespace,
+ value: store.get(),
+ });
+ }
publish({
type: "sendStoreData",
payload: {