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
Sync zoom and modify with shared shortcuts (#1006)
Bogdan Chadkin97177e4cc512
diff --git a/apps/designer/app/canvas/shared/use-shortcuts.ts b/apps/designer/app/canvas/shared/use-shortcuts.tsindex a9afa53914..67c170929a 100644--- a/apps/designer/app/canvas/shared/use-shortcuts.ts+++ b/apps/designer/app/canvas/shared/use-shortcuts.ts@@ -15,7 +15,6 @@ declare module "~/shared/pubsub" {cancelCurrentDrag: undefined;openBreakpointsMenu: undefined;selectBreakpointFromShortcut: number;- zoom: "zoomOut" | "zoomIn";}}@@ -40,21 +39,6 @@ const publishSelectBreakpoint = ({ key }: HandlerEvent) => {});};-const publishZoom = (event: HandlerEvent) => {- if (!event.key) {- throw new Error(- "`publishZoom` doesn't account for being called without a `key`"- );- }- if (event.preventDefault !== undefined) {- event.preventDefault();- }- publish({- type: "zoom",- payload: event.key === "-" ? "zoomOut" : "zoomIn",- });-};-const publishOpenBreakpointsMenu = () => {publish({ type: "openBreakpointsMenu" });};@@ -72,7 +56,6 @@ export const useShortcuts = () => {preview: togglePreviewMode,breakpointsMenu: publishOpenBreakpointsMenu,breakpoint: publishSelectBreakpoint,- zoom: publishZoom,esc: publishCancelCurrentDrag,} as const;@@ -119,7 +102,6 @@ export const useShortcuts = () => {useHotkeys(shortcuts.preview, shortcutHandlerMap.preview, options, []);useHotkeys(shortcuts.breakpoint, shortcutHandlerMap.breakpoint, options, []);- useHotkeys(shortcuts.zoom, shortcutHandlerMap.zoom, options, []);useHotkeys(shortcuts.breakpointsMenu,shortcutHandlerMap.breakpointsMenu,diff --git a/apps/designer/app/designer/features/breakpoints/breakpoints.tsx b/apps/designer/app/designer/features/breakpoints/breakpoints.tsxindex 8634e512c4..475337cd0a 100644--- a/apps/designer/app/designer/features/breakpoints/breakpoints.tsx+++ b/apps/designer/app/designer/features/breakpoints/breakpoints.tsx@@ -18,10 +18,7 @@ import { Preview } from "./preview";import { ZoomSetting } from "./zoom-setting";import { TriggerButton } from "./trigger-button";import { WidthSetting } from "./width-setting";-import {- useSubscribeSelectBreakpointFromShortcut,- useSubscribeZoomFromShortcut,-} from "./use-subscribe-shortcuts";+import { useSubscribeSelectBreakpointFromShortcut } from "./use-subscribe-shortcuts";import { ConfirmationDialog } from "./confirmation-dialog";import {breakpointsContainer,@@ -44,7 +41,6 @@ export const Breakpoints = () => {const [breakpointPreview, setBreakpointPreview] =useState(selectedBreakpoint);useSubscribeSelectBreakpointFromShortcut();- useSubscribeZoomFromShortcut();useEffect(() => {setBreakpointPreview(selectedBreakpoint);diff --git a/apps/designer/app/designer/features/breakpoints/trigger-button.tsx b/apps/designer/app/designer/features/breakpoints/trigger-button.tsxindex 4a67e6634f..688a0cda72 100644--- a/apps/designer/app/designer/features/breakpoints/trigger-button.tsx+++ b/apps/designer/app/designer/features/breakpoints/trigger-button.tsx@@ -1,11 +1,12 @@import { forwardRef, type ComponentProps, type ElementRef } from "react";+import { useStore } from "@nanostores/react";+import { Button, Text } from "@webstudio-is/design-system";import {useCanvasWidth,- useZoom,useSelectedBreakpoint,} from "~/designer/shared/nano-states";import { willRender } from "~/designer/shared/breakpoints";-import { Button, Text } from "@webstudio-is/design-system";+import { zoomStore } from "~/shared/nano-states/breakpoints";type TriggerButtonProps = ComponentProps<typeof Button>;@@ -13,7 +14,7 @@ export const TriggerButton = forwardRef<ElementRef<typeof Button>,TriggerButtonProps>((props, ref) => {- const [zoom] = useZoom();+ const zoom = useStore(zoomStore);const [breakpoint] = useSelectedBreakpoint();const [canvasWidth] = useCanvasWidth();if (breakpoint === undefined) {diff --git a/apps/designer/app/designer/features/breakpoints/use-subscribe-shortcuts.ts b/apps/designer/app/designer/features/breakpoints/use-subscribe-shortcuts.tsindex 3860a6ac6b..da24cac328 100644--- a/apps/designer/app/designer/features/breakpoints/use-subscribe-shortcuts.ts+++ b/apps/designer/app/designer/features/breakpoints/use-subscribe-shortcuts.ts@@ -1,7 +1,6 @@import { useSubscribe } from "~/shared/pubsub";import { useBreakpoints } from "~/shared/nano-states";-import { useZoom, useSelectedBreakpoint } from "../../shared/nano-states";-import { minZoom } from "./zoom-setting";+import { useSelectedBreakpoint } from "../../shared/nano-states";import { utils } from "@webstudio-is/project";export const useSubscribeSelectBreakpointFromShortcut = () => {@@ -14,18 +13,3 @@ export const useSubscribeSelectBreakpointFromShortcut = () => {}});};--const zoomStep = 20;--export const useSubscribeZoomFromShortcut = () => {- const [zoom, setZoom] = useZoom();-- useSubscribe("zoom", (direction) => {- if (direction === "zoomIn") {- setZoom(Math.min(zoom + zoomStep, 100));- return;- }-- setZoom(Math.max(zoom - zoomStep, minZoom));- });-};diff --git a/apps/designer/app/designer/features/breakpoints/zoom-setting.tsx b/apps/designer/app/designer/features/breakpoints/zoom-setting.tsxindex b539286782..fffacaf73a 100644--- a/apps/designer/app/designer/features/breakpoints/zoom-setting.tsx+++ b/apps/designer/app/designer/features/breakpoints/zoom-setting.tsx@@ -1,11 +1,14 @@-import { useZoom } from "~/designer/shared/nano-states";-import { Slider, DeprecatedText2, Flex } from "@webstudio-is/design-system";-import { theme } from "@webstudio-is/design-system";--export const minZoom = 10;+import { useStore } from "@nanostores/react";+import {+ theme,+ Slider,+ DeprecatedText2,+ Flex,+} from "@webstudio-is/design-system";+import { minZoom, zoomStore } from "~/shared/nano-states/breakpoints";export const ZoomSetting = () => {- const [value, setValue] = useZoom();+ const value = useStore(zoomStore);return (<Flexcss={{ px: theme.spacing[11], py: theme.spacing[3] }}@@ -18,7 +21,7 @@ export const ZoomSetting = () => {min={minZoom}value={value}onValueChange={([value]) => {- setValue(value);+ zoomStore.set(value);}}/><DeprecatedText2>{value}%</DeprecatedText2>diff --git a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx b/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsxindex 12f325fe7f..199bd63271 100644--- a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx+++ b/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx@@ -1,4 +1,5 @@import { type MouseEventHandler, useState } from "react";+import { useStore } from "@nanostores/react";import { createPortal } from "react-dom";import type { Instance } from "@webstudio-is/project-build";import {@@ -15,8 +16,9 @@ import {selectedInstanceIdStore,} from "~/shared/nano-states";import { useSubscribe, type Publish } from "~/shared/pubsub";-import { useCanvasRect, useZoom } from "~/designer/shared/nano-states";+import { useCanvasRect } from "~/designer/shared/nano-states";import { insertInstance } from "~/shared/instance-utils";+import { zoomStore } from "~/shared/nano-states/breakpoints";import type { TabName } from "../../types";import { Header, CloseButton } from "../../header";import { ComponentThumb } from "./component-thumb";@@ -92,7 +94,7 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {const [point, setPoint] = useState<Point>({ x: 0, y: 0 });const [canvasRect] = useCanvasRect();- const [zoom] = useZoom();+ const zoom = useStore(zoomStore);const toCanvasCoordinates = ({ x, y }: Point) => {if (canvasRect === undefined) {diff --git a/apps/designer/app/designer/features/topbar/menu/menu.tsx b/apps/designer/app/designer/features/topbar/menu/menu.tsxindex 337e927bff..fc0c7a3e99 100644--- a/apps/designer/app/designer/features/topbar/menu/menu.tsx+++ b/apps/designer/app/designer/features/topbar/menu/menu.tsx@@ -34,6 +34,7 @@ import {import { deleteInstance } from "~/shared/instance-utils";import { MenuButton } from "./menu-button";import { useAuthPermit } from "~/shared/nano-states";+import { zoomIn, zoomOut } from "~/shared/nano-states/breakpoints";const ThemeMenuItem = () => {if (isFeatureEnabled("dark") === false) {@@ -204,27 +205,13 @@ export const Menu = ({ publish }: MenuProps) => {<ShortcutHint value={["cmd", "b"]} /></DropdownMenuItemRightSlot></DropdownMenuItem>- <DropdownMenuItem- onSelect={() => {- publish({- type: "zoom",- payload: "zoomIn",- });- }}- >+ <DropdownMenuItem onSelect={zoomIn}>Zoom in<DropdownMenuItemRightSlot><ShortcutHint value={["+"]} /></DropdownMenuItemRightSlot></DropdownMenuItem>- <DropdownMenuItem- onSelect={() => {- publish({- type: "zoom",- payload: "zoomOut",- });- }}- >+ <DropdownMenuItem onSelect={zoomOut}>Zoom out<DropdownMenuItemRightSlot><ShortcutHint value={["-"]} />diff --git a/apps/designer/app/designer/features/workspace/use-read-canvas-rect.ts b/apps/designer/app/designer/features/workspace/use-read-canvas-rect.tsindex 98948d514c..6d690af677 100644--- a/apps/designer/app/designer/features/workspace/use-read-canvas-rect.ts+++ b/apps/designer/app/designer/features/workspace/use-read-canvas-rect.ts@@ -1,7 +1,8 @@import { useCallback, useEffect, useState } from "react";-import { useZoom } from "~/designer/shared/nano-states";+import { useStore } from "@nanostores/react";import { useCanvasRect, useCanvasWidth } from "~/designer/shared/nano-states";import { useWindowResize } from "~/shared/dom-hooks";+import { zoomStore } from "~/shared/nano-states/breakpoints";/*** Reads the canvas iframe dom rect and puts it into nano state@@ -13,7 +14,7 @@ export const useReadCanvasRect = () => {);const [, setCanvasRect] = useCanvasRect();const [canvasWidth] = useCanvasWidth();- const [zoom] = useZoom();+ const zoom = useStore(zoomStore);const [recalcFlag, forceRecalc] = useState(false);useWindowResize(() => {forceRecalc(!recalcFlag);diff --git a/apps/designer/app/designer/features/workspace/workspace.tsx b/apps/designer/app/designer/features/workspace/workspace.tsxindex dbfe41bbeb..99c292c3de 100644--- a/apps/designer/app/designer/features/workspace/workspace.tsx+++ b/apps/designer/app/designer/features/workspace/workspace.tsx@@ -1,9 +1,10 @@-import { Box, Flex, Toaster } from "@webstudio-is/design-system";-import { useCanvasWidth, useZoom } from "~/designer/shared/nano-states";-import { CanvasTools } from "./canvas-tools";+import { useStore } from "@nanostores/react";+import { theme, Box, Flex, Toaster } from "@webstudio-is/design-system";+import { useCanvasWidth } from "~/designer/shared/nano-states";import { type Publish } from "~/shared/pubsub";-import { theme } from "@webstudio-is/design-system";import { selectedInstanceIdStore } from "~/shared/nano-states";+import { zoomStore } from "~/shared/nano-states/breakpoints";+import { CanvasTools } from "./canvas-tools";const workspaceStyle = {flexGrow: 1,@@ -37,7 +38,7 @@ export const Workspace = ({onTransitionEnd,publish,}: WorkspaceProps) => {- const [zoom] = useZoom();+ const zoom = useStore(zoomStore);const [canvasWidth] = useCanvasWidth();const handleWorkspaceClick = () => {diff --git a/apps/designer/app/designer/shared/nano-states/index.ts b/apps/designer/app/designer/shared/nano-states/index.tsindex 7c1c6323e3..0cb3600c6c 100644--- a/apps/designer/app/designer/shared/nano-states/index.ts+++ b/apps/designer/app/designer/shared/nano-states/index.ts@@ -20,9 +20,6 @@ const selectedBreakpointContainer = atom<Breakpoint | undefined>();export const useSelectedBreakpoint = () =>useValue(selectedBreakpointContainer);-const zoomContainer = atom<number>(100);-export const useZoom = () => useValue(zoomContainer);-const canvasWidthContainer = atom<number>(0);export const useCanvasWidth = () => useValue(canvasWidthContainer);diff --git a/apps/designer/app/shared/nano-states/breakpoints.ts b/apps/designer/app/shared/nano-states/breakpoints.tsnew file mode 100644index 0000000000..3621574f4c--- /dev/null+++ b/apps/designer/app/shared/nano-states/breakpoints.ts@@ -0,0 +1,19 @@+import { atom } from "nanostores";++export const minZoom = 10;+const maxZoom = 100;+const zoomStep = 20;++export const zoomStore = atom<number>(100);++export const zoomIn = () => {+ zoomStore.set(Math.min(zoomStore.get() + zoomStep, maxZoom));+};++export const zoomOut = () => {+ zoomStore.set(Math.max(zoomStore.get() - zoomStep, minZoom));+};++export const synchronizedBreakpointsStores = [+ ["zoomStore", zoomStore],+] as const;diff --git a/apps/designer/app/shared/shortcuts/shortcuts.ts b/apps/designer/app/shared/shortcuts/shortcuts.tsindex 93d0c0b008..9448044ba9 100644--- a/apps/designer/app/shared/shortcuts/shortcuts.ts+++ b/apps/designer/app/shared/shortcuts/shortcuts.ts@@ -1,5 +1,6 @@import { Options, useHotkeys } from "react-hotkeys-hook";import { selectedInstanceIdStore } from "../nano-states";+import { zoomIn, zoomOut } from "../nano-states/breakpoints";import { deleteInstance } from "../instance-utils";export const shortcuts = {@@ -11,7 +12,6 @@ export const shortcuts = {breakpoint: Array.from(new Array(9)).map((_, index) => `cmd+${index + 1}, ctrl+${index + 1}`).join(", "),- zoom: "=, -",} as const;export const options: Options = {@@ -32,4 +32,40 @@ export const useSharedShortcuts = () => {{ enableOnFormTags: false, enableOnContentEditable: false },[]);++ useHotkeys(+ "equal",+ zoomIn,+ // prevent zoom while typing+ { enableOnFormTags: false, enableOnContentEditable: false },+ []+ );++ useHotkeys(+ "meta+shift+equal",+ (event) => {+ event.preventDefault();+ zoomIn();+ },+ { enableOnFormTags: true, enableOnContentEditable: true },+ []+ );++ useHotkeys(+ "minus",+ zoomOut,+ // prevent zoom while typing+ { enableOnFormTags: false, enableOnContentEditable: false },+ []+ );++ useHotkeys(+ "meta+shift+minus",+ (event) => {+ event.preventDefault();+ zoomOut();+ },+ { enableOnFormTags: true, enableOnContentEditable: true },+ []+ );};diff --git a/apps/designer/app/shared/sync/sync-stores.ts b/apps/designer/app/shared/sync/sync-stores.tsindex af360a3205..de6b7297bf 100644--- a/apps/designer/app/shared/sync/sync-stores.ts+++ b/apps/designer/app/shared/sync/sync-stores.ts@@ -17,6 +17,7 @@ import {hoveredInstanceOutlineStore,isPreviewModeStore,} from "~/shared/nano-states";+import { synchronizedBreakpointsStores } from "~/shared/nano-states/breakpoints";enableMapSet();@@ -62,6 +63,9 @@ export const registerContainers = () => {clientStores.set("hoveredInstanceIdStore", hoveredInstanceIdStore);clientStores.set("hoveredInstanceOutlineStore", hoveredInstanceOutlineStore);clientStores.set("isPreviewModeStore", isPreviewModeStore);+ for (const [name, store] of synchronizedBreakpointsStores) {+ clientStores.set(name, store);+ }};const syncStoresChanges = (name: SyncEventSource, publish: Publish) => {diff --git a/apps/designer/package.json b/apps/designer/package.jsonindex 83011860b0..7d2df4c0dd 100644--- a/apps/designer/package.json+++ b/apps/designer/package.json@@ -82,7 +82,7 @@"react-color": "^2.19.3","react-dom": "^17.0.2","react-error-boundary": "^3.1.4",- "react-hotkeys-hook": "^4.3.4",+ "react-hotkeys-hook": "^4.3.5","react-use": "^17.3.2","remix-auth": "^3.2.2","remix-auth-form": "^1.1.2",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex a757caa2c0..988a320949 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -139,7 +139,7 @@ importers:react-color: ^2.19.3react-dom: 17.0.2react-error-boundary: ^3.1.4- react-hotkeys-hook: ^4.3.4+ react-hotkeys-hook: ^4.3.5react-test-renderer: ^17.0.2react-use: ^17.3.2relative-deps: ^1.0.7@@ -221,7 +221,7 @@ importers:react-color: [email protected]react-dom: [email protected]react-error-boundary: [email protected]- react-hotkeys-hook: 4.3.4_sfoxds7t5ydpegc3knd667wn6m+ react-hotkeys-hook: 4.3.5_sfoxds7t5ydpegc3knd667wn6mreact-use: 17.4.0_sfoxds7t5ydpegc3knd667wn6mremix-auth: 3.2.2_@[email protected]remix-auth-form: 1.1.2_@[email protected]@@ -20298,8 +20298,8 @@ packages:- csstypedev: false- /react-hotkeys-hook/4.3.4_sfoxds7t5ydpegc3knd667wn6m:- resolution: {integrity: sha512-XV/tMK8n0joWa4tSklfddLUDirbu8T/H1hRPPm+UnfdT2ajp/jZPDh0q3L24nYjsCSwNIA6XFewYPguqrTIXkg==}+ /react-hotkeys-hook/4.3.5_sfoxds7t5ydpegc3knd667wn6m:+ resolution: {integrity: sha512-tfwTwKP3ga7n4naNS/JOByaEwEkTCoXYCepDuhXpj8mBx+sFszV5JecRWM2dv+PbOowmmBpHAFtTXTnG/p8UkQ==}peerDependencies:react: '>=16.8.1'react-dom: '>=16.8.1'