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: Fix breakpoint menu open state (#5769)
Oleg Isonenc4125ed298b4
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsxindex 384b197860..df4dfedd14 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-container.tsx@@ -11,7 +11,7 @@ import { BreakpointsSelector } from "./breakpoints-selector";import { BreakpointsMenu } from "./breakpoints-menu";import { BreakpointsEditor } from "./breakpoints-editor";import { ConfirmationDialog } from "./confirmation-dialog";-import { isBaseBreakpoint } from "~/shared/breakpoints";+import { $breakpointsMenuView, isBaseBreakpoint } from "~/shared/breakpoints";import { setCanvasWidth } from "../../shared/calc-canvas-width";import { serverSyncStore } from "~/shared/sync/sync-stores";import type { Breakpoint } from "@webstudio-is/sdk";@@ -25,11 +25,10 @@ const hideOnMobile = {export const BreakpointsContainer = () => {const breakpoints = useStore($breakpoints);const selectedBreakpoint = useStore($selectedBreakpoint);- const [editorOpen, setEditorOpen] = useState(false);+ const breakpointsMenuView = useStore($breakpointsMenuView);const [breakpointToDelete, setBreakpointToDelete] = useState<Breakpoint | undefined>();- const [confirmationOpen, setConfirmationOpen] = useState(false);const handleDelete = () => {if (breakpointToDelete === undefined) {@@ -59,7 +58,7 @@ export const BreakpointsContainer = () => {setCanvasWidth(base.id);}setBreakpointToDelete(undefined);- setConfirmationOpen(false);+ $breakpointsMenuView.set(undefined);};return (@@ -74,28 +73,39 @@ export const BreakpointsContainer = () => {<BreakpointsMenubreakpoints={breakpoints}selectedBreakpoint={selectedBreakpoint}- onEditClick={() => setEditorOpen(true)}+ open={breakpointsMenuView === "initial"}+ triggerOpen={breakpointsMenuView !== undefined}+ onOpenChange={(open) => {+ if (open) {+ $breakpointsMenuView.set("initial");+ return;+ }+ if ($breakpointsMenuView.get() === "initial") {+ $breakpointsMenuView.set(undefined);+ }+ }}+ onEditClick={() => $breakpointsMenuView.set("editor")}/>)}<BreakpointsEditor- open={editorOpen}- onOpenChange={setEditorOpen}+ open={breakpointsMenuView === "editor"}+ onOpenChange={(open) => {+ $breakpointsMenuView.set(open ? "editor" : undefined);+ }}onDelete={(breakpoint) => {setBreakpointToDelete(breakpoint);- setEditorOpen(false);- setConfirmationOpen(true);+ $breakpointsMenuView.set("confirmation");}}><div style={{ height: "100%", width: 0 }} /></BreakpointsEditor>{breakpointToDelete && (<ConfirmationDialog- open={confirmationOpen}+ open={breakpointsMenuView === "confirmation"}breakpoint={breakpointToDelete}onAbort={() => {setBreakpointToDelete(undefined);- setConfirmationOpen(false);- setEditorOpen(true);+ $breakpointsMenuView.set("editor");}}onConfirm={handleDelete}/>diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsxindex 2d36440a77..b5cfa13344 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-menu.tsx@@ -1,4 +1,3 @@-import { useState } from "react";import type { Breakpoint, Breakpoints } from "@webstudio-is/sdk";import {Flex,@@ -20,32 +19,37 @@ import { setCanvasWidth } from "../../shared/calc-canvas-width";type BreakpointsMenuProps = {breakpoints: Breakpoints;selectedBreakpoint: Breakpoint;+ open: boolean;+ triggerOpen: boolean;+ onOpenChange: (open: boolean) => void;onEditClick: () => void;};export const BreakpointsMenu = ({breakpoints,selectedBreakpoint,+ open,+ triggerOpen,+ onOpenChange,onEditClick,}: BreakpointsMenuProps) => {- const [dropdownOpen, setDropdownOpen] = useState(false);const grouped = groupBreakpoints(Array.from(breakpoints.values()));const selectedCustom = grouped.custom.find((bp) => bp.id === selectedBreakpoint.id);return (- <DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>+ <DropdownMenu open={open} onOpenChange={onOpenChange}><DropdownMenuTrigger asChild><ToolbarButtonvariant="subtle"aria-label="Breakpoints with custom conditions"- data-state={selectedCustom ? "on" : "off"}+ data-state={triggerOpen ? "open" : selectedCustom ? "on" : "off"}>{selectedCustom ? selectedCustom.label : <EllipsesIcon />}</ToolbarButton></DropdownMenuTrigger>- <DropdownMenuContent css={{ width: theme.spacing[30] }}>+ <DropdownMenuContent sideOffset={4} css={{ width: theme.spacing[30] }}>{grouped.widthBased.map((breakpoint) => {let description = "All Sizes";if (breakpoint.minWidth !== undefined) {@@ -107,7 +111,6 @@ export const BreakpointsMenu = ({<Buttoncolor="neutral"onClick={() => {- setDropdownOpen(false);onEditClick();}}css={{ width: "100%" }}diff --git a/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsx b/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsxindex b1619113c5..9df56d00a6 100644--- a/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/canvas-settings-popover.tsx@@ -46,7 +46,6 @@ export const CanvasSettingsPopover = () => {</ToolbarButton></PopoverTrigger><PopoverContent- sideOffset={0}collisionPadding={4}align="start"css={{ width: theme.spacing[30] }}