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
selectedInstanceIsRendered -> selectedInstanceRenderState (#1640)
Roman Pominovb5c87164603b
diff --git a/apps/builder/app/builder/features/style-panel/style-panel.tsx b/apps/builder/app/builder/features/style-panel/style-panel.tsxindex 8e6b8982ba..0c08bd3d18 100644--- a/apps/builder/app/builder/features/style-panel/style-panel.tsx+++ b/apps/builder/app/builder/features/style-panel/style-panel.tsx@@ -13,7 +13,7 @@ import { useStyleData } from "./shared/use-style-data";import { StyleSettings } from "./style-settings";import { StyleSourcesSection } from "./style-source-section";-import { selectedInstanceIsRenderedStore } from "~/shared/nano-states";+import { selectedInstanceRenderStateStore } from "~/shared/nano-states";import { useStore } from "@nanostores/react";type StylePanelProps = {@@ -28,12 +28,14 @@ export const StylePanel = ({ selectedInstance, publish }: StylePanelProps) => {publish,});- const selectedInstaceIsRendered = useStore(selectedInstanceIsRenderedStore);+ const selectedInstanceRenderState = useStore(+ selectedInstanceRenderStateStore+ );// If selected instance is not rendered on the canvas,// style panel will not work, because it needs the element in DOM in order to work.// See <SelectedInstanceConnector> for more details.- if (selectedInstaceIsRendered === false) {+ if (selectedInstanceRenderState === "notMounted") {return (<Box css={{ p: theme.spacing[5] }}><Card css={{ p: theme.spacing[9], width: "100%" }}>diff --git a/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.ts b/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.tsindex b03c38bb42..86156a3052 100644--- a/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.ts+++ b/apps/builder/app/canvas/features/webstudio-component/selected-instance-connector.ts@@ -10,7 +10,7 @@ import {selectedInstanceBrowserStyleStore,selectedInstanceIntanceToTagStore,selectedInstanceUnitSizesStore,- selectedInstanceIsRenderedStore,+ selectedInstanceRenderStateStore,} from "~/shared/nano-states";import htmlTags, { type htmlTags as HtmlTags } from "html-tags";import { getAllElementsBoundingBox } from "~/shared/dom-utils";@@ -178,7 +178,7 @@ export const SelectedInstanceConnector = ({const unitSizes = calculateUnitSizes(element);selectedInstanceUnitSizesStore.set(unitSizes);- selectedInstanceIsRenderedStore.set(true);+ selectedInstanceRenderStateStore.set("mounted");return () => {hideOutline();@@ -189,8 +189,8 @@ export const SelectedInstanceConnector = ({unsubscribeWindowResize();unsubscribeIsResizingCanvas();- // see webstudio-component.tsx for where it's set to `false`- selectedInstanceIsRenderedStore.set(undefined);+ // see webstudio-component.tsx for where it's set to "notMounted"+ selectedInstanceRenderStateStore.set("pending");};}, [instanceElementRef,diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex f0d7ca0152..6f2a2b3282 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -17,7 +17,7 @@ import {import type { GetComponent } from "@webstudio-is/react-sdk";import {instancesStore,- selectedInstanceIsRenderedStore,+ selectedInstanceRenderStateStore,selectedInstanceSelectorStore,selectedStyleSourceSelectorStore,useInstanceProps,@@ -149,10 +149,10 @@ export const WebstudioComponentDev = ({// 1 means rootif (instanceSelector.length === 1) {// If by the time root is rendered,- // no selected instance renders and sets `selectedInstanceIsRendered` to `true`,- // then it's clear that selected instance will not render at all, so we set it to `false`- if (selectedInstanceIsRenderedStore.get() === undefined) {- selectedInstanceIsRenderedStore.set(false);+ // no selected instance renders and sets state to "mounted",+ // then it's clear that selected instance will not render at all, so we set it to "notMounted"+ if (selectedInstanceRenderStateStore.get() === "pending") {+ selectedInstanceRenderStateStore.set("notMounted");}}});diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 0bee804ca3..7eed83b6d4 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -237,12 +237,12 @@ export const selectedInstanceIntanceToTagStore = atom<>();/**- * Whether or not the selected instance is rendered on canvas:- * `true` — rendered;- * `false` — not rendered;- * `undefined` — selected instance unmounted and we don't know yet whether a new one will mount.+ * pending means: previous selected instance unmounted,+ * and we don't know yet whether a new one will mount**/-export const selectedInstanceIsRenderedStore = atom<boolean | undefined>(false);+export const selectedInstanceRenderStateStore = atom<+ "mounted" | "notMounted" | "pending"+>("notMounted");export const selectedInstanceStatesByStyleSourceIdStore = computed([stylesStore, styleSourceSelectionsStore, selectedInstanceSelectorStore],diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tsindex cf2327e4cc..60297a7775 100644--- a/apps/builder/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -18,7 +18,7 @@ import {selectedInstanceBrowserStyleStore,selectedInstanceUnitSizesStore,selectedInstanceIntanceToTagStore,- selectedInstanceIsRenderedStore,+ selectedInstanceRenderStateStore,hoveredInstanceSelectorStore,isPreviewModeStore,synchronizedCanvasStores,@@ -82,8 +82,8 @@ export const registerContainers = () => {selectedInstanceUnitSizesStore);clientStores.set(- "selectedInstanceIsRenderedStore",- selectedInstanceIsRenderedStore+ "selectedInstanceRenderStateStore",+ selectedInstanceRenderStateStore);clientStores.set("hoveredInstanceSelector", hoveredInstanceSelectorStore);clientStores.set("isPreviewMode", isPreviewModeStore);