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: resize canvas with breakpoints hotkeys (#2522)
Bogdan Chadkin7bf923dc3067
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsxindex 539f7e88ac..6239cbc2cb 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx@@ -38,7 +38,7 @@ import {minCanvasWidth,} from "~/shared/breakpoints";import { scaleStore } from "~/builder/shared/nano-states";-import { useSetInitialCanvasWidth } from "./use-set-initial-canvas-width";+import { setInitialCanvasWidth } from "./use-set-initial-canvas-width";import { serverSyncStore } from "~/shared/sync";export const BreakpointsPopover = () => {@@ -49,7 +49,6 @@ export const BreakpointsPopover = () => {const breakpoints = useStore(breakpointsStore);const selectedBreakpoint = useStore(selectedBreakpointStore);const scale = useStore(scaleStore);- const setInitialCanvasWidth = useSetInitialCanvasWidth();if (selectedBreakpoint === undefined) {return null;diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsxindex d0855f4196..1ad942b100 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx@@ -9,9 +9,9 @@ import {} from "@webstudio-is/design-system";import { BpStarOffIcon, BpStarOnIcon } from "@webstudio-is/icons";import { CascadeIndicator } from "./cascade-indicator";-import { useSetInitialCanvasWidth } from ".";import { selectedBreakpointIdStore } from "~/shared/nano-states";import { groupBreakpoints, isBaseBreakpoint } from "~/shared/breakpoints";+import { setInitialCanvasWidth } from "./use-set-initial-canvas-width";const getTooltipContent = (breakpoint: Breakpoint) => {if (isBaseBreakpoint(breakpoint)) {@@ -56,7 +56,6 @@ export const BreakpointsSelector = ({selectedBreakpoint,}: BreakpointsSelector) => {const refs = useRef(new Map<string, HTMLButtonElement>());- const setInitialCanvasWidth = useSetInitialCanvasWidth();const getButtonById = useCallback((id: string) => refs.current.get(id), []);return (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 0cded1bdea..35a2957706 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,8 +1,6 @@-import { useStore } from "@nanostores/react";-import { useCallback, useEffect } from "react";+import { useEffect } from "react";import type { Breakpoint } from "@webstudio-is/sdk";import {- useCanvasWidth,workspaceRectStore,canvasWidthStore,} from "~/builder/shared/nano-states";@@ -14,28 +12,22 @@ import { findInitialWidth } from "./find-initial-width";// Fixes initial canvas width jump on wide screens.// Calculate canvas width during SSR based on known initial width for wide screens.-export const useSetInitialCanvasWidth = () => {- const [, setCanvasWidth] = useCanvasWidth();- const workspaceRect = useStore(workspaceRectStore);- const breakpoints = useStore(breakpointsStore);- return useCallback(- (breakpointId: Breakpoint["id"]) => {- const breakpoint = breakpoints.get(breakpointId);- if (workspaceRect === undefined || breakpoint === undefined) {- return false;- }-- const width = findInitialWidth(- Array.from(breakpoints.values()),- breakpoint,- workspaceRect.width- );+export const setInitialCanvasWidth = (breakpointId: Breakpoint["id"]) => {+ const workspaceRect = workspaceRectStore.get();+ const breakpoints = breakpointsStore.get();+ const breakpoint = breakpoints.get(breakpointId);+ if (workspaceRect === undefined || breakpoint === undefined) {+ return false;+ }- setCanvasWidth(width);- return true;- },- [workspaceRect, breakpoints, setCanvasWidth]+ const width = findInitialWidth(+ Array.from(breakpoints.values()),+ breakpoint,+ workspaceRect.width);++ canvasWidthStore.set(width);+ return true;};/**diff --git a/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts b/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.tsindex ddb2e0362c..a3554f6f6a 100644--- a/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts+++ b/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts@@ -1,5 +1,6 @@import { groupBreakpoints } from "./group-breakpoints";import { selectedBreakpointIdStore, breakpointsStore } from "../nano-states";+import { setInitialCanvasWidth } from "~/builder/features/breakpoints";/*** Order number starts with 1 and covers all existing breakpoints@@ -12,5 +13,6 @@ export const selectBreakpointByOrder = (orderNumber: number) => {);if (breakpoint) {selectedBreakpointIdStore.set(breakpoint.id);+ setInitialCanvasWidth(breakpoint.id);}};