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 new element outline issue (#1512)
Ivan Starkov2f8b0fe150e3
diff --git a/apps/builder/app/canvas/collapsed.ts b/apps/builder/app/canvas/collapsed.tsindex 8d39307c12..5f5ea4b25b 100644--- a/apps/builder/app/canvas/collapsed.ts+++ b/apps/builder/app/canvas/collapsed.ts@@ -208,11 +208,16 @@ const recalculate = () => {* For such elements we set collapsedAttribute and then style helpers add padding to* prevent collapsing.**/-export const setDataCollapsed = (instanceId: string) => {+export const setDataCollapsed = (instanceId: string, syncExec = false) => {instanceIdSet.add(instanceId);cancelAnimationFrame(rafHandle);+ if (syncExec) {+ recalculate();+ return;+ }+rafHandle = requestAnimationFrame(() => {recalculate();});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 8707e1525c..68cbcbfe90 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@@ -16,6 +16,7 @@ import { getAllElementsBoundingBox } from "~/shared/dom-utils";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";const isHtmlTag = (tag: string): tag is HtmlTags =>htmlTags.includes(tag as HtmlTags);@@ -79,6 +80,10 @@ export const SelectedInstanceConnector = ({const instances = useStore(instancesStore);useEffect(() => {+ // Synchronously execute setDataCollapsed to calculate right outline+ // This fixes an issue, when new element outline was calulated before collapsed elements calculations+ setDataCollapsed(instance.id, true);+const element = instanceElementRef.current;if (element === undefined) {return;@@ -94,6 +99,8 @@ export const SelectedInstanceConnector = ({showOutline();const resizeObserver = new ResizeObserver(() => {+ // Having hover etc, element can have no size because of that+ setDataCollapsed(instance.id, true);// contentRect has wrong x/y values for absolutely positioned element.// getBoundingClientRect is used instead.showOutline();