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
refactor: move props logic to canvas (#2361)
Bogdan Chadkin22a1067ed683
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex c45723139c..f09431a47d 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -32,6 +32,7 @@ import { useCanvasShortcuts } from "./canvas-shortcuts";import { useManageDesignModeStyles, GlobalStyles } from "./shared/styles";import {WebstudioComponentCanvas,+ WebstudioComponentContext,WebstudioComponentPreview,} from "./features/webstudio-component";import {@@ -124,28 +125,32 @@ const useElementsTree = (}, [params.assetBaseUrl, pagesMapStore]);return useMemo(() => {- return createElementsTree({- renderer: isPreviewMode ? "preview" : "canvas",- imageBaseUrl: params.imageBaseUrl,- assetBaseUrl: params.assetBaseUrl,- imageLoader,- instances,- rootInstanceId,- indexesWithinAncestors,- propsByInstanceIdStore,- assetsStore,- dataSourcesLogicStore,- Component: isPreviewMode- ? WebstudioComponentPreview- : WebstudioComponentCanvas,- components,- scripts: (- <>- <ScrollRestoration />- <Scripts />- </>- ),- });+ return (+ <WebstudioComponentContext.Provider value={{ propsByInstanceIdStore }}>+ {createElementsTree({+ renderer: isPreviewMode ? "preview" : "canvas",+ imageBaseUrl: params.imageBaseUrl,+ assetBaseUrl: params.assetBaseUrl,+ imageLoader,+ instances,+ rootInstanceId,+ indexesWithinAncestors,+ propsByInstanceIdStore,+ assetsStore,+ dataSourcesLogicStore,+ Component: isPreviewMode+ ? WebstudioComponentPreview+ : WebstudioComponentCanvas,+ components,+ scripts: (+ <>+ <ScrollRestoration />+ <Scripts />+ </>+ ),+ })}+ </WebstudioComponentContext.Provider>+ );}, [params,instances,diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 54f900eec3..2fbf5cf0c1 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -4,12 +4,17 @@ import {type ForwardedRef,useRef,useLayoutEffect,+ useContext,+ useMemo,+ createContext,} from "react";import { Suspense, lazy } from "react";+import { computed, type Atom, atom } from "nanostores";import { useStore } from "@nanostores/react";import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";+import { mergeRefs } from "@react-aria/utils";import store from "immerhin";-import type { Instance, Instances } from "@webstudio-is/sdk";+import type { Instance, Instances, Prop } from "@webstudio-is/sdk";import { findTreeInstanceIds } from "@webstudio-is/sdk";import {type Components,@@ -17,13 +22,17 @@ import {idAttribute,componentAttribute,showAttribute,- useInstanceProps,selectorIdAttribute,+ indexAttribute,+ getIndexesWithinAncestors,} from "@webstudio-is/react-sdk";import {+ dataSourcesLogicStore,instancesStore,+ registeredComponentMetasStore,selectedInstanceRenderStateStore,selectedInstanceSelectorStore,+ selectedPageStore,selectedStyleSourceSelectorStore,useInstanceStyles,} from "~/shared/nano-states";@@ -33,7 +42,6 @@ import {type InstanceSelector,areInstanceSelectorsEqual,} from "~/shared/tree-utils";-import { mergeRefs } from "@react-aria/utils";import { setDataCollapsed } from "~/canvas/collapsed";import { getIsVisuallyHidden } from "~/shared/visually-hidden";@@ -119,6 +127,68 @@ const getInstanceSelector = (return undefined;};+const $indexesWithinAncestors = computed(+ [registeredComponentMetasStore, instancesStore, selectedPageStore],+ (metas, instances, page) => {+ return getIndexesWithinAncestors(+ metas,+ instances,+ page ? [page.rootInstanceId] : []+ );+ }+);++export const WebstudioComponentContext = createContext<{+ propsByInstanceIdStore: Atom<Map<Instance["id"], Prop[]>>;+}>({+ propsByInstanceIdStore: atom(new Map()),+});++const useInstanceProps = (instanceId: Instance["id"]) => {+ const { propsByInstanceIdStore } = useContext(WebstudioComponentContext);+ const instancePropsObjectStore = useMemo(() => {+ return computed(+ [propsByInstanceIdStore, dataSourcesLogicStore, $indexesWithinAncestors],+ (propsByInstanceId, dataSourcesLogic, indexesWithinAncestors) => {+ const instancePropsObject: Record<Prop["name"], unknown> = {};+ const index = indexesWithinAncestors.get(instanceId);+ if (index !== undefined) {+ instancePropsObject[indexAttribute] = index.toString();+ }+ const instanceProps = propsByInstanceId.get(instanceId);+ if (instanceProps === undefined) {+ return instancePropsObject;+ }+ for (const prop of instanceProps) {+ // asset and page are normalized to string+ if (prop.type === "asset" || prop.type === "page") {+ continue;+ }+ if (prop.type === "dataSource") {+ const dataSourceId = prop.value;+ const value = dataSourcesLogic.get(dataSourceId);+ if (value !== undefined) {+ instancePropsObject[prop.name] = value;+ }+ continue;+ }+ if (prop.type === "action") {+ const action = dataSourcesLogic.get(prop.id);+ if (typeof action === "function") {+ instancePropsObject[prop.name] = action;+ }+ continue;+ }+ instancePropsObject[prop.name] = prop.value;+ }+ return instancePropsObject;+ }+ );+ }, [propsByInstanceIdStore, instanceId]);+ const instancePropsObject = useStore(instancePropsObjectStore);+ return instancePropsObject;+};+type WebstudioComponentProps = {instance: Instance;instanceSelector: Instance["id"][];diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.tsindex 8fe115f714..25259fbd1a 100644--- a/packages/react-sdk/src/index.ts+++ b/packages/react-sdk/src/index.ts@@ -15,7 +15,6 @@ export {export * from "./embed-template";export {normalizeProps,- useInstanceProps,getPropsByInstanceId,getInstanceIdFromComponentProps,getIndexWithinAncestorFromComponentProps,diff --git a/packages/react-sdk/src/props.ts b/packages/react-sdk/src/props.tsindex 25ce326495..e125f114d3 100644--- a/packages/react-sdk/src/props.ts+++ b/packages/react-sdk/src/props.ts@@ -1,8 +1,4 @@-import { useContext, useMemo } from "react";-import { computed } from "nanostores";-import { useStore } from "@nanostores/react";import type { Instance, Page, Prop, Props, Assets } from "@webstudio-is/sdk";-import { ReactSdkContext } from "./context";import { idAttribute, indexAttribute } from "./tree/webstudio-component";export type PropsByInstanceId = Map<Instance["id"], Prop[]>;@@ -91,57 +87,6 @@ export const getPropsByInstanceId = (props: Props) => {return propsByInstanceId;};-// this utility is be used only for preview with static props-// so there is no need to use computed to optimize rerenders-export const useInstanceProps = (instanceId: Instance["id"]) => {- const {- propsByInstanceIdStore,- dataSourcesLogicStore,- indexesWithinAncestors,- } = useContext(ReactSdkContext);- const index = indexesWithinAncestors.get(instanceId);- const instancePropsObjectStore = useMemo(() => {- return computed(- [propsByInstanceIdStore, dataSourcesLogicStore],- (propsByInstanceId, dataSourcesLogic) => {- const instancePropsObject: Record<Prop["name"], unknown> = {};- if (index !== undefined) {- instancePropsObject[indexAttribute] = index.toString();- }- const instanceProps = propsByInstanceId.get(instanceId);- if (instanceProps === undefined) {- return instancePropsObject;- }- for (const prop of instanceProps) {- // asset and page are normalized to string- if (prop.type === "asset" || prop.type === "page") {- continue;- }- if (prop.type === "dataSource") {- const dataSourceId = prop.value;- const value = dataSourcesLogic.get(dataSourceId);- if (value !== undefined) {- instancePropsObject[prop.name] = value;- }- continue;- }- if (prop.type === "action") {- const action = dataSourcesLogic.get(prop.id);- if (typeof action === "function") {- instancePropsObject[prop.name] = action;- }- continue;- }- instancePropsObject[prop.name] = prop.value;- }- return instancePropsObject;- }- );- }, [propsByInstanceIdStore, dataSourcesLogicStore, instanceId, index]);- const instancePropsObject = useStore(instancePropsObjectStore);- return instancePropsObject;-};-export const getInstanceIdFromComponentProps = (props: Record<string, unknown>) => {