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 width not set on prject change and breakpoints change (#1605)
Ivan Starkovd06e9616e592
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.tsindex ab02e93364..b78399f70d 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@@ -1,9 +1,10 @@import { useStore } from "@nanostores/react";-import { useCallback, useEffect, useRef } from "react";+import { useCallback, useEffect } from "react";import type { Breakpoint } from "@webstudio-is/project-build";import {useCanvasWidth,workspaceRectStore,+ canvasWidthStore,} from "~/builder/shared/nano-states";import { breakpointsStore } from "~/shared/nano-states";import { findInitialWidth } from "./find-initial-width";@@ -26,6 +27,7 @@ export const useSetInitialCanvasWidth = () => {breakpoint,workspaceRect.width);+setCanvasWidth(width);return true;},@@ -33,32 +35,52 @@ export const useSetInitialCanvasWidth = () => {);};-export const useSetInitialCanvasWidthOnce = () => {- const isDone = useRef(false);- const [, setCanvasWidth] = useCanvasWidth();- const workspaceRect = useStore(workspaceRectStore);- const breakpoints = useStore(breakpointsStore);-- // Set it initially once.+/**+ * Update canvas width initially and on breakpoint change+ **/+export const useSetCanvasWidth = () => {useEffect(() => {- if (isDone.current || workspaceRect === undefined) {- return;- }+ const update = () => {+ const breakpoints = breakpointsStore.get();+ const workspaceRect = workspaceRectStore.get();+ if (workspaceRect === undefined || breakpoints.size === 0) {+ return;+ }+ const breakpointValues = Array.from(breakpoints.values());+ const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);- isDone.current = true;+ // When there is base breakpoint, we want to find the lowest possible size+ // that is bigger than all max breakpoints and smaller than all min breakpoints.+ if (baseBreakpoint) {+ const width = findInitialWidth(+ breakpointValues,+ baseBreakpoint,+ workspaceRect.width+ );- const breakpointValues = Array.from(breakpoints.values());- const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);+ if (canvasWidthStore.get() !== width) {+ canvasWidthStore.set(width);+ }+ }+ };- // When there is base breakpoint, we want to find the lowest possible size- // that is bigger than all max breakpoints and smaller than all min breakpoints.- if (baseBreakpoint) {- const width = findInitialWidth(- breakpointValues,- baseBreakpoint,- workspaceRect.width- );- setCanvasWidth(width);- }- }, [breakpoints, setCanvasWidth, workspaceRect]);+ const unsubscribeBreakpointStore = breakpointsStore.subscribe(update);+ const unsubscribeRectStore =+ workspaceRectStore.get() === undefined+ ? workspaceRectStore.listen((workspaceRect) => {+ if (workspaceRect === undefined) {+ return;+ }+ unsubscribeRectStore();+ update();+ })+ : () => {+ /**/+ };++ return () => {+ unsubscribeBreakpointStore();+ unsubscribeRectStore();+ };+ }, []);};diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsxindex f65916ee1d..d6f81cb340 100644--- a/apps/builder/app/builder/features/workspace/workspace.tsx+++ b/apps/builder/app/builder/features/workspace/workspace.tsx@@ -14,7 +14,7 @@ import { textEditingInstanceSelectorStore } from "~/shared/nano-states";import { CanvasTools } from "./canvas-tools";import { useMeasure } from "react-use";import { useEffect } from "react";-import { useSetInitialCanvasWidthOnce } from "../breakpoints";+import { useSetCanvasWidth } from "../breakpoints";const workspaceStyle = css({flexGrow: 1,@@ -86,7 +86,7 @@ export const Workspace = ({}: WorkspaceProps) => {const canvasStyle = useCanvasStyle();const workspaceRef = useSetWorkspaceRect();- useSetInitialCanvasWidthOnce();+ useSetCanvasWidth();const handleWorkspaceClick = () => {selectedInstanceSelectorStore.set(undefined);textEditingInstanceSelectorStore.set(undefined);