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 scroll reset in style panel (#1632)
Roman Pominovd04e0e83ec5c
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 7898d44278..b03c38bb42 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@@ -11,7 +11,6 @@ import {selectedInstanceIntanceToTagStore,selectedInstanceUnitSizesStore,selectedInstanceIsRenderedStore,- selectedInstanceSelectorStore,} from "~/shared/nano-states";import htmlTags, { type htmlTags as HtmlTags } from "html-tags";import { getAllElementsBoundingBox } from "~/shared/dom-utils";@@ -19,10 +18,7 @@ import { subscribeScrollState } from "~/canvas/shared/scroll-state";import { selectedInstanceOutlineStore } from "~/shared/nano-states";import type { UnitSizes } from "~/builder/features/style-panel/shared/css-value-input/convert-units";import { setDataCollapsed } from "~/canvas/collapsed";-import {- areInstanceSelectorsEqual,- type InstanceSelector,-} from "~/shared/tree-utils";+import { type InstanceSelector } from "~/shared/tree-utils";const isHtmlTag = (tag: string): tag is HtmlTags =>htmlTags.includes(tag as HtmlTags);@@ -193,18 +189,8 @@ export const SelectedInstanceConnector = ({unsubscribeWindowResize();unsubscribeIsResizingCanvas();- // Retain selectedInstanceIsRenderedStore state if instanceSelector stays the same.- // Occasionally, an immediate call to selectedInstanceIsRenderedStore.set(true) may not update StylePanel state- // within the same batch as the current effect unsubscribe (e.g., due to delayed postMessage). (and cause to lost scroll position)- // This rare issue is difficult to reproduce, occurring roughly once every 100 calls.- if (- areInstanceSelectorsEqual(- selectedInstanceSelectorStore.get(),- instanceSelector- ) === false- ) {- selectedInstanceIsRenderedStore.set(false);- }+ // see webstudio-component.tsx for where it's set to `false`+ selectedInstanceIsRenderedStore.set(undefined);};}, [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 1f81f977fa..f0d7ca0152 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -17,6 +17,7 @@ import {import type { GetComponent } from "@webstudio-is/react-sdk";import {instancesStore,+ selectedInstanceIsRenderedStore,selectedInstanceSelectorStore,selectedStyleSourceSelectorStore,useInstanceProps,@@ -142,6 +143,20 @@ export const WebstudioComponentDev = ({}}, [isSelected]);+ // this assumes presence of `useStore(selectedInstanceSelectorStore)` above+ // we rely on root re-rendering after selected instance changes+ useEffect(() => {+ // 1 means root+ if (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);+ }+ }+ });+const readonlyProps =instance.component === "Input" || instance.component === "Textarea"? { readOnly: true }diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 39f2d36aaf..0bee804ca3 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -236,8 +236,13 @@ export const selectedInstanceIntanceToTagStore = atom<undefined | Map<Instance["id"], HtmlTags>>();-/** Whether or the selected instance is rendered on canvas */-export const selectedInstanceIsRenderedStore = atom<boolean>(false);+/**+ * 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.+ **/+export const selectedInstanceIsRenderedStore = atom<boolean | undefined>(false);export const selectedInstanceStatesByStyleSourceIdStore = computed([stylesStore, styleSourceSelectionsStore, selectedInstanceSelectorStore],