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: Floating panel v2 (#4613)
Oleg Isonen6cb74d4e6a3b
diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxindex 6a20791893..c53db364e8 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -17,10 +17,10 @@ import {Separator,Tooltip,Kbd,+ FloatingPanelProvider,} from "@webstudio-is/design-system";import { StylePanel } from "~/builder/features/style-panel";import { SettingsPanelContainer } from "~/builder/features/settings-panel";-import { FloatingPanelProvider } from "~/builder/shared/floating-panel";import {$registeredComponentMetas,$dragAndDropState,diff --git a/apps/builder/app/builder/features/pages/folder-settings.tsx b/apps/builder/app/builder/features/pages/folder-settings.tsxindex 452f281fb8..e4e7f87ca3 100644--- a/apps/builder/app/builder/features/pages/folder-settings.tsx+++ b/apps/builder/app/builder/features/pages/folder-settings.tsx@@ -529,7 +529,7 @@ const DeleteConfirmationDialog = ({<Flex gap="3" direction="column" css={{ padding: theme.panel.padding }}><Text>{`Delete folder "${folder.name}" including all of its pages?`}</Text><Flex direction="rowReverse" gap="2">- <DialogClose asChild>+ <DialogClose><Buttoncolor="destructive"onClick={() => {@@ -539,7 +539,7 @@ const DeleteConfirmationDialog = ({Delete</Button></DialogClose>- <DialogClose asChild>+ <DialogClose><Button color="ghost">Cancel</Button></DialogClose></Flex>diff --git a/apps/builder/app/builder/features/pages/form.tsx b/apps/builder/app/builder/features/pages/form.tsxindex 0a3637170d..40ba115529 100644--- a/apps/builder/app/builder/features/pages/form.tsx+++ b/apps/builder/app/builder/features/pages/form.tsx@@ -1,14 +1,12 @@-import type { JSX } from "react";+import { forwardRef, type ReactNode } from "react";-export const Form = ({- onSubmit,- children,-}: {- onSubmit: () => void;- children: JSX.Element;-}) => {+export const Form = forwardRef<+ HTMLFormElement,+ { onSubmit: () => void; children: ReactNode }+>(({ onSubmit, children }, ref) => {return (<form+ ref={ref}onSubmit={(event) => {event.preventDefault();onSubmit();@@ -19,4 +17,4 @@ export const Form = ({<input type="submit" hidden /></form>);-};+});diff --git a/apps/builder/app/builder/features/pages/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings.tsxindex cd875fcd14..55e0fa47ac 100644--- a/apps/builder/app/builder/features/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/pages/page-settings.tsx@@ -7,6 +7,7 @@ import {useId,useEffect,type JSX,+ useRef,} from "react";import { useStore } from "@nanostores/react";import { useDebouncedCallback } from "use-debounce";@@ -56,6 +57,7 @@ import {Switch,PanelTitle,TitleSuffixSpacer,+ FloatingPanelProvider,} from "@webstudio-is/design-system";import {ChevronDoubleLeftIcon,@@ -1664,6 +1666,7 @@ const PageSettingsView = ({children: JSX.Element;}) => {const isDesignMode = useStore($isDesignMode);+ const containerRef = useRef<HTMLFormElement>(null);return (<><PanelTitle@@ -1706,11 +1709,13 @@ const PageSettingsView = ({Page Settings</PanelTitle><Separator />- <Form onSubmit={onClose}>- <fieldset style={{ display: "contents" }} disabled={!isDesignMode}>- {children}- </fieldset>- </Form>+ <FloatingPanelProvider container={containerRef}>+ <Form onSubmit={onClose} ref={containerRef}>+ <fieldset style={{ display: "contents" }} disabled={!isDesignMode}>+ {children}+ </fieldset>+ </Form>+ </FloatingPanelProvider></>);};diff --git a/apps/builder/app/builder/features/project-settings/image-control.tsx b/apps/builder/app/builder/features/project-settings/image-control.tsxindex b8df39c2c1..1fdceeb7f0 100644--- a/apps/builder/app/builder/features/project-settings/image-control.tsx+++ b/apps/builder/app/builder/features/project-settings/image-control.tsx@@ -1,6 +1,6 @@-import { FloatingPanel } from "~/builder/shared/floating-panel";-import { ImageManager } from "~/builder/shared/image-manager";import type { ReactElement } from "react";+import { FloatingPanel } from "@webstudio-is/design-system";+import { ImageManager } from "~/builder/shared/image-manager";// @todo should be moved to shared as its being reused in another featureexport const ImageControl = (props: {diff --git a/apps/builder/app/builder/features/project-settings/project-settings.tsx b/apps/builder/app/builder/features/project-settings/project-settings.tsxindex 603593bff8..78105832e2 100644--- a/apps/builder/app/builder/features/project-settings/project-settings.tsx+++ b/apps/builder/app/builder/features/project-settings/project-settings.tsx@@ -43,6 +43,7 @@ export const ProjectSettingsView = ({return (<Dialog open={sections.has(currentSection!)} onOpenChange={onOpenChange}><DialogContent+ draggablecss={{width: `calc(${leftPanelWidth} + ${rightPanelWidth})`,maxWidth: "none",diff --git a/apps/builder/app/builder/features/project-settings/section-general.tsx b/apps/builder/app/builder/features/project-settings/section-general.tsxindex 876f33a4c7..a04bb27e12 100644--- a/apps/builder/app/builder/features/project-settings/section-general.tsx+++ b/apps/builder/app/builder/features/project-settings/section-general.tsx@@ -193,6 +193,7 @@ export const SectionGeneral = () => {tag to every page across the published project.</Text><CodeEditor+ title="Custom code"lang="html"value={meta.code ?? ""}onChange={handleSave("code")}diff --git a/apps/builder/app/builder/features/settings-panel/controls/code.tsx b/apps/builder/app/builder/features/settings-panel/controls/code.tsxindex 28deeae89d..61bbc9e58f 100644--- a/apps/builder/app/builder/features/settings-panel/controls/code.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/code.tsx@@ -17,6 +17,10 @@ import {import { useState } from "react";import {Button,+ DialogClose,+ DialogMaximize,+ DialogTitle,+ DialogTitleActions,Flex,SmallIconButton,Text,@@ -161,10 +165,19 @@ export const CodeControl = ({<CodeEditorlang={lang}title={- <Flex gap="1" align="center">- <Text variant="labelsTitleCase">Code Editor</Text>- {errorInfo}- </Flex>+ <DialogTitle+ suffix={+ <DialogTitleActions>+ <DialogMaximize />+ <DialogClose />+ </DialogTitleActions>+ }+ >+ <Flex gap="1" align="center">+ <Text variant="labelsTitleCase">Code Editor</Text>+ {errorInfo}+ </Flex>+ </DialogTitle>}readOnly={overwritable === false}invalid={error !== undefined}diff --git a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsxindex 1503ce4dae..ea472fdf93 100644--- a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx@@ -6,11 +6,11 @@ import {Flex,SmallIconButton,Text,+ FloatingPanel,} from "@webstudio-is/design-system";import { TrashIcon } from "@webstudio-is/icons";import type { Prop } from "@webstudio-is/sdk";import { $assets } from "~/shared/nano-states";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { ImageManager } from "~/builder/shared/image-manager";import { type ControlProps } from "../shared";import { acceptToMimeCategories } from "@webstudio-is/asset-uploader";diff --git a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx b/apps/builder/app/builder/features/settings-panel/variable-popover.tsxindex f3ebfc7a75..46da58d8ac 100644--- a/apps/builder/app/builder/features/settings-panel/variable-popover.tsx+++ b/apps/builder/app/builder/features/settings-panel/variable-popover.tsx@@ -11,19 +11,17 @@ import {useImperativeHandle,useRef,createContext,- useContext,useEffect,} from "react";-import { mergeRefs } from "@react-aria/utils";import { CopyIcon, RefreshIcon, UpgradeIcon } from "@webstudio-is/icons";import {Box,Button,+ DialogClose,+ DialogTitle,+ DialogTitleActions,Flex,- FloatingPanelPopover,- FloatingPanelPopoverContent,- FloatingPanelPopoverTitle,- FloatingPanelPopoverTrigger,+ FloatingPanel,Grid,InputErrorsTooltip,InputField,@@ -59,7 +57,6 @@ import {import { serverSyncStore } from "~/shared/sync";import { BindingPopoverProvider } from "~/builder/shared/binding-popover";-import { useSideOffset } from "~/builder/shared/floating-panel";import {EditorDialog,EditorDialogButton,@@ -618,14 +615,15 @@ const areAllFormErrorsVisible = (form: null | HTMLFormElement) => {return true;};-export const VariablePopoverTrigger = forwardRef<- HTMLButtonElement,- { variable?: DataSource; children: ReactNode }->(({ variable, children }, ref) => {+export const VariablePopoverTrigger = ({+ variable,+ children,+}: {+ variable?: DataSource;+ children: ReactNode;+}) => {const areResourcesLoading = useStore($areResourcesLoading);const [isOpen, setOpen] = useState(false);- const { containerRef } = useContext(VariablePopoverContext);- const [triggerRef, sideOffsset] = useSideOffset({ isOpen, containerRef });const bindingPopoverContainerRef = useRef<HTMLDivElement>(null);const panelRef = useRef<undefined | PanelApi>(undefined);const formRef = useRef<HTMLFormElement>(null);@@ -635,8 +633,7 @@ export const VariablePopoverTrigger = forwardRef<const requiresUpgrade = allowDynamicData === false && isResource;return (- <FloatingPanelPopover- modal+ <FloatingPanelopen={isOpen}onOpenChange={(newOpen) => {if (newOpen) {@@ -652,16 +649,64 @@ export const VariablePopoverTrigger = forwardRef<// prevent closing when not all errors are shown to user}}}- >- <FloatingPanelPopoverTrigger ref={mergeRefs(ref, triggerRef)} asChild>- {children}- </FloatingPanelPopoverTrigger>- <FloatingPanelPopoverContent- ref={bindingPopoverContainerRef}- sideOffset={sideOffsset}- side="left"- align="start"- >+ title={+ variable === undefined ? (+ <DialogTitle>New Variable</DialogTitle>+ ) : (+ <DialogTitle+ suffix={+ <DialogTitleActions>+ {variable?.type === "resource" && (+ <>+ {/* allow to copy curl only for default and graphql resource controls */}+ {resources.get(variable.resourceId)?.control !==+ "system" && (+ <Tooltip+ content="Copy resource as cURL command"+ side="bottom"+ >+ <Button+ aria-label="Copy resource as cURL command"+ prefix={<CopyIcon />}+ color="ghost"+ onClick={() => {+ const resourceRequest = getComputedResource(+ variable.resourceId+ );+ if (resourceRequest) {+ navigator.clipboard.writeText(+ generateCurl(resourceRequest)+ );+ }+ }}+ />+ </Tooltip>+ )}+ <Tooltip content="Refresh resource data" side="bottom">+ <Button+ aria-label="Refresh resource data"+ prefix={<RefreshIcon />}+ color="ghost"+ disabled={areResourcesLoading}+ onClick={() => {+ formRef.current?.requestSubmit();+ if (formRef.current?.checkValidity()) {+ invalidateResource(variable.resourceId);+ }+ }}+ />+ </Tooltip>+ </>+ )}+ <DialogClose />+ </DialogTitleActions>+ }+ >+ Edit Variable+ </DialogTitle>+ )+ }+ content={<ScrollAreacss={{// flex fixes content overflowing artificial scroll area@@ -731,61 +776,11 @@ export const VariablePopoverTrigger = forwardRef<</form></Flex></ScrollArea>- {/* put after content to avoid auto focusing "Close" button */}- {variable === undefined ? (- <FloatingPanelPopoverTitle>New Variable</FloatingPanelPopoverTitle>- ) : (- <FloatingPanelPopoverTitle- actions={- variable?.type === "resource" && (- <>- {/* allow to copy curl only for default and graphql resource controls */}- {resources.get(variable.resourceId)?.control !== "system" && (- <Tooltip- content="Copy resource as cURL command"- side="bottom"- >- <Button- aria-label="Copy resource as cURL command"- prefix={<CopyIcon />}- color="ghost"- onClick={() => {- const resourceRequest = getComputedResource(- variable.resourceId- );- if (resourceRequest) {- navigator.clipboard.writeText(- generateCurl(resourceRequest)- );- }- }}- />- </Tooltip>- )}- <Tooltip content="Refresh resource data" side="bottom">- <Button- aria-label="Refresh resource data"- prefix={<RefreshIcon />}- color="ghost"- disabled={areResourcesLoading}- onClick={() => {- formRef.current?.requestSubmit();- if (formRef.current?.checkValidity()) {- invalidateResource(variable.resourceId);- }- }}- />- </Tooltip>- </>- )- }- >- Edit Variable- </FloatingPanelPopoverTitle>- )}- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ }+ >+ {children}+ </FloatingPanel>);-});+};VariablePopoverTrigger.displayName = "VariablePopoverTrigger";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 6730177750..80b7c8f4ed 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@@ -3,9 +3,9 @@ import {EnhancedTooltip,Flex,NestedInputButton,+ FloatingPanel,} from "@webstudio-is/design-system";import { FontsManager } from "~/builder/shared/fonts-manager";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { forwardRef, useMemo, useState, type ComponentProps } from "react";import { toValue } from "@webstudio-is/css-engine";import { matchSorter } from "match-sorter";@@ -68,8 +68,7 @@ export const FontFamilyControl = () => {suffix={<FloatingPaneltitle="Fonts"- isOpen={isFontManagerOpen}- onIsOpenChange={setIsFontMangerOpen}+ onOpenChange={setIsFontMangerOpen}content={<FontsManagervalue={value.type === "fontFamily" ? value : undefined}diff --git a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsxindex b51d69fbff..21fc5aa4e2 100644--- a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx@@ -1,7 +1,11 @@import { useStore } from "@nanostores/react";-import { Button, InputField, Flex } from "@webstudio-is/design-system";+import {+ Button,+ InputField,+ Flex,+ FloatingPanel,+} from "@webstudio-is/design-system";import { $assets } from "~/shared/nano-states";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { ImageManager } from "~/builder/shared/image-manager";import { useEffect, useState } from "react";import type { InvalidValue, StyleProperty } from "@webstudio-is/css-engine";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 9e204f6eb6..05533b40f8 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,9 @@-import { useRef, useState } from "react";+import { useRef } from "react";import { getStyleDeclKey, type StyleDecl } from "@webstudio-is/sdk";import {FloatingPanel,FloatingPanelProvider,-} from "~/builder/shared/floating-panel";+} from "@webstudio-is/design-system";import {$breakpoints,$selectedBreakpointId,@@ -38,16 +38,13 @@ $awareness.set({export const BackgroundContentStory = () => {const elementRef = useRef<HTMLDivElement>(null);- const [isOpen, setIsOpen] = useState(true);-return (<><div ref={elementRef} style={{ marginLeft: "400px" }}></div><FloatingPanelProvider container={elementRef}><FloatingPanel- isOpen={isOpen}- onIsOpenChange={setIsOpen}+ opentitle="Background"content={<BackgroundContent index={0} />}>diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsxindex 76b2022bd7..e117fee085 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-content.tsx@@ -20,9 +20,9 @@ import {ToggleGroupButton,Separator,styled,+ FloatingPanelProvider,} from "@webstudio-is/design-system";import { ImageControl, SelectControl } from "../../controls";-import { FloatingPanelProvider } from "~/builder/shared/floating-panel";import { BackgroundSize } from "./background-size";import { BackgroundGradient } from "./background-gradient";import { BackgroundImage } from "./background-image";diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsxindex ae007adf8b..024a420b95 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx@@ -42,6 +42,7 @@ export const Section = () => {<RepeatedStylelabel="Backgrounds"styles={styles}+ floatingPanelOffset={{ alignmentAxis: -100 }}getItemProps={(_index, primaryValue) => ({label: getBackgroundLabel(primaryValue, assets),})}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 f49838564c..7685e3b3d6 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@@ -4,6 +4,7 @@ import {theme,ToggleGroup,ToggleGroupButton,+ FloatingPanel,} from "@webstudio-is/design-system";import { toValue } from "@webstudio-is/css-engine";import type { StyleProperty } from "@webstudio-is/css-engine";@@ -25,7 +26,6 @@ import {OrderLastIcon,EllipsesIcon,} from "@webstudio-is/icons";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { StyleSection } from "../../shared/style-section";import {getPriorityStyleValueSource,@@ -252,6 +252,7 @@ const FlexChildSectionSizingPopover = () => {return (<FloatingPaneltitle="Sizing"+ placement="bottom"content={<Gridgap="3"@@ -399,6 +400,7 @@ const FlexChildSectionOrderPopover = () => {return (<FloatingPaneltitle="Order"+ placement="bottom"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 56f4860006..b7f39ac568 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@@ -6,6 +6,7 @@ import {IconButton,Separator,styled,+ FloatingPanel,} from "@webstudio-is/design-system";import { PositionControl, SelectControl, TextControl } from "../../controls";import {@@ -18,7 +19,6 @@ import {import { StyleSection } from "../../shared/style-section";import { theme } from "@webstudio-is/design-system";import { ToggleGroupControl } from "../../controls/toggle-group/toggle-group-control";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { humanizeString } from "~/shared/string-utils";import { PropertyLabel } from "../../property-label";import { useComputedStyleDecl } from "../../shared/model";@@ -43,6 +43,7 @@ const ObjectPosition = () => {<Flex justify="end"><FloatingPaneltitle="Object Position"+ placement="bottom"content={<Flex css={{ padding: theme.panel.padding }}><PositionControl property="objectPosition" 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 b671abc95d..44efb177c0 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@@ -24,6 +24,7 @@ import {SmallToggleButton,theme,Tooltip,+ FloatingPanel,} from "@webstudio-is/design-system";import {EyeconClosedIcon,@@ -42,7 +43,6 @@ import {transformPanels,type TransformPanel,} from "./transform-utils";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { TranslatePanelContent } from "./transform-translate";import { ScalePanelContent } from "./transform-scale";import { RotatePanelContent } from "./transform-rotate";@@ -109,6 +109,7 @@ const TransformAdvancedPopover = () => {return (<FloatingPaneltitle="Advanced Transform"+ placement="bottom"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 09047200a8..8a312a1418 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@@ -6,6 +6,7 @@ import {theme,IconButton,Box,+ FloatingPanel,} from "@webstudio-is/design-system";import { propertyDescriptions } from "@webstudio-is/css-data";import type { StyleProperty } from "@webstudio-is/css-engine";@@ -35,7 +36,6 @@ import {SelectControl,TextControl,} from "../../controls";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { StyleSection } from "../../shared/style-section";import {getPriorityStyleValueSource,@@ -278,6 +278,7 @@ const TypographySectionAdvancedPopover = () => {return (<FloatingPaneltitle="Advanced Typography"+ placement="bottom"content={<Gridcss={{diff --git a/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx b/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsxindex 0926fac112..f60c11ccb6 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-fragment.tsx@@ -99,12 +99,10 @@ export const CssFragmentEditorContent = ({export const CssFragmentEditor = ({title,- open,content,onOpenChange,}: {title?: ReactNode;- open?: boolean;content: ReactNode;onOpenChange?: (newOpen: boolean) => void;}) => {@@ -113,7 +111,6 @@ export const CssFragmentEditor = ({<EditorDialogControl>{content}<EditorDialog- open={open}onOpenChange={onOpenChange}title={title}content={content}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 ebe5badc33..7cf4d9f036 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@@ -4,7 +4,7 @@ import {theme,} from "@webstudio-is/design-system";import { MaximizeIcon } from "@webstudio-is/icons";-import { useEffect, useRef, useState } from "react";+import { useEffect, useState } from "react";import { EditorDialog } from "~/builder/shared/code-editor-base";import { CssFragmentEditorContent } from "../css-fragment";import type {@@ -39,8 +39,6 @@ export const isComplexValue = (value: CssValueInputValue) => {return false;};-const width = parseFloat(rawTheme.sizes.sidebarWidth);-export const ValueEditorDialog = ({property,value,@@ -58,25 +56,6 @@ export const ValueEditorDialog = ({setIntermediateValue({ type: "intermediate", value });}, [value]);- const triggerRef = useRef<HTMLButtonElement>(null);-- const [rect, setRect] = useState(() => ({- height: 200,- width,- x: window.innerWidth - width,- y: 0,- }));-- const handleOpenChange = (isOpen: boolean) => {- if (isOpen && triggerRef.current) {- const triggerRect = triggerRef.current.getBoundingClientRect();- setRect({- ...rect,- y: triggerRect.y,- });- }- };-const handleChange = (value: string) => {const parsedValue = parseIntermediateOrInvalidValue(property, {type: "intermediate",@@ -111,8 +90,9 @@ export const ValueEditorDialog = ({return (<EditorDialogtitle="CSS Value"- onOpenChange={handleOpenChange}- {...rect}+ placement="bottom"+ height={200}+ width={Number(rawTheme.sizes.sidebarWidth)}content={<CssFragmentEditorContentautoFocus@@ -133,7 +113,6 @@ export const ValueEditorDialog = ({display: "block",},}}- ref={triggerRef}><MaximizeIcon size={12} /></NestedInputButton>diff --git a/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsx b/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsxindex 658d193c84..e463e6938a 100644--- a/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/repeated-style.tsx@@ -1,4 +1,4 @@-import { useMemo, type JSX } from "react";+import { useMemo, type ComponentProps, type JSX } from "react";import type { RgbaColor } from "colord";import {toValue,@@ -22,8 +22,8 @@ import {SmallToggleButton,toast,useSortable,+ FloatingPanel,} from "@webstudio-is/design-system";-import { FloatingPanel } from "~/builder/shared/floating-panel";import { repeatUntil } from "~/shared/array-utils";import type { ComputedStyleDecl } from "~/shared/style-object-model";import { createBatchUpdate, type StyleUpdateOptions } from "./use-style-data";@@ -329,11 +329,18 @@ export const RepeatedStyle = (props: {index: number,primaryValue: StyleValue) => { label: string; color?: RgbaColor };+ floatingPanelOffset?: ComponentProps<typeof FloatingPanel>["offset"];renderThumbnail?: (index: number, primaryItem: StyleValue) => JSX.Element;renderItemContent: (index: number, primaryItem: StyleValue) => JSX.Element;}) => {- const { label, styles, getItemProps, renderThumbnail, renderItemContent } =- props;+ const {+ label,+ styles,+ getItemProps,+ renderThumbnail,+ renderItemContent,+ floatingPanelOffset,+ } = props;// first property should describe the amount of layers or tuple itemsconst primaryValue = styles[0].cascadedValue;let primaryItems: StyleValue[] = [];@@ -382,15 +389,8 @@ export const RepeatedStyle = (props: {<FloatingPanelkey={index}title={label}- // Background Panel is big, and the size differs when the tabs are changed.- // This results in the panel moving around when the tabs are changed.- // And sometimes, the tab moves away from the cursor,- // when the content change happens on the top.- // This is a workaround to prevent the panel from moving around- // too much when the tabs are changed from the popover trigger.- align="center"- collisionPadding={{ bottom: 200, top: 200 }}content={renderItemContent(index, primaryItem)}+ offset={floatingPanelOffset}><CssValueListItemid={id}diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsxindex 6b62055608..dd36856d67 100644--- a/apps/builder/app/builder/features/style-panel/style-source-section.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source-section.tsx@@ -499,7 +499,7 @@ const DeleteConfirmationDialog = ({<Flex gap="3" direction="column" css={{ padding: theme.panel.padding }}><Text>{`Delete "${token}" token from the project including all of its styles?`}</Text><Flex direction="rowReverse" gap="2">- <DialogClose asChild>+ <DialogClose><Buttoncolor="destructive"onClick={() => {@@ -509,7 +509,7 @@ const DeleteConfirmationDialog = ({Delete</Button></DialogClose>- <DialogClose asChild>+ <DialogClose><Button color="ghost">Cancel</Button></DialogClose></Flex>diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxindex 33e0202eef..25084e7256 100644--- a/apps/builder/app/builder/features/topbar/publish.tsx+++ b/apps/builder/app/builder/features/topbar/publish.tsx@@ -11,11 +11,6 @@ import {Button,useId,Tooltip,- FloatingPanelPopover,- FloatingPanelAnchor,- FloatingPanelPopoverTrigger,- FloatingPanelPopoverContent,- FloatingPanelPopoverTitle,IconButton,Grid,Flex,@@ -33,6 +28,12 @@ import {buttonStyle,toast,RadioGroup,+ Popover,+ PopoverTrigger,+ PopoverContent,+ PopoverTitle,+ PopoverClose,+ PopoverTitleActions,} from "@webstudio-is/design-system";import stripIndent from "strip-indent";import { $publishDialog } from "../../shared/nano-states";@@ -853,30 +854,28 @@ export const PublishButton = ({ projectId }: PublishProps) => {};return (- <FloatingPanelPopover+ <Popovermodalopen={publishDialog !== "none"}onOpenChange={handleOpenChange}>- <FloatingPanelAnchor>- <Tooltip- side="bottom"- content={tooltipContent ?? "Publish to Webstudio Cloud"}- sideOffset={Number.parseFloat(rawTheme.spacing[5])}- >- <FloatingPanelPopoverTrigger asChild>- <Button- type="button"- disabled={isPublishEnabled === false}- color="positive"- >- Publish- </Button>- </FloatingPanelPopoverTrigger>- </Tooltip>- </FloatingPanelAnchor>+ <Tooltip+ side="bottom"+ content={tooltipContent ?? "Publish to Webstudio Cloud"}+ sideOffset={Number.parseFloat(rawTheme.spacing[5])}+ >+ <PopoverTrigger asChild>+ <Button+ type="button"+ disabled={isPublishEnabled === false}+ color="positive"+ >+ Publish+ </Button>+ </PopoverTrigger>+ </Tooltip>- <FloatingPanelPopoverContent+ <PopoverContentsideOffset={Number.parseFloat(rawTheme.spacing[8])}css={{width: theme.spacing[33],@@ -886,30 +885,33 @@ export const PublishButton = ({ projectId }: PublishProps) => {>{publishDialog === "export" && (<>- <FloatingPanelPopoverTitle>Export</FloatingPanelPopoverTitle>+ <PopoverTitle>Export</PopoverTitle><ExportContent projectId={projectId} /></>)}{publishDialog === "publish" && (<>- <FloatingPanelPopoverTitle- actions={- <IconButton- onClick={() => {- $openProjectSettings.set("publish");- }}- >- <GearIcon />- </IconButton>+ <PopoverTitle+ suffix={+ <PopoverTitleActions>+ <IconButton+ onClick={() => {+ $openProjectSettings.set("publish");+ }}+ >+ <GearIcon />+ </IconButton>+ <PopoverClose />+ </PopoverTitleActions>}>Publish- </FloatingPanelPopoverTitle>+ </PopoverTitle><Content projectId={projectId} onExportClick={handleExportClick} /></>)}- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ </PopoverContent>+ </Popover>);};diff --git a/apps/builder/app/builder/features/topbar/share.tsx b/apps/builder/app/builder/features/topbar/share.tsxindex 24380c9b18..11ef6a3fc3 100644--- a/apps/builder/app/builder/features/topbar/share.tsx+++ b/apps/builder/app/builder/features/topbar/share.tsx@@ -1,14 +1,13 @@import { useStore } from "@nanostores/react";import {Button,- FloatingPanelPopover,- FloatingPanelPopoverContent,- FloatingPanelPopoverTitle,- FloatingPanelPopoverTrigger,- FloatingPanelAnchor,+ PopoverContent,+ PopoverTitle,+ PopoverTrigger,theme,Tooltip,rawTheme,+ Popover,} from "@webstudio-is/design-system";import { ShareProjectContainer } from "~/shared/share-project";import { $authPermit } from "~/shared/nano-states";@@ -30,34 +29,30 @@ export const ShareButton = ({: undefined;return (- <FloatingPanelPopover+ <Popovermodalopen={isShareDialogOpen}onOpenChange={(isOpen) => {$isShareDialogOpen.set(isOpen);}}>- <FloatingPanelAnchor>- <Tooltip- content={tooltipContent ?? "Share a project link"}- sideOffset={Number.parseFloat(rawTheme.spacing[5])}- >- <FloatingPanelPopoverTrigger asChild>- <Button disabled={isShareDisabled} color="gradient">- Share- </Button>- </FloatingPanelPopoverTrigger>- </Tooltip>- </FloatingPanelAnchor>- <FloatingPanelPopoverContent+ <Tooltip+ content={tooltipContent ?? "Share a project link"}+ sideOffset={Number.parseFloat(rawTheme.spacing[5])}+ >+ <PopoverTrigger asChild>+ <Button disabled={isShareDisabled} color="gradient">+ Share+ </Button>+ </PopoverTrigger>+ </Tooltip>+ <PopoverContentsideOffset={Number.parseFloat(rawTheme.spacing[8])}- css={{- marginRight: theme.spacing[3],- }}+ css={{ marginRight: theme.spacing[3] }}><ShareProjectContainer projectId={projectId} hasProPlan={hasProPlan} />- <FloatingPanelPopoverTitle>Share</FloatingPanelPopoverTitle>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ <PopoverTitle>Share</PopoverTitle>+ </PopoverContent>+ </Popover>);};diff --git a/apps/builder/app/builder/shared/binding-popover.tsx b/apps/builder/app/builder/shared/binding-popover.tsxindex cb7c9cb3dd..43c8be5fc6 100644--- a/apps/builder/app/builder/shared/binding-popover.tsx+++ b/apps/builder/app/builder/shared/binding-popover.tsx@@ -6,7 +6,6 @@ import {useRef,useState,createContext,- useContext,type ReactNode,} from "react";import {@@ -21,12 +20,11 @@ import {Button,CssValueListArrowFocus,CssValueListItem,+ DialogTitleActions,+ DialogClose,+ DialogTitle,Flex,- FloatingPanelPopover,- FloatingPanelPopoverClose,- FloatingPanelPopoverContent,- FloatingPanelPopoverTitle,- FloatingPanelPopoverTrigger,+ FloatingPanel,Label,ScrollArea,SmallIconButton,@@ -44,7 +42,6 @@ import {formatValuePreview,type EditorApi,} from "./expression-editor";-import { useSideOffset } from "./floating-panel";import {$dataSourceVariables,$isDesignMode,@@ -358,13 +355,7 @@ export const BindingPopover = ({onChange: (newValue: string) => void;onRemove: (evaluatedValue: unknown) => void;}) => {- const { side = "left", containerRef } = useContext(BindingPopoverContext);const [isOpen, onOpenChange] = useState(false);- const [triggerRef, sideOffset] = useSideOffset({- side,- isOpen,- containerRef,- });const hasUnsavedChange = useRef<boolean>(false);const preventedClosing = useRef<boolean>(false);const isDesignMode = useStore($isDesignMode);@@ -375,8 +366,8 @@ export const BindingPopover = ({const valueError = validate?.(evaluateExpressionWithinScope(value, scope));return (- <FloatingPanelPopover- modal+ <FloatingPanel+ placement="right-start"open={isOpen}onOpenChange={(newOpen) => {// handle special case for popover close@@ -391,15 +382,42 @@ export const BindingPopover = ({}onOpenChange(newOpen);}}- >- <FloatingPanelPopoverTrigger asChild ref={triggerRef}>- <BindingButton variant={variant} error={valueError} value={value} />- </FloatingPanelPopoverTrigger>- <FloatingPanelPopoverContent- sideOffset={sideOffset}- side={side}- align="start"- >+ title={+ <DialogTitle+ suffix={+ <DialogTitleActions>+ <Tooltip content="Reset binding" side="bottom">+ {/* automatically close popover when remove expression */}+ <DialogClose>+ <Button+ aria-label="Reset binding"+ prefix={<TrashIcon />}+ color="ghost"+ disabled={variant === "default"}+ onClick={(event) => {+ event.preventDefault();+ // inline variables and close dialog+ const evaluatedValue = evaluateExpressionWithinScope(+ value,+ scope+ );++ onRemove(evaluatedValue);+ preventedClosing.current = false;+ hasUnsavedChange.current = false;+ onOpenChange(false);+ }}+ />+ </DialogClose>+ </Tooltip>+ <DialogClose />+ </DialogTitleActions>+ }+ >+ Binding+ </DialogTitle>+ }+ content={<BindingPanelscope={scope}aliases={aliases}@@ -426,38 +444,9 @@ export const BindingPopover = ({}}}/>- {/* put after content to avoid auto focusing heading buttons */}- <FloatingPanelPopoverTitle- actions={- <Tooltip content="Reset binding" side="bottom">- {/* automatically close popover when remove expression */}- <FloatingPanelPopoverClose asChild>- <Button- aria-label="Reset binding"- prefix={<TrashIcon />}- color="ghost"- disabled={variant === "default"}- onClick={(event) => {- event.preventDefault();- // inline variables and close dialog- const evaluatedValue = evaluateExpressionWithinScope(- value,- scope- );-- onRemove(evaluatedValue);- preventedClosing.current = false;- hasUnsavedChange.current = false;- onOpenChange(false);- }}- />- </FloatingPanelPopoverClose>- </Tooltip>- }- >- Binding- </FloatingPanelPopoverTitle>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ }+ >+ <BindingButton variant={variant} error={valueError} value={value} />+ </FloatingPanel>);};diff --git a/apps/builder/app/builder/shared/code-editor-base.tsx b/apps/builder/app/builder/shared/code-editor-base.tsxindex 82a833f96f..3c9772a534 100644--- a/apps/builder/app/builder/shared/code-editor-base.tsx+++ b/apps/builder/app/builder/shared/code-editor-base.tsx@@ -2,7 +2,6 @@ import {useEffect,useRef,type ReactNode,- useState,forwardRef,type ComponentProps,type RefObject,@@ -32,20 +31,15 @@ import {textVariants,css,SmallIconButton,- Dialog,- DialogTrigger,- DialogContent,Grid,- DialogTitle,- Button,- DialogClose,Flex,rawTheme,globalCss,Kbd,Text,+ FloatingPanel,} from "@webstudio-is/design-system";-import { CrossIcon, MaximizeIcon, MinimizeIcon } from "@webstudio-is/icons";+import { MaximizeIcon } from "@webstudio-is/icons";import { solarizedLight } from "./code-highlight";// This undocumented flag is required to keep contenteditable fields editable after the first activation of EditorView.@@ -423,42 +417,32 @@ export const EditorDialogButton = forwardRef<EditorDialogButton.displayName = "EditorDialogButton";export const EditorDialog = ({- open,- onOpenChange,- title,content,children,+ placement = "center",width = 640,height = 480,- x,- y,+ ...panelProps}: {- open?: boolean;- onOpenChange?: (newOpen: boolean) => void;- title?: ReactNode;+ title: ReactNode;content: ReactNode;children: ReactNode;- x?: number;- y?: number;width?: number;height?: number;+ placement?: ComponentProps<typeof FloatingPanel>["placement"];+ resize?: ComponentProps<typeof FloatingPanel>["resize"];+ open?: boolean;+ onOpenChange?: (newOpen: boolean) => void;}) => {- const [isMaximized, setIsMaximized] = useState(false);return (- <Dialog open={open} onOpenChange={onOpenChange} modal={false}>- <DialogTrigger asChild>{children}</DialogTrigger>- <DialogContent- resize="auto"- width={width}- height={height}- x={x}- y={y}- minHeight={240}- isMaximized={isMaximized}- onInteractOutside={(event) => {- event.preventDefault();- }}- >+ <FloatingPanel+ {...panelProps}+ width={width}+ height={height}+ placement={placement}+ maximizable+ resize="auto"+ content={<Gridalign="stretch"css={{@@ -470,38 +454,9 @@ export const EditorDialog = ({>{content}</Grid>- {/* Title is at the end intentionally,- * to make the close button last in the tab order- */}- <DialogTitle- draggable- suffix={- <Flex- gap="1"- onMouseDown={(event) => {- // Prevent dragging dialog- event.preventDefault();- }}- >- <Button- color="ghost"- prefix={isMaximized ? <MinimizeIcon /> : <MaximizeIcon />}- aria-label="Expand"- onClick={() => setIsMaximized(isMaximized ? false : true)}- />- <DialogClose asChild>- <Button- color="ghost"- prefix={<CrossIcon />}- aria-label="Close"- />- </DialogClose>- </Flex>- }- >- {title}- </DialogTitle>- </DialogContent>- </Dialog>+ }+ >+ {children}+ </FloatingPanel>);};diff --git a/apps/builder/app/builder/shared/expression-editor.tsx b/apps/builder/app/builder/shared/expression-editor.tsxindex 74597cc677..d4a77e5a50 100644--- a/apps/builder/app/builder/shared/expression-editor.tsx+++ b/apps/builder/app/builder/shared/expression-editor.tsx@@ -506,7 +506,7 @@ export const ExpressionEditor = ({<div className={wrapperStyle.toString()}><EditorDialogControl>{content}- <EditorDialog content={content}>+ <EditorDialog title="Expression Editor" content={content}><EditorDialogButton /></EditorDialog></EditorDialogControl>@@ -549,6 +549,7 @@ export const ValuePreviewDialog = ({onOpenChange={onOpenChange}title={title}content={<ValuePreviewEditor value={value} />}+ resize="auto">{children}</EditorDialog>diff --git a/apps/builder/app/builder/shared/floating-panel.tsx b/apps/builder/app/builder/shared/floating-panel.tsxdeleted file mode 100644index 82a5dc7aa0..0000000000--- a/apps/builder/app/builder/shared/floating-panel.tsx+++ /dev/null@@ -1,127 +0,0 @@-import {- type RefObject,- useContext,- useRef,- useState,- createContext,- useLayoutEffect,- type JSX,-} from "react";-import {- FloatingPanelPopover,- theme,- css,- FloatingPanelPopoverTrigger,- FloatingPanelPopoverContent,- FloatingPanelPopoverTitle,-} from "@webstudio-is/design-system";--export const useSideOffset = ({- side = "left",- isOpen,- containerRef,-}: {- side?: "left" | "right";- isOpen: boolean;- containerRef?: RefObject<null | HTMLElement>;-}): [RefObject<HTMLButtonElement>, number] => {- const triggerRef = useRef<null | HTMLButtonElement>(null);- const [sideOffset, setSideOffset] = useState(0);-- // use layout effect to avoid popover jumping- useLayoutEffect(() => {- if (- isOpen === false ||- containerRef === undefined ||- containerRef.current === null ||- triggerRef.current === null- ) {- // Prevent computation if the panel is closed- return;- }- const containerRect = containerRef.current.getBoundingClientRect();- const triggerRect = triggerRef.current.getBoundingClientRect();- if (side === "left") {- setSideOffset(triggerRect.left - containerRect.left);- }- if (side === "right") {- const containerRight = containerRect.left + containerRect.width;- const triggerRight = triggerRect.left + triggerRect.width;- setSideOffset(containerRight - triggerRight);- }- }, [side, isOpen, containerRef]);-- return [triggerRef, sideOffset];-};--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>-);--// @todo add support for positioning next to the left panel-type FloatingPanelProps = {- title: string;- content: JSX.Element;- children: JSX.Element;- isOpen?: boolean;- onIsOpenChange?: (isOpen: boolean) => void;- // collisionPadding is the distance in pixels from the boundary edges where collision detection should occur.- collisionPadding?:- | number- | Partial<Record<"top" | "right" | "bottom" | "left", number>>;- align?: "start" | "center" | "end";-};--const contentStyle = css({- width: theme.sizes.sidebarWidth,-});--export const FloatingPanel = ({- title,- content,- children,- isOpen: externalIsOpen,- align,- onIsOpenChange: setExternalIsOpen,- collisionPadding,-}: FloatingPanelProps) => {- const [internalIsOpen, setInternalIsOpen] = useState(false);- const isOpen = externalIsOpen ?? internalIsOpen;- const setIsOpen = setExternalIsOpen ?? setInternalIsOpen;- const { container: containerRef } = useContext(FloatingPanelContext);- const [triggerRef, sideOffset] = useSideOffset({ isOpen, containerRef });-- return (- <FloatingPanelPopover open={isOpen} onOpenChange={setIsOpen} modal>- <FloatingPanelPopoverTrigger asChild ref={triggerRef}>- {children}- </FloatingPanelPopoverTrigger>- <FloatingPanelPopoverContent- sideOffset={sideOffset}- side="left"- align={align ?? "start"}- className={contentStyle()}- collisionPadding={collisionPadding}- >- {content}- <FloatingPanelPopoverTitle>{title}</FloatingPanelPopoverTitle>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>- );-};diff --git a/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx b/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsxindex 83fc86d864..32d1e1d42c 100644--- a/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx+++ b/apps/builder/app/builder/shared/image-manager/image-info-tigger.tsx@@ -1,10 +1,10 @@import { useState } from "react";import {SmallIconButton,- FloatingPanelPopover,- FloatingPanelPopoverTrigger,- FloatingPanelPopoverContent,- FloatingPanelPopoverTitle,+ Popover,+ PopoverTrigger,+ PopoverContent,+ PopoverTitle,} from "@webstudio-is/design-system";import { GearIcon, gearIconCssVars } from "@webstudio-is/icons";import type { Asset } from "@webstudio-is/sdk";@@ -26,8 +26,8 @@ export const ImageInfoTrigger = ({}) => {const [isInfoOpen, setInfoOpen] = useState(false);return (- <FloatingPanelPopover modal open={isInfoOpen} onOpenChange={setInfoOpen}>- <FloatingPanelPopoverTrigger asChild>+ <Popover modal open={isInfoOpen} onOpenChange={setInfoOpen}>+ <PopoverTrigger asChild><SmallIconButtontitle="Options"onClick={() => setInfoOpen(true)}@@ -47,9 +47,9 @@ export const ImageInfoTrigger = ({}}icon={<GearIcon />}/>- </FloatingPanelPopoverTrigger>- <FloatingPanelPopoverContent>- <FloatingPanelPopoverTitle>Asset Details</FloatingPanelPopoverTitle>+ </PopoverTrigger>+ <PopoverContent>+ <PopoverTitle>Asset Details</PopoverTitle><ImageInfoonDelete={(ids) => {setInfoOpen(false);@@ -57,7 +57,7 @@ export const ImageInfoTrigger = ({}}asset={asset}/>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ </PopoverContent>+ </Popover>);};diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsxindex 5ab069fd31..15e5f843e3 100644--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx@@ -108,7 +108,7 @@ const DialogContent = ({</Flex><DialogActions>{primaryButton}- <DialogClose asChild>+ <DialogClose><Button color="ghost">Cancel</Button></DialogClose></DialogActions>diff --git a/apps/builder/app/shared/clone-project.tsx b/apps/builder/app/shared/clone-project.tsxindex d4cb382f20..ffee450046 100644--- a/apps/builder/app/shared/clone-project.tsx+++ b/apps/builder/app/shared/clone-project.tsx@@ -119,7 +119,7 @@ const CloneProjectView = ({>Clone</Button>- <DialogClose asChild>+ <DialogClose><Button color="ghost">Cancel</Button></DialogClose></DialogActions>diff --git a/apps/builder/app/shared/share-project/share-project.stories.tsx b/apps/builder/app/shared/share-project/share-project.stories.tsxindex aebccd9583..b9077b2cd3 100644--- a/apps/builder/app/shared/share-project/share-project.stories.tsx+++ b/apps/builder/app/shared/share-project/share-project.stories.tsx@@ -1,9 +1,9 @@import type { StoryFn } from "@storybook/react";import {Button,- FloatingPanelPopover,- FloatingPanelPopoverContent,- FloatingPanelPopoverTrigger,+ Popover,+ PopoverContent,+ PopoverTrigger,} from "@webstudio-is/design-system";import { useEffect, useState } from "react";import { type LinkOptions, ShareProject } from "./share-project";@@ -88,12 +88,12 @@ const useShareProject = (export const Empty: StoryFn<typeof ShareProject> = () => {const props = useShareProject();return (- <FloatingPanelPopover modal open>- <FloatingPanelPopoverTrigger asChild>+ <Popover modal open>+ <PopoverTrigger asChild><Button>Share</Button>- </FloatingPanelPopoverTrigger>+ </PopoverTrigger>- <FloatingPanelPopoverContent>+ <PopoverContent><ShareProject{...props}hasProPlan={false}@@ -102,20 +102,20 @@ export const Empty: StoryFn<typeof ShareProject> = () => {`https://blabla.com/${authToken}/${mode}`}></ShareProject>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ </PopoverContent>+ </Popover>);};export const WithLinks: StoryFn<typeof ShareProject> = () => {const props = useShareProject(initialLinks);return (- <FloatingPanelPopover modal open>- <FloatingPanelPopoverTrigger asChild>+ <Popover modal open>+ <PopoverTrigger asChild><Button>Share</Button>- </FloatingPanelPopoverTrigger>+ </PopoverTrigger>- <FloatingPanelPopoverContent>+ <PopoverContent><ShareProject{...props}hasProPlan={false}@@ -124,20 +124,20 @@ export const WithLinks: StoryFn<typeof ShareProject> = () => {`https://blabla.com/${authToken}/${mode}`}></ShareProject>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ </PopoverContent>+ </Popover>);};export const WithAsyncLinks: StoryFn<typeof ShareProject> = () => {const props = useShareProject(initialLinks, true);return (- <FloatingPanelPopover modal open>- <FloatingPanelPopoverTrigger asChild>+ <Popover modal open>+ <PopoverTrigger asChild><Button>Share</Button>- </FloatingPanelPopoverTrigger>+ </PopoverTrigger>- <FloatingPanelPopoverContent>+ <PopoverContent><ShareProject{...props}hasProPlan={false}@@ -146,7 +146,7 @@ export const WithAsyncLinks: StoryFn<typeof ShareProject> = () => {`https://blabla.com/${authToken}/${mode}`}></ShareProject>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ </PopoverContent>+ </Popover>);};diff --git a/packages/design-system/src/components/css-value-list-item.stories.tsx b/packages/design-system/src/components/css-value-list-item.stories.tsxindex 82667c027c..a47eb9b4ac 100644--- a/packages/design-system/src/components/css-value-list-item.stories.tsx+++ b/packages/design-system/src/components/css-value-list-item.stories.tsx@@ -13,11 +13,7 @@ import {SubtractIcon,} from "@webstudio-is/icons";import { SmallIconButton } from "./small-icon-button";-import {- FloatingPanelPopover,- FloatingPanelPopoverContent,- FloatingPanelPopoverTrigger,-} from "./floating-panel-popover";+import { Popover, PopoverContent, PopoverTrigger } from "./popover";import { StorySection, StoryGrid } from "./storybook";export default {@@ -102,8 +98,8 @@ export const Declarative = (props: {return (<Panel><StorySection title="Configurable">- <FloatingPanelPopover>- <FloatingPanelPopoverTrigger asChild>+ <Popover>+ <PopoverTrigger asChild><CssValueListItemid="0"index={0}@@ -133,11 +129,11 @@ export const Declarative = (props: {</>}/>- </FloatingPanelPopoverTrigger>- <FloatingPanelPopoverContent>+ </PopoverTrigger>+ <PopoverContent><div className={css({ p: theme.spacing[10] })()}>Content</div>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>+ </PopoverContent>+ </Popover></StorySection><StorySection title="Overflows">diff --git a/packages/design-system/src/components/dialog.stories.tsx b/packages/design-system/src/components/dialog.stories.tsxindex 59cc9e8716..2eab3acacd 100644--- a/packages/design-system/src/components/dialog.stories.tsx+++ b/packages/design-system/src/components/dialog.stories.tsx@@ -40,10 +40,10 @@ const DialogDemo = () => (<p className={descriptionStyle()}>This is a description</p></DialogDescription><div className={buttonsStyle()}>- <DialogClose asChild>+ <DialogClose><Button color="ghost">Cancel</Button></DialogClose>- <DialogClose asChild>+ <DialogClose><Button color="positive">Save</Button></DialogClose></div>diff --git a/packages/design-system/src/components/dialog.tsx b/packages/design-system/src/components/dialog.tsxindex f698ae3042..236ad30e1e 100644--- a/packages/design-system/src/components/dialog.tsx+++ b/packages/design-system/src/components/dialog.tsx@@ -5,23 +5,23 @@ import {forwardRef,useRef,type DragEventHandler,+ createContext,+ useContext,+ useState,} from "react";import * as Primitive from "@radix-ui/react-dialog";import { css, theme, type CSS } from "../stitches.config";import { PanelTitle } from "./panel-title";-import { floatingPanelStyle, CloseButton, TitleSlot } from "./floating-panel";import { Flex } from "./flex";import { useDisableCanvasPointerEvents } from "../utilities";import type { CSSProperties } from "@stitches/react";import { mergeRefs } from "@react-aria/utils";+import { Button } from "./button";+import { CrossIcon, MaximizeIcon, MinimizeIcon } from "@webstudio-is/icons";+import { Separator } from "./separator";-export const Dialog = Primitive.Root;export const DialogTrigger = Primitive.Trigger;-// Wrap a close button with this-// https://www.radix-ui.com/docs/primitives/components/dialog#close-export const DialogClose = Primitive.Close;-// An optional accessible description to be announced when the dialog is opened// https://www.radix-ui.com/docs/primitives/components/dialog#descriptionexport const DialogDescription = Primitive.Description;@@ -34,6 +34,74 @@ if (placeholderImage) {"data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==";}+const panelStyle = css({+ border: `1px solid ${theme.colors.borderMain}`,+ boxShadow: theme.shadows.panelSectionDropShadow,+ background: theme.colors.backgroundPanel,+ borderRadius: theme.borderRadius[7],+ display: "flex",+ flexDirection: "column",++ "&:focus": {+ // override browser default+ outline: "none",+ },+});++const DialogContext = createContext<{+ isMaximized: boolean;+ setIsMaximized: (isMaximized: boolean) => void;+}>({+ isMaximized: false,+ setIsMaximized: () => {},+});++export const Dialog = (props: ComponentProps<typeof Primitive.Dialog>) => {+ const [isMaximized, setIsMaximized] = useState(false);+ return (+ <DialogContext.Provider value={{ isMaximized, setIsMaximized }}>+ <Primitive.Dialog {...props} />+ </DialogContext.Provider>+ );+};++export const DialogClose = forwardRef(+ (+ { children, ...props }: ComponentProps<typeof Button>,+ ref: Ref<HTMLButtonElement>+ ) => (+ <Primitive.Close asChild>+ {children ?? (+ <Button+ color="ghost"+ prefix={<CrossIcon />}+ aria-label="Close"+ {...props}+ ref={ref}+ />+ )}+ </Primitive.Close>+ )+);+DialogClose.displayName = "DialogClose";++export const DialogMaximize = forwardRef(+ (props: ComponentProps<typeof Button>, ref: Ref<HTMLButtonElement>) => {+ const { isMaximized, setIsMaximized } = useContext(DialogContext);+ return (+ <Button+ color="ghost"+ prefix={isMaximized ? <MinimizeIcon /> : <MaximizeIcon />}+ aria-label="Expand"+ onClick={() => setIsMaximized(isMaximized ? false : true)}+ {...props}+ ref={ref}+ />+ );+ }+);+DialogMaximize.displayName = "DialogMaximize";+type Point = { x: number; y: number };type Size = { width: number; height: number };type Rect = Point & Size;@@ -45,7 +113,6 @@ type UseDraggableProps = {} & Partial<Rect>;const useDraggable = ({- isMaximized = false,x,y,width,@@ -53,6 +120,7 @@ const useDraggable = ({minHeight,minWidth,}: UseDraggableProps) => {+ const { isMaximized } = useContext(DialogContext);const initialDataRef = useRef<| undefined| {@@ -150,8 +218,7 @@ export const DialogContent = forwardRef(children,className,css,- resize,- isMaximized,+ resize = "none",width,height,x,@@ -162,7 +229,7 @@ export const DialogContent = forwardRef(}: ComponentProps<typeof Primitive.Content> &UseDraggableProps & {css?: CSS;- resize?: "auto";+ resize?: "auto" | "none";},forwardedRef: Ref<HTMLDivElement>) => {@@ -173,7 +240,6 @@ export const DialogContent = forwardRef(y,minWidth,minHeight,- isMaximized,});return (@@ -193,31 +259,42 @@ export const DialogContent = forwardRef();DialogContent.displayName = "DialogContent";+const titleSlotStyle = css({+ // We put title at the bottom in DOM to make the close button last in the TAB order+ // But visually we want it to be first+ order: -1,+});+export const DialogTitle = ({children,- closeLabel = "Close dialog",suffix,...rest}: ComponentProps<typeof PanelTitle> & {suffix?: ReactNode;closeLabel?: string;}) => (- <TitleSlot>- <PanelTitle- {...rest}- suffix={- suffix ?? (- <DialogClose asChild>- <CloseButton aria-label={closeLabel} />- </DialogClose>- )- }- >+ <div className={titleSlotStyle()}>+ <PanelTitle {...rest} suffix={suffix ?? <DialogClose />}><Primitive.Title className={titleStyle()}>{children}</Primitive.Title></PanelTitle>- </TitleSlot>+ <Separator />+ </div>);+export const DialogTitleActions = ({ children }: { children: ReactNode }) => {+ return (+ <Flex+ gap="1"+ onMouseDown={(event) => {+ // Prevent dragging dialog+ event.preventDefault();+ }}+ >+ {children}+ </Flex>+ );+};+export const DialogActions = ({ children }: { children: ReactNode }) => {return (<Flex@@ -247,12 +324,13 @@ const centeredContent: CSSProperties = {transform: "translate(-50%, -50%)",};-const contentStyle = css(floatingPanelStyle, {+const contentStyle = css(panelStyle, {position: "fixed",width: "min-content",minWidth: theme.sizes.sidebarWidth,- maxWidth: "calc(100vw - 40px)",- maxHeight: "calc(100vh - 40px)",+ minHeight: theme.spacing[22],+ maxWidth: `calc(100vw - ${theme.spacing[15]})`,+ maxHeight: `calc(100vh - ${theme.spacing[15]})`,userSelect: "none",overflow: "hidden",@@ -261,6 +339,9 @@ const contentStyle = css(floatingPanelStyle, {auto: {resize: "auto",},+ none: {+ resize: "none",+ },},},});diff --git a/packages/design-system/src/components/floating-panel-popover.stories.tsx b/packages/design-system/src/components/floating-panel-popover.stories.tsxdeleted file mode 100644index 35f07dc3c6..0000000000--- a/packages/design-system/src/components/floating-panel-popover.stories.tsx+++ /dev/null@@ -1,56 +0,0 @@-import { Button } from "./button";-import { css, theme } from "../stitches.config";-import { textVariants } from "./text";-import {- FloatingPanelPopover,- FloatingPanelPopoverClose,- FloatingPanelPopoverContent,- FloatingPanelPopoverTitle,- FloatingPanelPopoverTrigger,-} from "./floating-panel-popover";--export default {- title: "Library/Floating Panel/Popover",-};--const bodyStyle = css({- padding: theme.spacing[9],-});--const descriptionStyle = css(textVariants.regular, {- marginTop: 0,- marginBottom: theme.spacing[9],-});--const buttonsStyle = css({- display: "flex",- gap: theme.spacing[5],- justifyContent: "flex-end",-});--const PopoverDemo = () => (- <FloatingPanelPopover defaultOpen>- <FloatingPanelPopoverTrigger asChild>- <Button>Open</Button>- </FloatingPanelPopoverTrigger>- <FloatingPanelPopoverContent>- <div className={bodyStyle()}>- <p className={descriptionStyle()}>This is a description</p>- <div className={buttonsStyle()}>- <FloatingPanelPopoverClose asChild>- <Button color="ghost">Cancel</Button>- </FloatingPanelPopoverClose>- <FloatingPanelPopoverClose asChild>- <Button color="positive">Save</Button>- </FloatingPanelPopoverClose>- </div>- </div>-- {/* Title is at the end intentionally,- * to make the close button last in the tab order- */}- <FloatingPanelPopoverTitle>Title</FloatingPanelPopoverTitle>- </FloatingPanelPopoverContent>- </FloatingPanelPopover>-);-export { PopoverDemo as Popover };diff --git a/packages/design-system/src/components/floating-panel-popover.tsx b/packages/design-system/src/components/floating-panel-popover.tsxdeleted file mode 100644index 5cb9121d9b..0000000000--- a/packages/design-system/src/components/floating-panel-popover.tsx+++ /dev/null@@ -1,74 +0,0 @@-import {- type ComponentProps,- type Ref,- type ReactNode,- forwardRef,-} from "react";-import * as Primitive from "@radix-ui/react-popover";-import { css, theme, type CSS } from "../stitches.config";-import { PanelTitle } from "./panel-title";-import { floatingPanelStyle, CloseButton, TitleSlot } from "./floating-panel";-import { Flex } from "./flex";--export const FloatingPanelPopover = Primitive.Root;--const contentStyle = css(floatingPanelStyle, {- minWidth: theme.spacing[28],- maxWidth: "max-content",- maxHeight: "80vh",- overflowY: "auto",-});--export const FloatingPanelPopoverContent = forwardRef(- (- {- children,- className,- css,- ...props- }: ComponentProps<typeof Primitive.Content> & { css?: CSS },- ref: Ref<HTMLDivElement>- ) => (- <Primitive.Portal>- <Primitive.Content- sideOffset={4}- collisionPadding={4}- className={contentStyle({ className, css })}- {...props}- ref={ref}- >- {children}- </Primitive.Content>- </Primitive.Portal>- )-);-FloatingPanelPopoverContent.displayName = "FloatingPanelPopoverContent";--export const FloatingPanelPopoverTitle = ({- children,- actions,- closeLabel = "Close dialog",-}: {- children: ReactNode;- actions?: ReactNode;- closeLabel?: string;-}) => (- <TitleSlot>- <PanelTitle- suffix={- <Flex gap={1}>- {actions}- <Primitive.Close asChild>- <CloseButton aria-label={closeLabel} />- </Primitive.Close>- </Flex>- }- >- {children}- </PanelTitle>- </TitleSlot>-);--export const FloatingPanelPopoverTrigger = Primitive.Trigger;-export const FloatingPanelPopoverClose = Primitive.Close;-export const FloatingPanelAnchor = Primitive.Anchor;diff --git a/packages/design-system/src/components/floating-panel.stories.tsx b/packages/design-system/src/components/floating-panel.stories.tsxnew file mode 100644index 0000000000..e9aa94c56a--- /dev/null+++ b/packages/design-system/src/components/floating-panel.stories.tsx@@ -0,0 +1,102 @@+import { useRef, type ReactNode } from "react";+import { FloatingPanelProvider, FloatingPanel } from "./floating-panel";+import { Box } from "./box";+import { Button } from "./button";+import { Text } from "./text";++export default {+ component: FloatingPanel,+};++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>+ );+};++export const Left = () => {+ return (+ <Container>+ <FloatingPanel open title="Title" content={<Text>Content</Text>}>+ <Button>Open on the left</Button>+ </FloatingPanel>+ </Container>+ );+};++export const Right = () => {+ return (+ <Container>+ <FloatingPanel+ placement="right-start"+ open+ title="Title"+ content={<Text>Content</Text>}+ >+ <Button>Open on the right</Button>+ </FloatingPanel>+ </Container>+ );+};++export const Bottom = () => {+ return (+ <Container>+ <FloatingPanel+ placement="bottom"+ open+ title="Title"+ content={<Text>Content</Text>}+ >+ <Button>Open below</Button>+ </FloatingPanel>+ </Container>+ );+};++export const Center = () => {+ return (+ <Container>+ <FloatingPanel+ placement="center"+ open+ maximizable+ resize="auto"+ title="Title"+ content={<Text>Content</Text>}+ >+ <Button>Open screen-centered</Button>+ </FloatingPanel>+ </Container>+ );+};++export const CustomOffsetAndSize = () => {+ return (+ <Container>+ <FloatingPanel+ offset={{ mainAxis: 20, alignmentAxis: -100 }}+ width={200}+ height={300}+ open+ title="Title"+ content={<Text>Content</Text>}+ >+ <Button>Open with custom offsets</Button>+ </FloatingPanel>+ </Container>+ );+};diff --git a/packages/design-system/src/components/floating-panel.tsx b/packages/design-system/src/components/floating-panel.tsxindex a954d4f7de..b2b5474237 100644--- a/packages/design-system/src/components/floating-panel.tsx+++ b/packages/design-system/src/components/floating-panel.tsx@@ -1,48 +1,177 @@-/**- * Implementations of the "Floating Panel" component from:- * https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=4%3A2679&t=6Q0l4j0CBvXkuKYp-0- */-import {- forwardRef,- type Ref,type ReactNode,type ComponentProps,+ createContext,+ type RefObject,+ useContext,+ useState,+ useRef,+ useLayoutEffect,+ useCallback,} from "react";-import { CrossIcon } from "@webstudio-is/icons";import { css, theme } from "../stitches.config";-import { Button } from "./button";-import { Separator } from "./separator";--export const floatingPanelStyle = css({- border: `1px solid ${theme.colors.borderMain}`,- boxShadow: theme.shadows.menuDropShadow,- background: theme.colors.backgroundPanel,- borderRadius: theme.borderRadius[7],- display: "flex",- flexDirection: "column",-- "&:focus": {- // override browser default- outline: "none",+import {+ Dialog,+ DialogTitleActions,+ DialogClose,+ DialogContent,+ DialogTitle,+ DialogTrigger,+ DialogMaximize,+} from "./dialog";+import {+ computePosition,+ flip,+ offset,+ shift,+ type OffsetOptions,+} from "@floating-ui/dom";++const FloatingPanelContext = createContext<{+ container: RefObject<null | HTMLElement>;+}>({+ container: {+ current: null,},});-const titleSlotStyle = css({- // We put title at the bottom in DOM to make the close button last in the TAB order- // But visually we want it to be first- order: -1,-});-export const TitleSlot = ({ children }: { children: ReactNode }) => (- <div className={titleSlotStyle()}>+export const FloatingPanelProvider = ({+ children,+ container,+}: {+ children: JSX.Element;+ container: RefObject<null | HTMLElement>;+}) => (+ <FloatingPanelContext.Provider value={{ container }}>{children}- <Separator />- </div>+ </FloatingPanelContext.Provider>);-export const CloseButton = forwardRef(- (props: ComponentProps<typeof Button>, ref: Ref<HTMLButtonElement>) => (- <Button color="ghost" prefix={<CrossIcon />} {...props} ref={ref} />- )-);-CloseButton.displayName = "CloseButton";+type FloatingPanelProps = {+ title: ReactNode;+ content: ReactNode;+ children: ReactNode;+ maximizable?: boolean;+ resize?: ComponentProps<typeof DialogContent>["resize"];+ width?: number;+ height?: number;+ // - bottom - below the trigger button+ // - 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";+ offset?: OffsetOptions;+ open?: boolean;+ onOpenChange?: (isOpen: boolean) => void;+};++const contentStyle = css({+ width: theme.sizes.sidebarWidth,+});++export const FloatingPanel = ({+ title,+ content,+ children,+ resize,+ maximizable,+ width,+ height,+ placement = "left-start",+ offset: offsetProp = { mainAxis: 10 },+ open,+ onOpenChange,+}: FloatingPanelProps) => {+ const { container: containerRef } = useContext(FloatingPanelContext);+ const [contentElement, setContentElement] = useState<HTMLDivElement | null>(+ null+ );+ const triggerRef = useRef<HTMLButtonElement>(null);+ const [x, setX] = useState<number>();+ const [y, setY] = useState<number>();++ const calcPosition = useCallback(() => {+ if (+ triggerRef.current === null ||+ containerRef.current === null ||+ contentElement === null ||+ // When centering the dialog, we don't need to calculate the position+ placement === "center"+ ) {+ return;+ }++ const triggerRect = triggerRef.current.getBoundingClientRect();+ const containerRect = containerRef.current.getBoundingClientRect();++ const anchor = {+ getBoundingClientRect() {+ return {+ width: containerRect.width,+ height: triggerRect.height,+ x: containerRect.x,+ y: triggerRect.y,+ left: containerRect.left,+ right: containerRect.right,+ top: triggerRect.top,+ bottom: triggerRect.bottom,+ };+ },+ };++ computePosition(anchor, contentElement, {+ placement,+ middleware: [+ shift(),+ placement === "bottom" && flip(),+ offset(offsetProp),+ ],+ }).then(({ x, y }) => {+ setX(x);+ setY(y);+ });+ }, [contentElement, triggerRef, containerRef, placement, offsetProp]);++ useLayoutEffect(calcPosition, [calcPosition]);++ return (+ <Dialog open={open} modal={false} onOpenChange={onOpenChange}>+ <DialogTrigger asChild ref={triggerRef}>+ {children}+ </DialogTrigger>+ <DialogContent+ draggable+ resize={resize}+ className={contentStyle()}+ width={width}+ height={height}+ x={x}+ y={y}+ 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,+ // while not allowing having multiple non-center positioned dialogs open at the same time.+ if (placement === "center") {+ event.preventDefault();+ }+ }}+ ref={setContentElement}+ >+ {content}+ {typeof title === "string" ? (+ <DialogTitle+ suffix={+ <DialogTitleActions>+ {maximizable && <DialogMaximize />}+ <DialogClose />+ </DialogTitleActions>+ }+ >+ {title}+ </DialogTitle>+ ) : (+ title+ )}+ </DialogContent>+ </Dialog>+ );+};diff --git a/packages/design-system/src/components/popover.stories.tsx b/packages/design-system/src/components/popover.stories.tsxindex 719364f147..9e6eecc3e5 100644--- a/packages/design-system/src/components/popover.stories.tsx+++ b/packages/design-system/src/components/popover.stories.tsx@@ -26,7 +26,7 @@ const PopoverDemo = () => (</Flex><PopoverSeparator /><Flex css={{ padding: theme.spacing[3] }}>- <PopoverClose asChild>+ <PopoverClose><MenuItemButton>Close</MenuItemButton></PopoverClose></Flex>diff --git a/packages/design-system/src/components/popover.tsx b/packages/design-system/src/components/popover.tsxindex 07b1db9106..55ff9e84ee 100644--- a/packages/design-system/src/components/popover.tsx+++ b/packages/design-system/src/components/popover.tsx@@ -1,7 +1,16 @@-import { type ComponentProps, type Ref, forwardRef } from "react";+import {+ type ComponentProps,+ type ReactNode,+ type Ref,+ forwardRef,+} from "react";import * as Primitive from "@radix-ui/react-popover";import { css, theme, styled, type CSS } from "../stitches.config";import { Separator } from "./separator";+import { PanelTitle } from "./panel-title";+import { Flex } from "./flex";+import { Button } from "./button";+import { CrossIcon } from "@webstudio-is/icons";export const Popover = Primitive.Root;@@ -15,12 +24,39 @@ const contentStyle = css({display: "flex",flexDirection: "column",maxWidth: "max-content",+ overflow: "clip","&:focus": {// override browser defaultoutline: "none",},});+const titleSlotStyle = css({+ // We put title at the bottom in DOM to make the close button last in the TAB order+ // But visually we want it to be first+ order: -1,+});++export const PopoverTitle = ({+ children,+ suffix,+ ...rest+}: ComponentProps<typeof PanelTitle> & {+ suffix?: ReactNode;+ closeLabel?: string;+}) => (+ <div className={titleSlotStyle()}>+ <PanelTitle {...rest} suffix={suffix ?? <PopoverClose />}>+ {children}+ </PanelTitle>+ <Separator />+ </div>+);++export const PopoverTitleActions = ({ children }: { children: ReactNode }) => {+ return <Flex gap="1">{children}</Flex>;+};+export const PopoverContent = forwardRef(({@@ -50,7 +86,26 @@ export const PopoverContent = forwardRef(PopoverContent.displayName = "PopoverContent";export const PopoverTrigger = Primitive.Trigger;-export const PopoverClose = Primitive.Close;++export const PopoverClose = forwardRef(+ (+ { children, ...props }: ComponentProps<typeof Button>,+ ref: Ref<HTMLButtonElement>+ ) => (+ <Primitive.Close asChild>+ {children ?? (+ <Button+ color="ghost"+ prefix={<CrossIcon />}+ aria-label="Close"+ {...props}+ ref={ref}+ />+ )}+ </Primitive.Close>+ )+);+PopoverClose.displayName = "PopoverClose";export const PopoverMenuItemRightSlot = styled("span", {marginLeft: "auto",diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.tsindex 9e85f60249..6dffb02a1c 100644--- a/packages/design-system/src/index.ts+++ b/packages/design-system/src/index.ts@@ -16,7 +16,7 @@ export * from "./components/dropdown-menu";export * from "./components/icon-button"; // mostly aligned, but needs a demo and to use tokensexport * from "./components/toggle-button";export * from "./components/dialog";-export * from "./components/floating-panel-popover";+export * from "./components/floating-panel";export * from "./components/popover";export {MenuList,