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
feat: Resizable left-side panels like navigator (#5503)
Oleg Isonenf63b5cae8d7e
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 3e58004797..be410fe88e 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -4,7 +4,14 @@ import { TooltipProvider } from "@radix-ui/react-tooltip";import { usePublish, $publisher } from "~/shared/pubsub";import type { Build } from "@webstudio-is/project-build";import type { Project } from "@webstudio-is/project";-import { theme, Box, type CSS, Flex, Grid } from "@webstudio-is/design-system";+import {+ theme,+ Box,+ type CSS,+ Flex,+ Grid,+ rawTheme,+} from "@webstudio-is/design-system";import type { AuthPermit } from "@webstudio-is/trpc-interface/index.server";import { registerContainers, createObjectPool } from "~/shared/sync";import {@@ -12,7 +19,6 @@ import {startProjectSync,useSyncServer,} from "./shared/sync/sync-server";-import { SidebarLeft } from "./sidebar-left";import { Inspector } from "./inspector";import { Topbar } from "./features/topbar";import { Footer } from "./features/footer";@@ -48,7 +54,6 @@ import {$dataLoadingState,$isCloneDialogOpen,$loadingState,- type SidebarPanelName,} from "./shared/nano-states";import { CloneProjectDialog } from "~/shared/clone-project";import type { TokenPermissions } from "@webstudio-is/authorization-token";@@ -72,6 +77,8 @@ import { useInertHandlers } from "./shared/inert-handlers";import { TextToolbar } from "./features/workspace/canvas-tools/text-toolbar";import { SyncClient } from "~/shared/sync-client";import { RemoteDialog } from "./features/help/remote-dialog";+import type { SidebarPanelName } from "./sidebar-left/types";+import { SidebarLeft } from "./sidebar-left/sidebar-left";registerContainers();@@ -143,10 +150,12 @@ const getChromeLayout = ({isPreviewMode,navigatorLayout,activeSidebarPanel,+ leftSidebarWidth,}: {isPreviewMode: boolean;navigatorLayout: Settings["navigatorLayout"];activeSidebarPanel?: SidebarPanelName;+ leftSidebarWidth: number;}) => {if (isPreviewMode) {return {@@ -161,7 +170,7 @@ const getChromeLayout = ({if (navigatorLayout === "undocked" && activeSidebarPanel !== "none") {return {- gridTemplateColumns: `auto ${theme.sizes.sidebarWidth} 1fr ${theme.sizes.sidebarWidth}`,+ gridTemplateColumns: `auto ${leftSidebarWidth}px 1fr ${theme.sizes.sidebarWidth}`,gridTemplateAreas: `"header header header header""sidebar navigator main inspector"@@ -180,16 +189,26 @@ const getChromeLayout = ({};};+const defaultSidebarWidth = Number.parseFloat(rawTheme.spacing[30]);+const ChromeWrapper = ({children,isPreviewMode,navigatorLayout,}: ChromeWrapperProps) => {const activeSidebarPanel = useStore($activeSidebarPanel);+ const settings = useStore($settings);+ const leftSidebarWidth =+ activeSidebarPanel === "none"+ ? defaultSidebarWidth+ : (settings.sidebarPanelWidths[activeSidebarPanel] ??+ defaultSidebarWidth);+const gridLayout = getChromeLayout({isPreviewMode,navigatorLayout,activeSidebarPanel,+ leftSidebarWidth,});return (@@ -366,6 +385,13 @@ export const Builder = ({isPreviewMode={isPreviewMode}navigatorLayout={navigatorLayout}>+ <Box+ data-dialog-boundary+ css={{+ gridArea: "sidebar / sidebar / main / inspector",+ pointerEvents: "none",+ }}+ /><ProjectSettings /><Main><Workspace>@@ -378,15 +404,10 @@ export const Builder = ({)}</Workspace></Main>+ <Main css={{ pointerEvents: "none" }}>+ <CanvasToolsContainer />+ </Main>- <SidePanel- gridArea="sidebar"- css={{- order: navigatorLayout === "docked" ? 1 : undefined,- }}- >- <SidebarLeft publish={publish} />- </SidePanel><SidePanelgridArea="inspector"isPreviewMode={isPreviewMode}@@ -406,9 +427,14 @@ export const Builder = ({><Inspector navigatorLayout={navigatorLayout} /></SidePanel>- <Main css={{ pointerEvents: "none" }}>- <CanvasToolsContainer />- </Main>+ <SidePanel+ gridArea="sidebar"+ css={{+ order: navigatorLayout === "docked" ? 1 : undefined,+ }}+ >+ <SidebarLeft publish={publish} />+ </SidePanel><Topbarproject={project}hasProPlan={userPlanFeatures.hasProPlan}diff --git a/apps/builder/app/builder/features/assets/assets.tsx b/apps/builder/app/builder/features/assets/assets.tsxindex 245b7e51ad..3fc36873a4 100644--- a/apps/builder/app/builder/features/assets/assets.tsx+++ b/apps/builder/app/builder/features/assets/assets.tsx@@ -1,29 +1,10 @@-import {- Button,- PanelTitle,- Separator,- Tooltip,-} from "@webstudio-is/design-system";-import { XIcon } from "@webstudio-is/icons";+import { PanelTitle, Separator } from "@webstudio-is/design-system";import { ImageManager } from "~/builder/shared/image-manager";-export const AssetsPanel = ({ onClose }: { onClose: () => void }) => {+export const AssetsPanel = (_props: { onClose: () => void }) => {return (<>- <PanelTitle- suffix={- <Tooltip content="Close panel" side="bottom">- <Button- color="ghost"- prefix={<XIcon />}- aria-label="Close panel"- onClick={onClose}- />- </Tooltip>- }- >- Assets- </PanelTitle>+ <PanelTitle>Assets</PanelTitle><Separator /><ImageManager /></>diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsxindex c9481d683a..053131e766 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx@@ -38,8 +38,8 @@ import {minCanvasWidth,} from "~/shared/breakpoints";import { $scale } from "~/builder/shared/nano-states";-import { setCanvasWidth } from "./use-set-initial-canvas-width";import { serverSyncStore } from "~/shared/sync";+import { setCanvasWidth } from "~/builder/shared/calc-canvas-width";export const BreakpointsPopover = () => {const view = useStore($breakpointsMenuView);diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsxindex 5bd68fe19f..99bf435e45 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx@@ -16,7 +16,7 @@ import {$selectedBreakpointId,} from "~/shared/nano-states";import { groupBreakpoints, isBaseBreakpoint } from "~/shared/breakpoints";-import { setCanvasWidth } from "./use-set-initial-canvas-width";+import { setCanvasWidth } from "../../shared/calc-canvas-width";import { $canvasWidth } from "~/builder/shared/nano-states";import { useDebouncedCallback } from "use-debounce";diff --git a/apps/builder/app/builder/features/breakpoints/index.ts b/apps/builder/app/builder/features/breakpoints/index.tsindex 42f7854f36..465cf5dabd 100644--- a/apps/builder/app/builder/features/breakpoints/index.ts+++ b/apps/builder/app/builder/features/breakpoints/index.ts@@ -1,3 +1,2 @@export * from "./breakpoints-popover";export * from "./breakpoints-selector-container";-export * from "./use-set-initial-canvas-width";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.tsdeleted file mode 100644index 321e9ad16c..0000000000--- a/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts+++ /dev/null@@ -1,70 +0,0 @@-import { useEffect } from "react";-import type { Breakpoint } from "@webstudio-is/sdk";-import { $workspaceRect, $canvasWidth } from "~/builder/shared/nano-states";-import {- $breakpoints,- $isPreviewMode,- $selectedBreakpoint,-} from "~/shared/nano-states";-import { calcCanvasWidth } from "./calc-canvas-width";--export const setCanvasWidth = (breakpointId: Breakpoint["id"]) => {- const workspaceRect = $workspaceRect.get();- const breakpoints = $breakpoints.get();- const selectedBreakpoint = breakpoints.get(breakpointId);-- if (workspaceRect === undefined || selectedBreakpoint === undefined) {- return false;- }-- const width = calcCanvasWidth({- breakpoints: Array.from(breakpoints.values()),- selectedBreakpoint,- workspaceWidth: workspaceRect.width,- });-- $canvasWidth.set(width);- return true;-};--/**- * Update canvas width initially and on breakpoint change- **/-export const useSetCanvasWidth = () => {- useEffect(() => {- const update = () => {- const selectedBreakpoint = $selectedBreakpoint.get();- if (selectedBreakpoint) {- // When there is selected breakpoint, we want to find the smallest possible size- // that is bigger than any max-width breakpoints and smaller than any min-width breakpoints.- // When on base breakpoint it will be the biggest possible but smaller than the workspace.- setCanvasWidth(selectedBreakpoint.id);- }- };-- const unsubscribeBreakpoints = $breakpoints.subscribe(update);- const unsubscribeRect = $workspaceRect.listen(update);- const unsubscribeIsPreviewMode = $isPreviewMode.listen((isPreviewMode) => {- if (isPreviewMode) {- update();- }- });- const unsubscribeSelectedBreakpoint = $selectedBreakpoint.listen(- (selectedBreakpoint) => {- // This will set initial width of the canvas once the initial selected breakpoint is known.- if (selectedBreakpoint) {- update();- // We can unsubscribe right away as we only need this once.- unsubscribeSelectedBreakpoint();- }- }- );-- return () => {- unsubscribeBreakpoints();- unsubscribeRect();- unsubscribeIsPreviewMode();- unsubscribeSelectedBreakpoint();- };- }, []);-};diff --git a/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsx b/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsxindex c3736907ee..778f11fd1c 100644--- a/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsx+++ b/apps/builder/app/builder/features/command-panel/groups/breakpoints-group.tsx@@ -13,9 +13,9 @@ import {$selectedBreakpoint,$selectedBreakpointId,} from "~/shared/nano-states";-import { setCanvasWidth } from "~/builder/features/breakpoints";import { closeCommandPanel } from "../command-state";import type { BaseOption } from "../shared/types";+import { setCanvasWidth } from "~/builder/shared/calc-canvas-width";export type BreakpointOption = BaseOption & {type: "breakpoint";diff --git a/apps/builder/app/builder/features/components/components.tsx b/apps/builder/app/builder/features/components/components.tsxindex 139e73d76e..6115643d91 100644--- a/apps/builder/app/builder/features/components/components.tsx+++ b/apps/builder/app/builder/features/components/components.tsx@@ -2,7 +2,6 @@ import { useState } from "react";import { matchSorter } from "match-sorter";import { computed } from "nanostores";import { useStore } from "@nanostores/react";-import { XIcon } from "@webstudio-is/icons";import { isFeatureEnabled } from "@webstudio-is/feature-flags";import {type WsComponentMeta,@@ -23,10 +22,7 @@ import {findNextListItemIndex,Text,Box,- Grid,PanelTitle,- Tooltip,- Button,} from "@webstudio-is/design-system";import { CollapsibleSection } from "~/builder/shared/collapsible-section";import { dragItemAttribute, useDraggable } from "./use-draggable";@@ -240,7 +236,7 @@ export const ComponentsPanel = ({const { metasByCategory, availableComponents } = useStore($metas);- const { dragCard, draggableContainerRef } = useDraggable({+ const { dragCard, draggableContainerRef, isDragging } = useDraggable({publish,availableComponents,});@@ -253,20 +249,7 @@ export const ComponentsPanel = ({return (<>- <PanelTitle- suffix={- <Tooltip content="Close panel" side="bottom">- <Button- color="ghost"- prefix={<XIcon />}- aria-label="Close panel"- onClick={onClose}- />- </Tooltip>- }- >- Components- </PanelTitle>+ <PanelTitle>Components</PanelTitle><Separator /><Box css={{ padding: theme.panel.padding }}>@@ -286,9 +269,9 @@ export const ComponentsPanel = ({fullWidth><List asChild>- <Grid+ <Flexgap="1"- columns="3"+ wrap="wrap"css={{paddingInline: theme.panel.paddingInline,overflow: "auto",@@ -309,8 +292,11 @@ export const ComponentsPanel = ({><ComponentCard{...{ [dragItemAttribute]: meta.name }}+ // Too hard to calculate, goal was to have 3 cards in one row on the smallest width and to fill it at the same ime+ css={{ width: 69 }}label={meta.label}description={meta.description}+ disableTooltip={isDragging}icon={<InstanceIconsize="auto"@@ -328,7 +314,7 @@ export const ComponentsPanel = ({<Text>No matching component</Text></Flex>)}- </Grid>+ </Flex></List></CollapsibleSection>))}diff --git a/apps/builder/app/builder/features/components/use-draggable.tsx b/apps/builder/app/builder/features/components/use-draggable.tsxindex 1b5b0ccaf4..c65f24f257 100644--- a/apps/builder/app/builder/features/components/use-draggable.tsx+++ b/apps/builder/app/builder/features/components/use-draggable.tsx@@ -90,6 +90,7 @@ export const useDraggable = ({availableComponents: Set<string>;}) => {const [dragComponent, setDragComponent] = useState<Instance["component"]>();+ const [isDragging, setIsDragging] = useState(false);const [point, setPoint] = useState<Point>({ x: 0, y: 0 });const canvasRect = useStore($canvasRect);const scale = useStore($scale);@@ -102,6 +103,7 @@ export const useDraggable = ({},onStart({ data: componentName }) {setDragComponent(componentName);+ setIsDragging(true);publish({type: "dragStart",payload: {@@ -123,6 +125,7 @@ export const useDraggable = ({},onEnd({ isCanceled }) {setDragComponent(undefined);+ setIsDragging(false);publish({type: "dragEnd",payload: { isCanceled },@@ -143,5 +146,6 @@ export const useDraggable = ({return {dragCard,draggableContainerRef: dragHandlers.rootRef,+ isDragging,};};diff --git a/apps/builder/app/builder/features/marketplace/about.tsx b/apps/builder/app/builder/features/marketplace/about.tsxindex de268b395d..afca4a79dd 100644--- a/apps/builder/app/builder/features/marketplace/about.tsx+++ b/apps/builder/app/builder/features/marketplace/about.tsx@@ -1,5 +1,5 @@import {- Button,+ DialogClose,Flex,Link,PanelTitle,@@ -11,16 +11,10 @@ import {truncate,} from "@webstudio-is/design-system";import type { MarketplaceOverviewItem } from "~/shared/marketplace/types";-import { ChevronsLeftIcon, ExternalLinkIcon } from "@webstudio-is/icons";+import { ExternalLinkIcon } from "@webstudio-is/icons";import { builderUrl } from "~/shared/router-utils";-export const About = ({- item,- onClose,-}: {- item?: MarketplaceOverviewItem;- onClose: () => void;-}) => {+export const About = ({ item }: { item?: MarketplaceOverviewItem }) => {if (item === undefined) {return;}@@ -29,23 +23,7 @@ export const About = ({return (<>- <PanelTitle- suffix={- <Tooltip content="Close" side="bottom">- <Button- onClick={onClose}- aria-label="Close"- prefix={<ChevronsLeftIcon />}- color="ghost"- // Tab should go:- // trought form fields -> create button -> cancel button- tabIndex={3}- />- </Tooltip>- }- >- {item.name}- </PanelTitle>+ <PanelTitle suffix={<DialogClose />}>{item.name}</PanelTitle><Separator /><Flexdiff --git a/apps/builder/app/builder/features/marketplace/marketplace.tsx b/apps/builder/app/builder/features/marketplace/marketplace.tsxindex 9cadbb3042..c2a4a122d7 100644--- a/apps/builder/app/builder/features/marketplace/marketplace.tsx+++ b/apps/builder/app/builder/features/marketplace/marketplace.tsx@@ -1,11 +1,10 @@-import { XIcon, SpinnerIcon } from "@webstudio-is/icons";+import { SpinnerIcon } from "@webstudio-is/icons";import {- Button,Flex,PanelTitle,rawTheme,Separator,- Tooltip,+ FloatingPanel,} from "@webstudio-is/design-system";import { Overview } from "./overview";import { Templates } from "./templates";@@ -13,11 +12,10 @@ import { useEffect, useState } from "react";import { toWebstudioData } from "./utils";import type { MarketplaceOverviewItem } from "~/shared/marketplace/types";import type { Project } from "@webstudio-is/project";-import { ExtendedPanel } from "~/builder/shared/extended-sidebar-panel";import { About } from "./about";import { trpcClient } from "~/shared/trpc/trpc-client";-export const MarketplacePanel = ({ onClose }: { onClose: () => void }) => {+export const MarketplacePanel = (_props: { onClose: () => void }) => {const [activeOverviewItem, setAciveOverviewItem] =useState<MarketplaceOverviewItem>();const [openAbout, setOpenAbout] = useState<Project["id"]>();@@ -40,21 +38,8 @@ export const MarketplacePanel = ({ onClose }: { onClose: () => void }) => {activeOverviewItem && buildData?.projectId === activeOverviewItem.projectId;return (- <>- <PanelTitle- suffix={- <Tooltip content="Close panel" side="bottom">- <Button- color="ghost"- prefix={<XIcon />}- aria-label="Close panel"- onClick={onClose}- />- </Tooltip>- }- >- Marketplace- </PanelTitle>+ <div data-floating-panel-container>+ <PanelTitle>Marketplace</PanelTitle><Separator /><Overviewitems={items}@@ -88,15 +73,20 @@ export const MarketplacePanel = ({ onClose }: { onClose: () => void }) => {</Flex>)}{openAboutItem !== undefined && (- <ExtendedPanel>- <About- item={openAboutItem}- onClose={() => {+ <FloatingPanel+ content={<About item={openAboutItem} />}+ placement="right-start"+ width={Number.parseFloat(rawTheme.spacing[35])}+ open={true}+ onOpenChange={(isOpen) => {+ if (!isOpen) {setOpenAbout(undefined);- }}- />- </ExtendedPanel>+ }+ }}+ >+ <span style={{ display: "none" }} />+ </FloatingPanel>)}- </>+ </div>);};diff --git a/apps/builder/app/builder/features/navigator/navigator.tsx b/apps/builder/app/builder/features/navigator/navigator.tsxindex 2a9740a51d..cc7bbd4e1e 100644--- a/apps/builder/app/builder/features/navigator/navigator.tsx+++ b/apps/builder/app/builder/features/navigator/navigator.tsx@@ -1,34 +1,14 @@-import {- Button,- Flex,- PanelTitle,- Separator,- Tooltip,-} from "@webstudio-is/design-system";-import { XIcon } from "@webstudio-is/icons";+import { Flex, PanelTitle, Separator } from "@webstudio-is/design-system";import { CssPreview } from "./css-preview";import { NavigatorTree } from "./navigator-tree";import { $isDesignMode } from "~/shared/nano-states";import { useStore } from "@nanostores/react";-export const NavigatorPanel = ({ onClose }: { onClose: () => void }) => {+export const NavigatorPanel = (_props: { onClose: () => void }) => {const isDesignMode = useStore($isDesignMode);return (<>- <PanelTitle- suffix={- <Tooltip content="Close panel" side="bottom">- <Button- onClick={onClose}- color="ghost"- prefix={<XIcon />}- aria-label="Close panel"- />- </Tooltip>- }- >- Navigator- </PanelTitle>+ <PanelTitle>Navigator</PanelTitle><Separator /><Flex grow direction="column" justify="end"><NavigatorTree />diff --git a/apps/builder/app/builder/features/pages/folder-settings.tsx b/apps/builder/app/builder/features/pages/folder-settings.tsxindex eee11c1723..49173ce7f2 100644--- a/apps/builder/app/builder/features/pages/folder-settings.tsx+++ b/apps/builder/app/builder/features/pages/folder-settings.tsx@@ -10,20 +10,15 @@ import {InputErrorsTooltip,InputField,Label,- PanelTitle,+ DialogTitleActions,ScrollArea,- Separator,Text,TitleSuffixSpacer,Tooltip,rawTheme,theme,} from "@webstudio-is/design-system";-import {- ChevronsLeftIcon,- InfoCircleIcon,- TrashIcon,-} from "@webstudio-is/icons";+import { InfoCircleIcon, TrashIcon } from "@webstudio-is/icons";import {Folder,Pages,@@ -265,7 +260,6 @@ export const NewFolderSettings = ({const NewFolderSettingsView = ({onSubmit,isSubmitting,- onClose,children,}: {onSubmit: () => void;@@ -275,20 +269,9 @@ const NewFolderSettingsView = ({}) => {return (<>- <PanelTitle+ <DialogTitlesuffix={- <>- <Tooltip content="Cancel" side="bottom">- <Button- onClick={onClose}- aria-label="Cancel"- prefix={<ChevronsLeftIcon />}- color="ghost"- // Tab should go:- // trought form fields -> create button -> cancel button- tabIndex={3}- />- </Tooltip>+ <DialogTitleActions><TitleSuffixSpacer /><Buttonstate={isSubmitting ? "pending" : "auto"}@@ -297,12 +280,12 @@ const NewFolderSettingsView = ({>{isSubmitting ? "Creating" : "Create folder"}</Button>- </>+ <DialogClose />+ </DialogTitleActions>}>New Folder Settings- </PanelTitle>- <Separator />+ </DialogTitle><Form onSubmit={onSubmit}>{children}</Form></>);@@ -466,9 +449,9 @@ const FolderSettingsView = ({return (<>- <PanelTitle+ <DialogTitlesuffix={- <>+ <DialogTitleActions>{isDesignMode && (<Tooltip content="Delete folder" side="bottom"><Button@@ -480,15 +463,7 @@ const FolderSettingsView = ({/></Tooltip>)}- <Tooltip content="Close folder settings" side="bottom">- <Button- color="ghost"- prefix={<ChevronsLeftIcon />}- onClick={onClose}- aria-label="Close folder settings"- tabIndex={2}- />- </Tooltip>+ <DialogClose />{showDeleteConfirmation && (<DeleteConfirmationDialogfolder={folder}@@ -498,12 +473,11 @@ const FolderSettingsView = ({onConfirm={onDelete}/>)}- </>+ </DialogTitleActions>}>Folder Settings- </PanelTitle>- <Separator />+ </DialogTitle><Form onSubmit={onClose}>{children}</Form></>);diff --git a/apps/builder/app/builder/features/pages/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings.tsxindex ea951a8f40..98075579c5 100644--- a/apps/builder/app/builder/features/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/pages/page-settings.tsx@@ -53,17 +53,15 @@ import {PanelBanner,css,Switch,- PanelTitle,TitleSuffixSpacer,- FloatingPanelProvider,ProBadge,Dialog,DialogClose,DialogContent,DialogTitle,+ DialogTitleActions,} from "@webstudio-is/design-system";import {- ChevronsLeftIcon,CopyIcon,TrashIcon,HomeIcon,@@ -1248,7 +1246,6 @@ export const NewPageSettings = ({const NewPageSettingsView = ({onSubmit,isSubmitting,- onClose,children,}: {onSubmit: () => void;@@ -1258,20 +1255,9 @@ const NewPageSettingsView = ({}) => {return (<>- <PanelTitle+ <DialogTitlesuffix={- <>- <Tooltip content="Cancel" side="bottom">- <Button- onClick={onClose}- aria-label="Cancel"- prefix={<ChevronsLeftIcon />}- color="ghost"- // Tab should go:- // trought form fields -> create button -> cancel button- tabIndex={3}- />- </Tooltip>+ <DialogTitleActions><TitleSuffixSpacer /><Buttonstate={isSubmitting ? "pending" : "auto"}@@ -1280,12 +1266,12 @@ const NewPageSettingsView = ({>{isSubmitting ? "Creating" : "Create page"}</Button>- </>+ <DialogClose />+ </DialogTitleActions>}>New Page Settings- </PanelTitle>- <Separator />+ </DialogTitle><Form onSubmit={onSubmit}>{children}</Form></>);@@ -1657,9 +1643,9 @@ const PageSettingsView = ({const containerRef = useRef<HTMLFormElement>(null);return (<>- <PanelTitle+ <DialogTitlesuffix={- <>+ <DialogTitleActions>{isDesignMode && onDelete && (<Tooltip content="Delete page" side="bottom"><Button@@ -1682,29 +1668,17 @@ const PageSettingsView = ({/></Tooltip>)}-- <Tooltip content="Close page settings" side="bottom">- <Button- color="ghost"- prefix={<ChevronsLeftIcon />}- onClick={onClose}- aria-label="Close page settings"- tabIndex={2}- />- </Tooltip>- </>+ <DialogClose />+ </DialogTitleActions>}>Page Settings- </PanelTitle>- <Separator />- <FloatingPanelProvider container={containerRef}>- <Form onSubmit={onClose} ref={containerRef}>- <fieldset style={{ display: "contents" }} disabled={!isDesignMode}>- {children}- </fieldset>- </Form>- </FloatingPanelProvider>+ </DialogTitle>+ <Form onSubmit={onClose} ref={containerRef} data-floating-panel-container>+ <fieldset style={{ display: "contents" }} disabled={!isDesignMode}>+ {children}+ </fieldset>+ </Form></>);};diff --git a/apps/builder/app/builder/features/pages/pages.tsx b/apps/builder/app/builder/features/pages/pages.tsxindex ef5d8f6187..89434f846f 100644--- a/apps/builder/app/builder/features/pages/pages.tsx+++ b/apps/builder/app/builder/features/pages/pages.tsx@@ -13,6 +13,8 @@ import {type TreeDropTarget,toast,ScrollArea,+ FloatingPanel,+ rawTheme,} from "@webstudio-is/design-system";import {ChevronRightIcon,@@ -23,9 +25,7 @@ import {NewPageIcon,PageIcon,DynamicPageIcon,- XIcon,} from "@webstudio-is/icons";-import { ExtendedPanel } from "../../shared/extended-sidebar-panel";import { NewPageSettings, PageSettings } from "./page-settings";import {$editingPageId,@@ -525,13 +525,14 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {const editingItemId = useStore($editingPageId);const pages = useStore($pages);const isDesignMode = useStore($isDesignMode);+ const containerRef = useRef<HTMLDivElement>(null);if (currentPage === undefined || pages === undefined) {return;}return (- <>+ <div ref={containerRef} data-floating-panel-container><PanelTitlesuffix={<>@@ -563,14 +564,6 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {</Tooltip></>)}- <Tooltip content="Close panel" side="bottom">- <Button- color="ghost"- prefix={<XIcon />}- aria-label="Close panel"- onClick={onClose}- />- </Tooltip></>}>@@ -594,9 +587,9 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {}}/>{editingItemId !== undefined && (- <ExtendedPanel>- <>- {isFolder(editingItemId, pages.folders) ? (+ <FloatingPanel+ content={+ isFolder(editingItemId, pages.folders) ? (<FolderEditoreditingFolderId={editingItemId}onClose={() => $editingPageId.set(undefined)}@@ -606,10 +599,20 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {editingPageId={editingItemId}onClose={() => $editingPageId.set(undefined)}/>- )}- </>- </ExtendedPanel>+ )+ }+ placement="right-start"+ width={Number.parseFloat(rawTheme.spacing[35])}+ open={true}+ onOpenChange={(isOpen) => {+ if (!isOpen) {+ $editingPageId.set(undefined);+ }+ }}+ >+ <span style={{ display: "none" }} />+ </FloatingPanel>)}- </>+ </div>);};diff --git a/apps/builder/app/builder/features/project-settings/image-control.tsx b/apps/builder/app/builder/features/project-settings/image-control.tsxindex 1fdceeb7f0..0e472dc523 100644--- a/apps/builder/app/builder/features/project-settings/image-control.tsx+++ b/apps/builder/app/builder/features/project-settings/image-control.tsx@@ -10,6 +10,7 @@ export const ImageControl = (props: {return (<FloatingPaneltitle="Images"+ placement="bottom-within"content={<ImageManageronChange={(assetId) => {diff --git a/apps/builder/app/builder/features/project-settings/project-settings.tsx b/apps/builder/app/builder/features/project-settings/project-settings.tsxindex 5bf95e9bd8..8676b91d83 100644--- a/apps/builder/app/builder/features/project-settings/project-settings.tsx+++ b/apps/builder/app/builder/features/project-settings/project-settings.tsx@@ -59,6 +59,7 @@ export const ProjectSettingsView = ({Number.parseInt(rightPanelWidth, 10)}height={Number.parseInt(rawTheme.spacing[35], 10)}+ data-floating-panel-container><fieldset style={{ display: "contents" }} disabled={!isDesignMode}><Flex grow>diff --git a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx b/apps/builder/app/builder/features/project-settings/section-marketplace.tsxindex 35020cf797..3b64b475ac 100644--- a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx+++ b/apps/builder/app/builder/features/project-settings/section-marketplace.tsx@@ -297,6 +297,7 @@ export const SectionMarketplace = () => {autoGrowmaxRows={10}value={data.description ?? ""}+ color={errors?.description && "error"}onChange={handleSave("description")}/></InputErrorsTooltip>diff --git a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsxindex 4eaba6a2db..22019064c2 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/animation/animation-section.tsx@@ -431,7 +431,7 @@ export const AnimationSection = ({action={<FloatingPaneltitle="Advanced Animation"- placement="bottom"+ placement="bottom-within"content={<AnimationConfig value={value} onChange={handleChange} />}diff --git a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsxindex 99d911030a..60105e712d 100644--- a/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/font-family/font-family-control.tsx@@ -67,6 +67,7 @@ export const FontFamilyControl = () => {<Combobox<Item>suffix={<FloatingPanel+ placement="left-start"title="Fonts"onOpenChange={setIsFontMangerOpen}content={diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsxindex ba1dc999cf..c994efbffb 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.stories.tsx@@ -1,9 +1,6 @@import { useEffect, useRef } from "react";import { getStyleDeclKey, type StyleDecl } from "@webstudio-is/sdk";-import {- FloatingPanel,- FloatingPanelProvider,-} from "@webstudio-is/design-system";+import { FloatingPanel } from "@webstudio-is/design-system";import { createDefaultPages } from "@webstudio-is/project-build";import {$breakpoints,@@ -68,17 +65,19 @@ const BackgroundStory = ({ styleValue }: { styleValue: StyleValue }) => {return (<>- <div ref={elementRef} style={{ marginLeft: "400px" }}></div>+ <div+ ref={elementRef}+ style={{ marginLeft: "400px" }}+ data-floating-panel-container+ ></div>- <FloatingPanelProvider container={elementRef}>- <FloatingPanel- open- title="Background"- content={<BackgroundContent index={0} />}- >- <button>Trigger</button>- </FloatingPanel>- </FloatingPanelProvider>+ <FloatingPanel+ open+ title="Background"+ content={<BackgroundContent index={0} />}+ >+ <button>Trigger</button>+ </FloatingPanel></>);};diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsxindex ad4f3aa7b0..cbf4666b9a 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-image.tsx@@ -1,11 +1,5 @@import type { StyleValue } from "@webstudio-is/css-engine";-import {- Flex,- theme,- FloatingPanelProvider,- Grid,- Box,-} from "@webstudio-is/design-system";+import { Flex, theme, Grid, Box } from "@webstudio-is/design-system";import { useRef, useCallback } from "react";import { ImageControl } from "../../controls";import { PropertyInlineLabel } from "../../property-label";@@ -72,10 +66,12 @@ export const BackgroundImage = ({ index }: { index: number }) => {label="Image"description={propertyDescriptions.backgroundImage}/>- <Box css={{ gridColumn: "span 2" }}>- <FloatingPanelProvider container={elementRef}>- <ImageControl property="background-image" index={index} />- </FloatingPanelProvider>+ <Box+ css={{ gridColumn: "span 2" }}+ ref={elementRef}+ data-floating-panel-container+ >+ <ImageControl property="background-image" index={index} /></Box></Grid><BackgroundCodeEditor index={index} onValidate={handleValidate} />diff --git a/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx b/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsxindex e1175682b3..945af2a9e6 100644--- a/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/flex-child/flex-child.tsx@@ -252,7 +252,7 @@ const FlexChildSectionSizingPopover = () => {return (<FloatingPaneltitle="Sizing"- placement="bottom"+ placement="bottom-within"content={<Gridgap="3"@@ -400,7 +400,7 @@ const FlexChildSectionOrderPopover = () => {return (<FloatingPaneltitle="Order"- placement="bottom"+ placement="bottom-within"content={<Grid css={{ padding: theme.panel.padding }}><Grid css={{ gridTemplateColumns: "4fr 6fr" }} gap={2}>diff --git a/apps/builder/app/builder/features/style-panel/sections/size/size.tsx b/apps/builder/app/builder/features/style-panel/sections/size/size.tsxindex b8fbbe7352..17c619c1e7 100644--- a/apps/builder/app/builder/features/style-panel/sections/size/size.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/size/size.tsx@@ -46,7 +46,7 @@ const ObjectPosition = () => {<Flex justify="end"><FloatingPaneltitle="Object Position"- placement="bottom"+ placement="bottom-within"content={<Flex css={{ padding: theme.panel.padding }}><PositionControl property="object-position" styleDecl={styleDecl} />diff --git a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsxindex de0d74cf92..5b218d994f 100644--- a/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/transforms/transforms.tsx@@ -106,7 +106,7 @@ const TransformAdvancedPopover = () => {return (<FloatingPaneltitle="Advanced Transform"- placement="bottom"+ placement="bottom-within"content={<Grid gap="2" css={{ padding: theme.panel.padding }}><Grid css={{ gridTemplateColumns: `2fr 1fr` }}>diff --git a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsxindex 0e68c2c876..ac2c1f1957 100644--- a/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/typography/typography.tsx@@ -278,7 +278,7 @@ const TypographySectionAdvancedPopover = () => {return (<FloatingPaneltitle="Advanced Typography"- placement="bottom"+ placement="bottom-within"content={<Gridcss={{diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsxindex 6e6073e347..63fd5f0cd5 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/value-editor-dialog.tsx@@ -90,7 +90,7 @@ export const ValueEditorDialog = ({return (<EditorDialogtitle="CSS Value"- placement="bottom"+ placement="bottom-within"height={200}width={Number.parseFloat(rawTheme.sizes.sidebarWidth)}content={diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsxindex 3a5625dc72..ea77b4419c 100644--- a/apps/builder/app/builder/features/workspace/workspace.tsx+++ b/apps/builder/app/builder/features/workspace/workspace.tsx@@ -8,10 +8,10 @@ import {} from "~/builder/shared/nano-states";import { $textEditingInstanceSelector } from "~/shared/nano-states";import { CanvasTools } from "./canvas-tools";-import { useSetCanvasWidth } from "../breakpoints";import { selectInstance } from "~/shared/awareness";import { ResizeHandles } from "./canvas-tools/resize-handles";import { MediaBadge } from "./canvas-tools/media-badge";+import { useSetCanvasWidth } from "~/builder/shared/calc-canvas-width";const workspaceStyle = css({flexGrow: 1,diff --git a/apps/builder/app/builder/inspector.tsx b/apps/builder/app/builder/inspector.tsxindex 144168677f..362accfc23 100644--- a/apps/builder/app/builder/inspector.tsx+++ b/apps/builder/app/builder/inspector.tsx@@ -16,7 +16,6 @@ import {Separator,Tooltip,Kbd,- FloatingPanelProvider,} from "@webstudio-is/design-system";import { ModeMenu, StylePanel } from "~/builder/features/style-panel";import { SettingsPanel } from "~/builder/features/settings-panel";@@ -38,8 +37,10 @@ import { InstanceIcon, getInstanceLabel } from "./shared/instance-label";const InstanceInfo = ({ instance }: { instance: Instance }) => {return (- <Flex shrink={false} gap="1" align="center">- <InstanceIcon instance={instance} />+ <Flex gap="1" align="center">+ <Flex shrink={false}>+ <InstanceIcon instance={instance} />+ </Flex><Text truncate variant="labelsSentenceCase">{getInstanceLabel(instance)}</Text>@@ -107,57 +108,71 @@ export const Inspector = ({ navigatorLayout }: InspectorProps) => {disableHoverableContent={false}skipDelayDuration={0}>- <FloatingPanelProvider container={tabsRef}>- <PanelTabs- ref={tabsRef}- value={- availablePanels.has(activeInspectorPanel)- ? activeInspectorPanel- : Array.from(availablePanels)[0]- }- onValueChange={(panel) => {- $activeInspectorPanel.set(panel as PanelName);- }}- asChild- >- <Flex direction="column">- <PanelTabsList>- {availablePanels.has("style") && (- <Tooltip- variant="wrapped"- content={- <Text>- CSS for the selected instance - <Kbd value={["S"]} color="moreSubtle" />- </Text>- }- >- <div>- <PanelTabsTrigger value="style">Style</PanelTabsTrigger>- </div>- </Tooltip>- )}- {availablePanels.has("settings") && (- <Tooltip- variant="wrapped"- content={- <Text>- Settings, properties and attributes of the selected- instance - <Kbd value={["D"]} color="moreSubtle" />- </Text>- }- >- <div>- <PanelTabsTrigger value="settings">- Settings- </PanelTabsTrigger>- </div>- </Tooltip>- )}- </PanelTabsList>- <Separator />- <PanelTabsContent value="style" css={contentStyle} tabIndex={-1}>+ <PanelTabs+ ref={tabsRef}+ data-floating-panel-container+ value={+ availablePanels.has(activeInspectorPanel)+ ? activeInspectorPanel+ : Array.from(availablePanels)[0]+ }+ onValueChange={(panel) => {+ $activeInspectorPanel.set(panel as PanelName);+ }}+ asChild+ >+ <Flex direction="column">+ <PanelTabsList>+ {availablePanels.has("style") && (+ <Tooltip+ variant="wrapped"+ content={+ <Text>+ CSS for the selected instance + <Kbd value={["S"]} color="moreSubtle" />+ </Text>+ }+ >+ <div>+ <PanelTabsTrigger value="style">Style</PanelTabsTrigger>+ </div>+ </Tooltip>+ )}+ {availablePanels.has("settings") && (+ <Tooltip+ variant="wrapped"+ content={+ <Text>+ Settings, properties and attributes of the selected+ instance + <Kbd value={["D"]} color="moreSubtle" />+ </Text>+ }+ >+ <div>+ <PanelTabsTrigger value="settings">Settings</PanelTabsTrigger>+ </div>+ </Tooltip>+ )}+ </PanelTabsList>+ <Separator />+ <PanelTabsContent value="style" css={contentStyle} tabIndex={-1}>+ <Flex+ justify="between"+ align="center"+ shrink={false}+ css={{+ paddingInline: theme.panel.paddingInline,+ height: theme.spacing[13],+ }}+ >+ <InstanceInfo instance={selectedInstance} />+ <ModeMenu />+ </Flex>+ <StylePanel $styleSourceInputElement={$styleSourceInputElement} />+ </PanelTabsContent>+ <PanelTabsContent value="settings" css={contentStyle} tabIndex={-1}>+ <ScrollArea><Flexjustify="between"align="center"@@ -168,34 +183,17 @@ export const Inspector = ({ navigatorLayout }: InspectorProps) => {}}><InstanceInfo instance={selectedInstance} />- <ModeMenu /></Flex>- <StylePanel $styleSourceInputElement={$styleSourceInputElement} />- </PanelTabsContent>- <PanelTabsContent value="settings" css={contentStyle} tabIndex={-1}>- <ScrollArea>- <Flex- justify="between"- align="center"- shrink={false}- css={{- paddingInline: theme.panel.paddingInline,- height: theme.spacing[13],- }}- >- <InstanceInfo instance={selectedInstance} />- </Flex>- <SettingsPanel- // Re-render when instance changes- key={selectedInstance.id}- selectedInstance={selectedInstance}- selectedInstanceKey={selectedInstanceKey}- />- </ScrollArea>- </PanelTabsContent>- </Flex>- </PanelTabs>- </FloatingPanelProvider>+ <SettingsPanel+ // Re-render when instance changes+ key={selectedInstance.id}+ selectedInstance={selectedInstance}+ selectedInstanceKey={selectedInstanceKey}+ />+ </ScrollArea>+ </PanelTabsContent>+ </Flex>+ </PanelTabs></EnhancedTooltipProvider>);};diff --git a/apps/builder/app/builder/shared/assets/asset-upload.tsx b/apps/builder/app/builder/shared/assets/asset-upload.tsxindex 1c8712bb67..867742c5ef 100644--- a/apps/builder/app/builder/shared/assets/asset-upload.tsx+++ b/apps/builder/app/builder/shared/assets/asset-upload.tsx@@ -83,24 +83,19 @@ const EnabledAssetUpload = ({ accept, type }: AssetUploadProps) => {return (<form onChange={onChange}>- <Flex>- <input- accept={accept ?? acceptMap[type]}- type="file"- name={type}- multiple- ref={inputRef}- style={{ display: "none" }}- />- <Button- type="button"- onClick={() => inputRef?.current?.click()}- css={{ flexGrow: 1 }}- prefix={<UploadIcon />}- >- Upload- </Button>- </Flex>+ <input+ accept={accept ?? acceptMap[type]}+ type="file"+ name={type}+ multiple+ ref={inputRef}+ style={{ display: "none" }}+ />+ <Button+ type="button"+ onClick={() => inputRef?.current?.click()}+ prefix={<UploadIcon />}+ ></Button></form>);};diff --git a/apps/builder/app/builder/shared/assets/assets-shell.tsx b/apps/builder/app/builder/shared/assets/assets-shell.tsxindex 5bc0595113..df10a17cd9 100644--- a/apps/builder/app/builder/shared/assets/assets-shell.tsx+++ b/apps/builder/app/builder/shared/assets/assets-shell.tsx@@ -164,14 +164,14 @@ export const AssetsShell = ({position: "relative",}}>- <Flex- css={{ padding: theme.panel.padding }}- gap="2"- direction="column"- shrink={false}- >+ <Flex css={{ padding: theme.panel.padding }} gap="2">+ <SearchField+ css={{ flexGrow: 1 }}+ {...searchProps}+ autoFocus+ placeholder="Search"+ /><AssetUpload type={type} accept={accept} />- <SearchField {...searchProps} autoFocus placeholder="Search" /></Flex><Separator />{isEmpty && <NotFound />}diff --git a/apps/builder/app/builder/features/breakpoints/calc-canvas-width.test.ts b/apps/builder/app/builder/shared/calc-canvas-width.test.tssimilarity index 63%rename from apps/builder/app/builder/features/breakpoints/calc-canvas-width.test.tsrename to apps/builder/app/builder/shared/calc-canvas-width.test.tsindex 44aaf28531..3517fa33ed 100644--- a/apps/builder/app/builder/features/breakpoints/calc-canvas-width.test.ts+++ b/apps/builder/app/builder/shared/calc-canvas-width.test.ts@@ -1,5 +1,29 @@-import { test, expect, describe } from "vitest";-import { calcCanvasWidth } from "./calc-canvas-width";+import { test, expect, describe, beforeEach } from "vitest";+import { calcCanvasWidth, setCanvasWidth } from "./calc-canvas-width";+import { $workspaceRect, $canvasWidth } from "~/builder/shared/nano-states";+import { $breakpoints } from "~/shared/nano-states";++// Helper to create a DOMRect-like object for testing+const createRect = (width: number, height: number): DOMRect => ({+ width,+ height,+ x: 0,+ y: 0,+ top: 0,+ right: width,+ bottom: height,+ left: 0,+ toJSON: () => ({+ width,+ height,+ x: 0,+ y: 0,+ top: 0,+ right: width,+ bottom: height,+ left: 0,+ }),+});const breakpoints = [{ id: "0", label: "Base" },@@ -238,3 +262,90 @@ describe("other breakpoints", () => {).toStrictEqual(320);});});++describe("setCanvasWidth", () => {+ beforeEach(() => {+ // Reset stores before each test+ $canvasWidth.set(0);+ $breakpoints.set(new Map());+ $workspaceRect.set(undefined);+ });++ test("returns false when workspaceRect is undefined", () => {+ const breakpoints = new Map([["0", { id: "0", label: "Base" }]]);+ $breakpoints.set(breakpoints);+ $workspaceRect.set(undefined);++ expect(setCanvasWidth("0")).toBe(false);+ });++ test("returns false when selectedBreakpoint is not found", () => {+ $workspaceRect.set(createRect(1000, 800));+ $breakpoints.set(new Map([["0", { id: "0", label: "Base" }]]));++ expect(setCanvasWidth("nonexistent")).toBe(false);+ });++ test("sets canvas width for base breakpoint", () => {+ const workspaceWidth = 1200;+ $workspaceRect.set(createRect(workspaceWidth, 800));+ $breakpoints.set(new Map([["0", { id: "0", label: "Base" }]]));++ const result = setCanvasWidth("0");++ expect(result).toBe(true);+ expect($canvasWidth.get()).toBe(workspaceWidth);+ });++ test("sets canvas width for max-width breakpoint", () => {+ $workspaceRect.set(createRect(1200, 800));+ $breakpoints.set(+ new Map([+ ["0", { id: "0", label: "Base" }],+ ["1", { id: "1", label: "Tablet", maxWidth: 991 }],+ ["2", { id: "2", label: "Mobile", maxWidth: 767 }],+ ])+ );++ const result = setCanvasWidth("1");++ expect(result).toBe(true);+ expect($canvasWidth.get()).toBe(768); // maxWidth of previous breakpoint + 1+ });++ test("sets canvas width for min-width breakpoint", () => {+ $workspaceRect.set(createRect(1000, 800));+ $breakpoints.set(+ new Map([+ ["0", { id: "0", label: "Base" }],+ ["1", { id: "1", label: "Large", minWidth: 1280 }],+ ])+ );++ const result = setCanvasWidth("1");++ expect(result).toBe(true);+ expect($canvasWidth.get()).toBe(1280);+ });++ test("updates canvas width when called multiple times", () => {+ $workspaceRect.set(createRect(1500, 800));+ $breakpoints.set(+ new Map([+ ["0", { id: "0", label: "Base" }],+ ["1", { id: "1", label: "Tablet", maxWidth: 991 }],+ ["2", { id: "2", label: "Mobile", maxWidth: 767 }],+ ])+ );++ setCanvasWidth("1");+ expect($canvasWidth.get()).toBe(768); // Previous breakpoint maxWidth (767) + 1++ setCanvasWidth("0");+ expect($canvasWidth.get()).toBe(1500);+ });+});++// Note: useSetCanvasWidth is a React hook with complex side effects (multiple store subscriptions+// and cleanup logic). It's primarily tested through integration tests and component tests rather+// than unit tests, as it orchestrates calls to setCanvasWidth which is fully unit tested above.diff --git a/apps/builder/app/builder/features/breakpoints/calc-canvas-width.ts b/apps/builder/app/builder/shared/calc-canvas-width.tssimilarity index 63%rename from apps/builder/app/builder/features/breakpoints/calc-canvas-width.tsrename to apps/builder/app/builder/shared/calc-canvas-width.tsindex a625f8124f..27aaf809f7 100644--- a/apps/builder/app/builder/features/breakpoints/calc-canvas-width.ts+++ b/apps/builder/app/builder/shared/calc-canvas-width.ts@@ -1,3 +1,4 @@+import { useEffect } from "react";import { compareMedia } from "@webstudio-is/css-engine";import type { Breakpoint } from "@webstudio-is/sdk";import {@@ -5,6 +6,12 @@ import {isBaseBreakpoint,minCanvasWidth,} from "~/shared/breakpoints";+import { $workspaceRect, $canvasWidth } from "~/builder/shared/nano-states";+import {+ $breakpoints,+ $isPreviewMode,+ $selectedBreakpoint,+} from "~/shared/nano-states";const defaultWidth = 320;@@ -122,3 +129,64 @@ export const calcCanvasWidth = ({}return previousBreakpointMaxWidth + 1;};++export const setCanvasWidth = (breakpointId: Breakpoint["id"]) => {+ const workspaceRect = $workspaceRect.get();+ const breakpoints = $breakpoints.get();+ const selectedBreakpoint = breakpoints.get(breakpointId);++ if (workspaceRect === undefined || selectedBreakpoint === undefined) {+ return false;+ }++ const width = calcCanvasWidth({+ breakpoints: Array.from(breakpoints.values()),+ selectedBreakpoint,+ workspaceWidth: workspaceRect.width,+ });++ $canvasWidth.set(width);+ return true;+};++/**+ * Update canvas width initially and on breakpoint change+ **/+export const useSetCanvasWidth = () => {+ useEffect(() => {+ const update = () => {+ const selectedBreakpoint = $selectedBreakpoint.get();+ if (selectedBreakpoint) {+ // When there is selected breakpoint, we want to find the smallest possible size+ // that is bigger than any max-width breakpoints and smaller than any min-width breakpoints.+ // When on base breakpoint it will be the biggest possible but smaller than the workspace.+ setCanvasWidth(selectedBreakpoint.id);+ }+ };++ const unsubscribeBreakpoints = $breakpoints.subscribe(update);+ const unsubscribeRect = $workspaceRect.listen(update);+ const unsubscribeIsPreviewMode = $isPreviewMode.listen((isPreviewMode) => {+ if (isPreviewMode) {+ update();+ }+ });+ const unsubscribeSelectedBreakpoint = $selectedBreakpoint.listen(+ (selectedBreakpoint) => {+ // This will set initial width of the canvas once the initial selected breakpoint is known.+ if (selectedBreakpoint) {+ update();+ // We can unsubscribe right away as we only need this once.+ unsubscribeSelectedBreakpoint();+ }+ }+ );++ return () => {+ unsubscribeBreakpoints();+ unsubscribeRect();+ unsubscribeIsPreviewMode();+ unsubscribeSelectedBreakpoint();+ };+ }, []);+};diff --git a/apps/builder/app/builder/shared/client-settings/settings.ts b/apps/builder/app/builder/shared/client-settings/settings.tsindex 1bb119926f..c763ba9890 100644--- a/apps/builder/app/builder/shared/client-settings/settings.ts+++ b/apps/builder/app/builder/shared/client-settings/settings.ts@@ -1,9 +1,13 @@import { atom } from "nanostores";import { z } from "zod";+import { sidebarPanelNames } from "~/builder/sidebar-left/types";const Settings = z.object({navigatorLayout: z.enum(["docked", "undocked"]).default("undocked"),stylePanelMode: z.enum(["default", "focus", "advanced"]).default("default"),+ sidebarPanelWidths: z+ .record(z.enum(sidebarPanelNames), z.number())+ .default({}),});export type Settings = z.infer<typeof Settings>;diff --git a/apps/builder/app/builder/shared/extended-sidebar-panel.tsx b/apps/builder/app/builder/shared/extended-sidebar-panel.tsxdeleted file mode 100644index 533c0e87aa..0000000000--- a/apps/builder/app/builder/shared/extended-sidebar-panel.tsx+++ /dev/null@@ -1,53 +0,0 @@-import { styled, Collapsible, Flex } from "@webstudio-is/design-system";-import { theme } from "@webstudio-is/design-system";-import { useEffect, useRef } from "react";-import { $canvasToolsVisible } from "~/shared/nano-states";--const CollapsibleRoot = styled(Collapsible.Root, {- position: "absolute",- left: "100%",- top: 0,- bottom: 0,- display: "flex",- flexDirection: "column",-});--const CollapsibleContent = styled(Collapsible.Content, {- overflow: "hidden",- flexGrow: "1",- display: "flex",- flexDirection: "column",-});--export const ExtendedPanel = ({ children }: { children: React.ReactNode }) => {- const settingsRef = useRef<HTMLDivElement>(null);-- useEffect(() => {- // Quick workaround to hide the outline above extended panels.- // These panels should ideally be implemented as `Sheet`-style dialogs.- $canvasToolsVisible.set(false);- return () => {- $canvasToolsVisible.set(true);- };- }, []);-- return (- <CollapsibleRoot ref={settingsRef} open={true}>- <CollapsibleContent>- <Flex- direction="column"- grow- css={{- position: "relative",- height: "100%",- width: theme.spacing[35],- background: theme.colors.backgroundPanel,- borderRight: `1px solid ${theme.colors.borderMain}`,- }}- >- {children}- </Flex>- </CollapsibleContent>- </CollapsibleRoot>- );-};diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.tsindex b4a63ffaf6..2454009c10 100644--- a/apps/builder/app/builder/shared/nano-states/index.ts+++ b/apps/builder/app/builder/shared/nano-states/index.ts@@ -5,6 +5,7 @@ import {} from "~/shared/nano-states/misc";import { $canvasIframeState } from "~/shared/nano-states/canvas";import { $settings, getSetting } from "../client-settings";+import type { SidebarPanelName } from "~/builder/sidebar-left/types";export const $isShareDialogOpen = atom<boolean>(false);@@ -103,14 +104,6 @@ export const $loadingState = computed(});-export type SidebarPanelName =- | "assets"- | "components"- | "navigator"- | "pages"- | "marketplace"- | "none";-// Only used internally to avoid directly setting the value without using setActiveSidebarPanel.const $activeSidebarPanel_ = atom<SidebarPanelName | undefined>();diff --git a/apps/builder/app/builder/sidebar-left/index.tsx b/apps/builder/app/builder/sidebar-left/index.tsxdeleted file mode 100644index e403e34164..0000000000--- a/apps/builder/app/builder/sidebar-left/index.tsx+++ /dev/null@@ -1 +0,0 @@-export { SidebarLeft } from "./sidebar-left";diff --git a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/sidebar-left/sidebar-left.tsxindex f6ea93abd5..6b9052fce1 100644--- a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx+++ b/apps/builder/app/builder/sidebar-left/sidebar-left.tsx@@ -23,7 +23,6 @@ import {$activeSidebarPanel,setActiveSidebarPanel,toggleActiveSidebarPanel,- type SidebarPanelName,} from "~/builder/shared/nano-states";import {SidebarButton,@@ -39,12 +38,13 @@ import {useOnDropEffect,useExternalDragStateEffect,} from "~/builder/shared/assets/drag-monitor";-import { getSetting } from "~/builder/shared/client-settings";+import { getSetting, setSetting } from "~/builder/shared/client-settings";import { ComponentsPanel } from "~/builder/features/components";import { PagesPanel } from "~/builder/features/pages";import { NavigatorPanel } from "~/builder/features/navigator";import { AssetsPanel } from "~/builder/features/assets";import { MarketplacePanel } from "~/builder/features/marketplace";+import type { SidebarPanelName } from "./types";const none = { Panel: () => null };@@ -150,6 +150,22 @@ const panels: PanelConfig[] = [},];+const setSidebarPanelWidth = (panelName: string, width: number) => {+ const widths = getSetting("sidebarPanelWidths");+ setSetting("sidebarPanelWidths", { ...widths, [panelName]: width });+};++const getSidebarPanelWidth = (panelName: SidebarPanelName) => {+ if (panelName === "none") {+ return theme.sizes.sidebarWidth;+ }+ const width = getSetting("sidebarPanelWidths")[panelName];+ if (width === undefined) {+ return theme.sizes.sidebarWidth;+ }+ return width + "px";+};+type SidebarLeftProps = {publish: Publish;};@@ -251,13 +267,22 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {<SidebarTabsContentvalue={activePanel === "none" ? "" : activePanel}+ onResize={({ width }) => {+ if (activePanel !== "none") {+ setSidebarPanelWidth(activePanel, width);+ }+ }}onKeyDown={(event) => {if (event.key === "Escape") {setActiveSidebarPanel("none");}}}+ resizablecss={{- width: theme.spacing[30],+ "--sidebar-left-panel-width": `${getSidebarPanelWidth(activePanel)}`,+ width: "var(--sidebar-left-panel-width)",+ minWidth: theme.sizes.sidebarWidth,+ maxWidth: theme.spacing[35],// We need the node to be rendered but hidden// to keep receiving the drag events.visibility:diff --git a/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx b/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsxindex becdc2d1d7..408138583a 100644--- a/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx+++ b/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx@@ -9,8 +9,16 @@ import {focusRingStyle,styled,theme,+ useResize,+ type CSS,} from "@webstudio-is/design-system";-import { forwardRef, type ComponentProps, type ReactNode } from "react";+import {+ forwardRef,+ useEffect,+ useRef,+ type ComponentProps,+ type ReactNode,+} from "react";export const SidebarTabs = styled(Tabs, {display: "flex",@@ -96,7 +104,7 @@ export const SidebarTabsList = styled(TabsList, {backgroundColor: theme.colors.backgroundPanel,});-export const SidebarTabsContent = styled(TabsContent, {+const sidebarTabsContentStyle = css({flexGrow: 1,position: "absolute",top: 0,@@ -114,4 +122,58 @@ export const SidebarTabsContent = styled(TabsContent, {width: 1,background: theme.colors.borderMain,},+ variants: {+ resizable: {+ true: {+ overflow: "auto",+ resize: "horizontal",+ },+ },+ },});++type SidebarTabsContentProps = Omit<+ ComponentProps<typeof TabsContent>,+ "onResize"+> & {+ css?: CSS;+ resizable?: boolean;+ onResize?: (size: { width: number; height: number }) => void;+};++export const SidebarTabsContent = ({+ resizable,+ css,+ onResize,+ ...props+}: SidebarTabsContentProps) => {+ const onResizeRef = useRef(onResize);+ onResizeRef.current = onResize;++ const [element, setElement] = useResize({+ onResizeEnd: (entries) => {+ if (entries[0] && onResizeRef.current) {+ onResizeRef.current({+ width: entries[0].contentRect.width,+ height: entries[0].contentRect.height,+ });+ }+ element?.style.removeProperty("width");+ },+ });++ useEffect(() => {+ if (element && onResizeRef.current) {+ const rect = element.getBoundingClientRect();+ onResizeRef.current({ width: rect.width, height: rect.height });+ }+ }, [element]);++ return (+ <TabsContent+ {...props}+ ref={resizable ? setElement : undefined}+ className={sidebarTabsContentStyle({ css, resizable })}+ />+ );+};diff --git a/apps/builder/app/builder/sidebar-left/types.ts b/apps/builder/app/builder/sidebar-left/types.tsnew file mode 100644index 0000000000..78dc5b0d54--- /dev/null+++ b/apps/builder/app/builder/sidebar-left/types.ts@@ -0,0 +1,9 @@+export const sidebarPanelNames = [+ "assets",+ "components",+ "navigator",+ "pages",+ "marketplace",+] as const;++export type SidebarPanelName = (typeof sidebarPanelNames)[number] | "none";diff --git a/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts b/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.tsindex d298ac0c0d..e285f2a320 100644--- a/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts+++ b/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts@@ -1,6 +1,6 @@import { groupBreakpoints } from "./group-breakpoints";import { $selectedBreakpointId, $breakpoints } from "../nano-states";-import { setCanvasWidth } from "~/builder/features/breakpoints";+import { setCanvasWidth } from "~/builder/shared/calc-canvas-width";/*** Order number starts with 1 and covers all existing breakpointsdiff --git a/packages/design-system/src/components/component-card.tsx b/packages/design-system/src/components/component-card.tsxindex 28516ea865..0e7b807474 100644--- a/packages/design-system/src/components/component-card.tsx+++ b/packages/design-system/src/components/component-card.tsx@@ -9,7 +9,7 @@ import {type JSX,type ReactNode,} from "react";-import { css, theme } from "../stitches.config";+import { css, theme, type CSS } from "../stitches.config";import { textVariants } from "./text";import { Tooltip } from "./tooltip";@@ -68,18 +68,33 @@ type ComponentCardProps = {description?: string;icon: JSX.Element;state?: "hover" | "disabled" | "selected";+ disableTooltip?: boolean;+ css?: CSS;} & ComponentProps<"div">;export const ComponentCard = forwardRef<HTMLDivElement, ComponentCardProps>(- ({ icon, label, className, state, description, ...props }, ref) => {+ (+ {+ icon,+ label,+ className,+ css,+ state,+ description,+ disableTooltip,+ ...props+ },+ ref+ ) => {return (<TooltipdisableHoverableContent+ open={disableTooltip ? false : undefined}content={description ?? label}css={{ maxWidth: theme.spacing[28] }}><div- className={cardStyle({ className })}+ className={cardStyle({ className, css })}ref={ref}data-state={state}{...props}diff --git a/packages/design-system/src/components/dialog.tsx b/packages/design-system/src/components/dialog.tsxindex a0a4543794..d4f28703cf 100644--- a/packages/design-system/src/components/dialog.tsx+++ b/packages/design-system/src/components/dialog.tsx@@ -10,6 +10,7 @@ import {useState,useEffect,useCallback,+ useMemo,type RefObject,} from "react";import * as Primitive from "@radix-ui/react-dialog";@@ -24,6 +25,8 @@ import { XIcon, MaximizeIcon, MinimizeIcon } from "@webstudio-is/icons";import { Separator } from "./separator";import { Text } from "./text";+const DIALOG_TITLE_HEIGHT = 40;+export const DialogTrigger = Primitive.Trigger;// An optional accessible description to be announced when the dialog is opened@@ -39,7 +42,6 @@ if (placeholderImage) {}const panelStyle = css({- border: `1px solid ${theme.colors.borderMain}`,boxShadow: theme.shadows.panelSectionDropShadow,background: theme.colors.backgroundPanel,borderRadius: theme.borderRadius[7],@@ -137,22 +139,114 @@ type Point = { x: number; y: number };type Size = { width: number; height: number };type Rect = Point & Size;+const useBoundary = () => {+ const [boundaryRect, setBoundaryRect] = useState<Rect | undefined>(undefined);++ useEffect(() => {+ const boundaryElement = document.querySelector(+ "[data-dialog-boundary]"+ ) as HTMLElement | null;++ if (!boundaryElement) {+ setBoundaryRect(undefined);+ return;+ }++ const updateBoundary = () => {+ const rect = boundaryElement.getBoundingClientRect();+ setBoundaryRect({+ x: rect.x,+ y: rect.y,+ width: rect.width,+ height: rect.height,+ });+ };++ // Initial measurement+ updateBoundary();++ const resizeObserver = new ResizeObserver(updateBoundary);+ resizeObserver.observe(boundaryElement);++ return () => {+ resizeObserver.disconnect();+ };+ }, []);++ return useMemo(+ () =>+ boundaryRect ?? {+ x: 0,+ y: 0,+ width: window.innerWidth,+ height: window.innerHeight,+ },+ [boundaryRect]+ );+};+type UseDraggableProps = {isMaximized: boolean;minWidth?: number;minHeight?: number;+ boundaryTolerance?: { horizontal?: number; vertical?: number };} & Partial<Rect>;+const applyBoundaries = (+ x: number,+ y: number,+ width: number,+ height: number,+ bounds: Rect,+ tolerance?: { horizontal?: number; vertical?: number }+) => {+ const horizontalTolerance = tolerance?.horizontal ?? 0;+ const verticalTolerance = tolerance?.vertical ?? 0;++ // Constrain width and height to fit within bounds+ const constrainedWidth = Math.min(+ width,+ bounds.width + horizontalTolerance * 2+ );+ const constrainedHeight = Math.min(+ height,+ bounds.height + verticalTolerance * 2+ );++ // Constrain X axis within bounds (with tolerance)+ let constrainedX = Math.max(bounds.x - horizontalTolerance, x);+ constrainedX = Math.min(+ bounds.x + bounds.width + horizontalTolerance - constrainedWidth,+ constrainedX+ );++ // Constrain Y axis within bounds (with tolerance)+ let constrainedY = Math.max(bounds.y - verticalTolerance, y);+ constrainedY = Math.min(+ bounds.y + bounds.height + verticalTolerance - constrainedHeight,+ constrainedY+ );++ return {+ x: constrainedX,+ y: constrainedY,+ width: constrainedWidth,+ height: constrainedHeight,+ };+};+const useDraggable = ({width,height,minHeight,minWidth,isMaximized,+ boundaryTolerance,...props}: UseDraggableProps) => {const [x, setX] = useState(props.x);const [y, setY] = useState(props.y);+ const bounds = useBoundary();const lastDragDataRef = useRef<| undefined@@ -165,25 +259,26 @@ const useDraggable = ({const ref = useRef<HTMLDivElement | null>(null);const calcStyle = useCallback(() => {+ const availableWidth = bounds.width;+ const availableHeight = bounds.height;+const style: CSSProperties = isMaximized? {- top: "calc(20px + 50% - 50vh)",- left: "calc(20px + 50% - 50vw)",- width: "calc(100vw - 40px)",- height: "calc(100vh - 40px)",+ top: bounds.y,+ left: bounds.x,+ width: availableWidth,+ height: availableHeight,}: !width || !height? {- inset: 0,- margin: "auto",- width,- height,+ top: bounds.y,+ left: bounds.x,+ maxWidth: availableWidth,+ maxHeight: availableHeight,}: {- top: `max(20px, calc(50% - ${height / 2}px))`,- bottom: `max(20px, calc(50% - ${height / 2}px))`,- left: `max(20px, calc(50% - ${width / 2}px))`,- right: `max(20px, calc(50% - ${width / 2}px))`,+ top: Math.max(bounds.y, bounds.y + bounds.height / 2 - height / 2),+ left: Math.max(bounds.x, bounds.x + bounds.width / 2 - width / 2),width,height,};@@ -196,19 +291,97 @@ const useDraggable = ({}if (isMaximized === false) {- if (x !== undefined) {- style.left = x;+ if (x !== undefined && y !== undefined) {+ // Get actual rendered dimensions if width/height not specified+ const actualWidth = width ?? ref.current?.offsetWidth ?? bounds.width;+ const actualHeight =+ height ?? ref.current?.offsetHeight ?? bounds.height;++ const constrained = applyBoundaries(+ x,+ y,+ actualWidth,+ actualHeight,+ bounds,+ boundaryTolerance+ );++ style.left = constrained.x;+ style.top = constrained.y;+ if (width !== undefined) {+ style.width = constrained.width;+ }+ if (height !== undefined) {+ style.height = constrained.height;+ }style.right = "auto";+ style.bottom = "auto";style.margin = 0;- }- if (y !== undefined) {- style.top = y;+ } else if (x !== undefined) {+ const actualWidth = width ?? ref.current?.offsetWidth ?? bounds.width;+ const actualHeight =+ height ?? ref.current?.offsetHeight ?? bounds.height;++ const constrained = applyBoundaries(+ x,+ 0,+ actualWidth,+ actualHeight,+ bounds,+ boundaryTolerance+ );++ style.left = constrained.x;+ if (width !== undefined) {+ style.width = constrained.width;+ }+ if (height !== undefined) {+ style.height = constrained.height;+ }+ style.right = "auto";+ style.margin = 0;+ } else if (y !== undefined) {+ const actualWidth = width ?? ref.current?.offsetWidth ?? bounds.width;+ const actualHeight =+ height ?? ref.current?.offsetHeight ?? bounds.height;++ const constrained = applyBoundaries(+ 0,+ y,+ actualWidth,+ actualHeight,+ bounds,+ boundaryTolerance+ );++ style.top = constrained.y;+ if (width !== undefined) {+ style.width = constrained.width;+ }+ if (height !== undefined) {+ style.height = constrained.height;+ }style.bottom = "auto";style.margin = 0;+ } else {+ // Only apply max constraints when not positioned+ style.maxWidth = availableWidth;+ style.maxHeight = availableHeight;}}+return style;- }, [x, y, width, height, isMaximized, minWidth, minHeight]);+ }, [+ x,+ y,+ width,+ height,+ isMaximized,+ minWidth,+ minHeight,+ bounds,+ boundaryTolerance,+ ]);const [style, setStyle] = useState(calcStyle());@@ -258,14 +431,13 @@ const useDraggable = ({) {return;}+const { rect, point } = lastDragDataRef.current;const movementX = point.x - event.pageX;const movementY = point.y - event.pageY;- let left = Math.max(rect.x - movementX, 0);- left = Math.min(left, window.innerWidth - rect.width);- let top = Math.max(rect.y - movementY, 0);- // We want some part of the dialog to be visible but otherwise let it go off screen.- top = Math.min(top, window.innerHeight - 40);+ // Allow dragging anywhere without constraints+ const left = rect.x - movementX;+ const top = rect.y - movementY;target.style.left = `${left}px`;target.style.top = `${top}px`;};@@ -277,8 +449,23 @@ const useDraggable = ({return;}const rect = target.getBoundingClientRect();- setX(rect.x);- setY(rect.y);++ // Apply constraints to snap to the closest valid position+ let constrainedX = Math.max(rect.x, bounds.x);+ constrainedX = Math.min(constrainedX, bounds.x + bounds.width - rect.width);+ let constrainedY = Math.max(rect.y, bounds.y);+ // Keep at least title visible at the bottom+ constrainedY = Math.min(+ constrainedY,+ bounds.y + bounds.height - DIALOG_TITLE_HEIGHT+ );++ setX(constrainedX);+ setY(constrainedY);++ // Apply the constrained position immediately+ target.style.left = `${constrainedX}px`;+ target.style.top = `${constrainedY}px`;};return {@@ -325,6 +512,7 @@ const ContentContainer = forwardRef(y,minWidth,minHeight,+ boundaryTolerance,...props}: ComponentProps<typeof Primitive.Content> &Partial<UseDraggableProps> & {@@ -341,6 +529,7 @@ const ContentContainer = forwardRef(minWidth,minHeight,isMaximized,+ boundaryTolerance,});const setPointerEvents = useSetPointerEvents(ref);diff --git a/packages/design-system/src/components/floating-panel.stories.tsx b/packages/design-system/src/components/floating-panel.stories.tsxindex 7e1c688864..817984bec4 100644--- a/packages/design-system/src/components/floating-panel.stories.tsx+++ b/packages/design-system/src/components/floating-panel.stories.tsx@@ -1,5 +1,5 @@import { useRef, type ReactNode } from "react";-import { FloatingPanelProvider, FloatingPanel } from "./floating-panel";+import { FloatingPanel } from "./floating-panel";import { Box } from "./box";import { Button } from "./button";import { Text } from "./text";@@ -12,19 +12,18 @@ export default {const Container = ({ children }: { children: ReactNode }) => {const ref = useRef(null);return (- <FloatingPanelProvider container={ref}>- <Box- ref={ref}- css={{- display: "inline-block",- marginLeft: 300,- padding: 100,- border: `1px solid black`,- }}- >- {children}- </Box>- </FloatingPanelProvider>+ <Box+ ref={ref}+ data-floating-panel-container+ css={{+ display: "inline-block",+ marginLeft: 300,+ padding: 100,+ border: `1px solid black`,+ }}+ >+ {children}+ </Box>);};@@ -57,7 +56,7 @@ export const Bottom = () => {return (<Container><FloatingPanel- placement="bottom"+ placement="bottom-within"opentitle="Title"content={<Text>Content</Text>}diff --git a/packages/design-system/src/components/floating-panel.tsx b/packages/design-system/src/components/floating-panel.tsxindex 3cd6d28ca4..b54b8e670e 100644--- a/packages/design-system/src/components/floating-panel.tsx+++ b/packages/design-system/src/components/floating-panel.tsx@@ -1,9 +1,6 @@import {type ReactNode,type ComponentProps,- createContext,- type RefObject,- useContext,useState,useRef,useLayoutEffect,@@ -26,32 +23,53 @@ type OffsetOptions =const computeFloatingPosition = (trigger: HTMLElement,floating: HTMLElement,- placement: "left-start" | "right-start" | "bottom",+ container: HTMLElement,+ placement: "left-start" | "right-start" | "bottom-within",offsetOptions: OffsetOptions): { x: number; y: number } => {const triggerRect = trigger.getBoundingClientRect();const floatingRect = floating.getBoundingClientRect();+ const containerRect = container.getBoundingClientRect();const mainAxis =typeof offsetOptions === "number"? offsetOptions: (offsetOptions.mainAxis ?? 0);+ const crossAxis =+ typeof offsetOptions === "number" ? 0 : (offsetOptions.crossAxis ?? 0);+ const alignmentAxis =+ typeof offsetOptions === "number"+ ? null+ : (offsetOptions.alignmentAxis ?? null);let x = 0;let y = 0;if (placement === "left-start") {- // Position to the left of the trigger, aligned with the top- x = triggerRect.left - floatingRect.width - mainAxis;- y = triggerRect.top;+ // Position to the left of the container, aligned with the top of trigger+ x = containerRect.left - floatingRect.width + mainAxis;+ // Align panel top with trigger top+ y = triggerRect.top + (alignmentAxis ?? 0);+ // Apply crossAxis offset (moves vertically)+ y += crossAxis;} else if (placement === "right-start") {- // Position to the right of the trigger, aligned with the top- x = triggerRect.right + mainAxis;- y = triggerRect.top;- } else if (placement === "bottom") {- // Position below the trigger- x = triggerRect.left;- y = triggerRect.bottom + mainAxis;+ // Position to the right of the container, aligned with the top of trigger+ x = containerRect.right + mainAxis;+ // Align panel top with trigger top, using trigger's relative position within container+ y = triggerRect.top + (alignmentAxis ?? 0);+ // Apply crossAxis offset (moves vertically)+ y += crossAxis;+ } else if (placement === "bottom-within") {+ // Position below the trigger, centered horizontally within the container+ // Center the panel horizontally within the container+ x =+ containerRect.left ++ (containerRect.width - floatingRect.width) / 2 ++ (alignmentAxis ?? 0);+ // Apply crossAxis offset (moves horizontally)+ x += crossAxis;+ // Y: below the trigger with 5px default offset+ y = triggerRect.bottom + (mainAxis === 0 ? 5 : mainAxis);}// Keep within viewport bounds (simple shift)@@ -89,28 +107,8 @@ const contentFitsAtPosition = ();};-const FloatingPanelContext = createContext<{- container: RefObject<null | HTMLElement>;-}>({- container: {- current: null,- },-});--export const FloatingPanelProvider = ({- children,- container,-}: {- children: JSX.Element;- container: RefObject<null | HTMLElement>;-}) => (- <FloatingPanelContext.Provider value={{ container }}>- {children}- </FloatingPanelContext.Provider>-);-type FloatingPanelProps = {- title: ReactNode;+ title?: ReactNode;content: ReactNode;children: ReactNode;titleSuffix?: ReactNode;@@ -118,10 +116,10 @@ type FloatingPanelProps = {resize?: ComponentProps<typeof Dialog>["resize"];width?: number;height?: number;- // - bottom - below the trigger button+ // - bottom-within - below the trigger button, within container bounds// - left-start - on the left side relative to the container, aligned with the top of the trigger button// - center - center of the screen- placement?: "left-start" | "right-start" | "center" | "bottom";+ placement?: "left-start" | "right-start" | "center" | "bottom-within";offset?: OffsetOptions;open?: boolean;onOpenChange?: (isOpen: boolean) => void;@@ -131,7 +129,7 @@ const contentStyle = css({width: theme.sizes.sidebarWidth,});-const defaultOffset = { mainAxis: 10 };+const defaultOffset: OffsetOptions = { mainAxis: 0, crossAxis: 0 };export const FloatingPanel = ({title,@@ -144,22 +142,31 @@ export const FloatingPanel = ({height,placement = "left-start",offset: offsetProp = defaultOffset,- open,+ open: openProp,onOpenChange,}: FloatingPanelProps) => {- const { container: containerRef } = useContext(FloatingPanelContext);+ // Support both controlled and uncontrolled modes+ const [internalOpen, setInternalOpen] = useState(false);+ const open = openProp ?? internalOpen;+const [contentElement, setContentElement] = useState<HTMLDivElement | null>(null);const triggerRef = useRef<HTMLButtonElement>(null);const [position, setPosition] = useState<{ x: number; y: number }>();const currentPositionRef = useRef<{ x: number; y: number }>();+ const containerRef = useRef<HTMLElement | null>(null);// Wrap onOpenChange to reset position when panel closesconst handleOpenChange = (isOpen: boolean) => {if (isOpen === false) {currentPositionRef.current = undefined;setPosition(undefined);+ containerRef.current = null;+ }+ // Update internal state if uncontrolled+ if (openProp === undefined) {+ setInternalOpen(isOpen);}onOpenChange?.(isOpen);};@@ -169,10 +176,19 @@ export const FloatingPanel = ({if (open === false) {currentPositionRef.current = undefined;setPosition(undefined);+ containerRef.current = null;}}, [open]);useLayoutEffect(() => {+ // Find container when trigger is available and panel is opening+ if (triggerRef.current && open && !containerRef.current) {+ const container = triggerRef.current.closest(+ "[data-floating-panel-container]"+ ) as HTMLElement | null;+ containerRef.current = container;+ }+if (triggerRef.current === null ||containerRef.current === null ||@@ -199,6 +215,7 @@ export const FloatingPanel = ({const { x, y } = computeFloatingPosition(triggerRef.current,contentElement,+ containerRef.current,placement,offsetProp);@@ -208,14 +225,18 @@ export const FloatingPanel = ({}// Only recalculate if content doesn't fit at current position+ const fits = contentFitsAtPosition(+ contentElement,+ currentPositionRef.current+ );- if (contentFitsAtPosition(contentElement, currentPositionRef.current)) {+ if (fits) {return;}-const { x, y } = computeFloatingPosition(triggerRef.current,contentElement,+ containerRef.current,placement,offsetProp);@@ -261,7 +282,11 @@ export const FloatingPanel = ({width={width}height={height}{...position}+ boundaryTolerance={+ placement === "bottom-within" ? { horizontal: Infinity } : undefined+ }aria-describedby={undefined}+ ref={setContentElement}onInteractOutside={(event) => {// When a dialog is centered, we don't want to close it when clicking outside// This allows having inline and left positioned dialogs open at the same time as a centered dialog,@@ -277,7 +302,6 @@ export const FloatingPanel = ({return;}}}- ref={setContentElement}>{content}{typeof title === "string" ? (diff --git a/packages/design-system/src/components/search-field.tsx b/packages/design-system/src/components/search-field.tsxindex 63408b95cd..9dd531987e 100644--- a/packages/design-system/src/components/search-field.tsx+++ b/packages/design-system/src/components/search-field.tsx@@ -85,6 +85,8 @@ const SearchFieldBase: ForwardRefRenderFunction<onKeyDown={(event) => {if (event.key === "Escape" && value.length !== 0) {event.preventDefault();+ // Required to prevent first click closing the dialog.+ event.stopPropagation();handleCancel();}onKeyDown?.(event);diff --git a/packages/design-system/src/components/tree.tsx b/packages/design-system/src/components/tree.tsxindex 144393d740..b531807237 100644--- a/packages/design-system/src/components/tree.tsx+++ b/packages/design-system/src/components/tree.tsx@@ -156,10 +156,8 @@ const ActionContainer = styled("div", {// to prevent focus loss while navigating with keyboardopacity: `var(${treeActionOpacity}, 0)`,position: "sticky",- translate: `calc(${theme.sizes.sidebarWidth} - 100%) -100%`,- paddingLeft: ITEM_PADDING_LEFT,- paddingRight: ITEM_PADDING_RIGHT,- left: 0,+ translate: `-100% -100%`,+ left: `calc(var(--sidebar-left-panel-width) - ${ITEM_PADDING_RIGHT}px)`,height: "inherit",display: "inline-flex",justifyContent: "center",diff --git a/packages/design-system/src/utilities.ts b/packages/design-system/src/utilities.tsindex 950a0dbe35..bb134122a4 100644--- a/packages/design-system/src/utilities.ts+++ b/packages/design-system/src/utilities.ts@@ -125,7 +125,9 @@ export const useResize = ({isResizingRef.current = true;onResizeStartRef.current?.(entries);}- onResizeRef.current?.(entries);+ requestAnimationFrame(() => {+ onResizeRef.current?.(entries);+ });clearTimeout(timeoutRef.current);timeoutRef.current = setTimeout(() => {onResizeEndRef.current?.(entries);diff --git a/packages/domain/src/db/domain.ts b/packages/domain/src/db/domain.tsindex c59f5a67f2..dffe74f899 100644--- a/packages/domain/src/db/domain.ts+++ b/packages/domain/src/db/domain.ts@@ -2,6 +2,7 @@ import {authorizeProject,type AppContext,AuthorizationError,+ createErrorResponse,} from "@webstudio-is/trpc-interface/index.server";import * as projectApi from "@webstudio-is/project/index.server";import { validateDomain } from "./validate";@@ -76,7 +77,7 @@ export const create = async (.eq("domain", domain);if (upsertResult.error) {- return { success: false, error: upsertResult.error.message };+ return createErrorResponse(upsertResult.error);}// Get domain id (upsert in postgrest does not return anything in case of conflict and ignoreDuplicates)@@ -87,7 +88,7 @@ export const create = async (.single();if (domainRow.error) {- return { success: false, error: domainRow.error.message };+ return createErrorResponse(domainRow.error);}const domainId = domainRow.data.id;@@ -101,7 +102,7 @@ export const create = async (});if (result.error) {- return { success: false, error: result.error.message };+ return createErrorResponse(result.error);}return { success: true };@@ -141,13 +142,13 @@ export const verify = async (.single();if (projectDomain.error) {- return { success: false, error: projectDomain.error.message };+ return createErrorResponse(projectDomain.error);}const domain = projectDomain.data.domain?.domain;if (domain == null) {- return { success: false, error: "Domain not found" };+ return createErrorResponse("Domain not found");}// @todo: TXT verification and domain initialization should be implemented in the future as queue service@@ -169,7 +170,7 @@ export const verify = async (.eq("id", props.domainId);if (domainUpdateResult.error) {- return { success: false, error: domainUpdateResult.error.message };+ return createErrorResponse(domainUpdateResult.error);}return { success: true };@@ -202,7 +203,7 @@ export const remove = async (.eq("projectId", props.projectId);if (deleteResult.error) {- return { success: false, error: deleteResult.error.message };+ return createErrorResponse(deleteResult.error);}return { success: true };@@ -274,7 +275,7 @@ export const updateStatus = async (.single();if (updatedDomainResult.error) {- return { success: false, error: updatedDomainResult.error.message };+ return createErrorResponse(updatedDomainResult.error);}return { success: true, domain: updatedDomainResult.data };diff --git a/packages/domain/src/trpc/domain.ts b/packages/domain/src/trpc/domain.tsindex 2d1f59068c..969c4a1a4e 100644--- a/packages/domain/src/trpc/domain.ts+++ b/packages/domain/src/trpc/domain.ts@@ -2,7 +2,11 @@ import { z } from "zod";import { nanoid } from "nanoid";import * as projectApi from "@webstudio-is/project/index.server";import { createProductionBuild } from "@webstudio-is/project-build/index.server";-import { router, procedure } from "@webstudio-is/trpc-interface/index.server";+import {+ router,+ procedure,+ createErrorResponse,+} from "@webstudio-is/trpc-interface/index.server";import { Templates } from "@webstudio-is/sdk";import { db } from "../db";import { isDomainUsingCloudflareNameservers } from "../rdap";@@ -18,10 +22,7 @@ export const domainRouter = router({applicationId: result.applicationId,} as const;} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),@@ -48,10 +49,7 @@ export const domainRouter = router({project,} as const;} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),publish: procedure@@ -126,8 +124,6 @@ export const domainRouter = router({const { deploymentTrpc, env } = ctx.deployment;- console.info("input.destination", input.destination);-if (env.BUILDER_ORIGIN === undefined) {throw new Error("Missing env.BUILDER_ORIGIN");}@@ -150,11 +146,7 @@ export const domainRouter = router({return result;} catch (error) {- console.error(error);- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),/**@@ -179,10 +171,7 @@ export const domainRouter = router({return { success: true } as const;} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),@@ -213,10 +202,7 @@ export const domainRouter = router({ctx);} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),@@ -237,10 +223,7 @@ export const domainRouter = router({ctx);} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),remove: procedure@@ -260,10 +243,7 @@ export const domainRouter = router({ctx);} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),countTotalDomains: procedure.query(async ({ ctx }) => {@@ -283,10 +263,7 @@ export const domainRouter = router({const data = await db.countTotalDomains(ownerId, ctx);return { success: true, data } as const;} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),@@ -304,10 +281,7 @@ export const domainRouter = router({ctx);} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),});diff --git a/packages/project/src/trpc/project-router.ts b/packages/project/src/trpc/project-router.tsindex ae373890a1..690ec0f967 100644--- a/packages/project/src/trpc/project-router.ts+++ b/packages/project/src/trpc/project-router.ts@@ -5,6 +5,7 @@ import {procedure,AuthorizationError,authorizeProject,+ createErrorResponse,} from "@webstudio-is/trpc-interface/index.server";import { MarketplaceApprovalStatus, Title } from "../shared/schema";@@ -107,10 +108,7 @@ export const projectRouter = router({data: result.data?.count ?? 0,};} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),@@ -140,10 +138,7 @@ export const projectRouter = router({data: publishedBuilds.data,};} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),@@ -184,10 +179,7 @@ export const projectRouter = router({success: true,};} catch (error) {- return {- success: false,- error: error instanceof Error ? error.message : "Unknown error",- } as const;+ return createErrorResponse(error);}}),diff --git a/packages/trpc-interface/src/context/errors.server.ts b/packages/trpc-interface/src/context/errors.server.tsindex 8715cd44f2..9d98feec43 100644--- a/packages/trpc-interface/src/context/errors.server.ts+++ b/packages/trpc-interface/src/context/errors.server.ts@@ -5,3 +5,19 @@ export const AuthorizationError = customErrorFactory(this.message = message;});++/**+ * Standard response for any client-server communication with an error.+ */+export const createErrorResponse = (error: unknown) => {+ const message =+ typeof error === "string"+ ? error+ : error && typeof error === "object" && "message" in error+ ? String(error.message)+ : "Unknown error";+ return {+ success: false as const,+ error: message,+ };+};diff --git a/packages/trpc-interface/src/index.server.ts b/packages/trpc-interface/src/index.server.tsindex 2661ce71d5..59fdc0c332 100644--- a/packages/trpc-interface/src/index.server.ts+++ b/packages/trpc-interface/src/index.server.ts@@ -3,7 +3,10 @@ export { createTrpcProxyServiceClient } from "./shared/client";export type { AppContext } from "./context/context.server";-export { AuthorizationError } from "./context/errors.server";+export {+ AuthorizationError,+ createErrorResponse,+} from "./context/errors.server";export * as authorizeProject from "./authorize/project.server";export type { AuthPermit } from "./authorize/project.server";