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.

Schedule canvas rect updates and fix drag&drop (#2152)

Bogdan Chadkin23c1ff5e7481
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
index f4bce79aed..8fc8efcd05 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx
@@ -18,7 +18,7 @@ import {
selectedPageStore,
} from "~/shared/nano-states";
import { useSubscribe, type Publish } from "~/shared/pubsub";
-import { canvasRectStore, scaleStore } from "~/builder/shared/nano-states";
+import { $canvasRect, scaleStore } from "~/builder/shared/nano-states";
import {
computeInstancesConstraints,
findClosestDroppableTarget,
@@ -125,7 +125,7 @@ export const useDraggable = ({
}) => {
const [dragComponent, setDragComponent] = useState<Instance["component"]>();
const [point, setPoint] = useState<Point>({ x: 0, y: 0 });
- const canvasRect = useStore(canvasRectStore);
+ const canvasRect = useStore($canvasRect);
const scale = useStore(scaleStore);
const { enableCanvasPointerEvents, disableCanvasPointerEvents } =
useDisableCanvasPointerEvents();
diff --git a/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts b/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts
index 7e4f00b47c..69fe33196e 100644
--- a/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts
+++ b/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from "react";
import {
scaleStore,
canvasWidthStore,
- canvasRectStore,
+ $canvasRect,
} from "~/builder/shared/nano-states";
import { useWindowResizeDebounced } from "~/shared/dom-hooks";
@@ -16,12 +16,25 @@ export const useReadCanvasRect = () => {
null
);
+ // react updates dom asynchronously so here schedule rect
+ // computing into effect when react done with dom
+ const [updateCallback, setUpdateCallback] = useState<
+ undefined | (() => void)
+ >(undefined);
+ useEffect(() => {
+ updateCallback?.();
+ }, [updateCallback]);
+
const updateRect = useCallback(() => {
if (iframeElement === null) {
return;
}
- const rect = iframeElement.getBoundingClientRect();
- canvasRectStore.set(rect);
+ // create new function to trigger effect
+ const task = () => {
+ const rect = iframeElement.getBoundingClientRect();
+ $canvasRect.set(rect);
+ };
+ setUpdateCallback(() => task);
}, [iframeElement]);
useEffect(() => {
diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.ts
index ae5f0b69b8..2a1312c752 100644
--- a/apps/builder/app/builder/shared/nano-states/index.ts
+++ b/apps/builder/app/builder/shared/nano-states/index.ts
@@ -15,7 +15,7 @@ export const useIsPublishDialogOpen = () => useValue(isPublishDialogOpenStore);
export const canvasWidthStore = atom<number | undefined>();
export const useCanvasWidth = () => useValue(canvasWidthStore);
-export const canvasRectStore = atom<DOMRect | undefined>();
+export const $canvasRect = atom<DOMRect | undefined>();
export const workspaceRectStore = atom<DOMRect | undefined>();