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.

Replace useMeasure with resize observer (#1942)

Bogdan Chadkin713e873b1b95
diff --git a/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts b/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts
index db713db5ce..c1ad220508 100644
--- a/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts
+++ b/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts
@@ -59,24 +59,18 @@ export const useSetCanvasWidth = () => {
selectedBreakpoint,
workspaceRect.width
);
-
- if (canvasWidthStore.get() !== width) {
- canvasWidthStore.set(width);
- }
+ canvasWidthStore.set(width);
}
};
const unsubscribeBreakpointStore = breakpointsStore.subscribe(update);
- const unsubscribeRectStore =
- workspaceRectStore.get() === undefined
- ? workspaceRectStore.listen((workspaceRect) => {
- if (workspaceRect === undefined) {
- return;
- }
- unsubscribeRectStore?.();
- update();
- })
- : undefined;
+ const unsubscribeRectStore = workspaceRectStore.listen((workspaceRect) => {
+ if (workspaceRect === undefined) {
+ return;
+ }
+ unsubscribeRectStore?.();
+ update();
+ });
return () => {
unsubscribeBreakpointStore();
diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsx
index 70a3486713..fa29e8c068 100644
--- a/apps/builder/app/builder/features/workspace/workspace.tsx
+++ b/apps/builder/app/builder/features/workspace/workspace.tsx
@@ -12,8 +12,7 @@ import {
} from "~/shared/nano-states";
import { textEditingInstanceSelectorStore } from "~/shared/nano-states";
import { CanvasTools } from "./canvas-tools";
-import { useMeasure } from "react-use";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
import { useSetCanvasWidth } from "../breakpoints";
const workspaceStyle = css({
@@ -30,16 +29,23 @@ const canvasContainerStyle = css({
transformOrigin: "0 0",
});
-const useSetWorkspaceRect = () => {
- const workspaceRect = useStore(workspaceRectStore);
- const [ref, rect] = useMeasure<HTMLDivElement>();
+const useMeasureWorkspace = () => {
+ const ref = useRef<HTMLDivElement>(null);
+
useEffect(() => {
- if (rect.width === 0 || rect.height === 0) {
+ const element = ref.current;
+ if (element === null) {
return;
}
- // Little lie to safe the trouble of importing the type it uses everywhere.
- workspaceRectStore.set(rect as DOMRect);
- }, [workspaceRect, rect]);
+ const observer = new ResizeObserver((entries) => {
+ workspaceRectStore.set(entries[0].contentRect);
+ });
+ observer.observe(element);
+ return () => {
+ observer.disconnect();
+ };
+ }, []);
+
return ref;
};
@@ -91,7 +97,7 @@ export const Workspace = ({
publish,
}: WorkspaceProps) => {
const canvasStyle = useCanvasStyle();
- const workspaceRef = useSetWorkspaceRect();
+ const workspaceRef = useMeasureWorkspace();
useSetCanvasWidth();
const handleWorkspaceClick = () => {
selectedInstanceSelectorStore.set(undefined);