Skip to content

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.

position floating panel without hacks

Oleg Isonena21b8c561946
diff --git a/apps/designer/app/designer/features/inspector/inspector.tsx b/apps/designer/app/designer/features/inspector/inspector.tsx
index ff1d1397b6..b3289348a6 100644
--- a/apps/designer/app/designer/features/inspector/inspector.tsx
+++ b/apps/designer/app/designer/features/inspector/inspector.tsx
@@ -12,6 +12,8 @@ import {
import { StylePanel } from "~/designer/features/style-panel";
import { PropsPanel } from "~/designer/features/props-panel";
import { useSelectedInstanceData } from "~/designer/shared/nano-states";
+import { FloatingPanelProvider } from "~/designer/shared/floating-panel";
+import { useRef } from "react";
type InspectorProps = {
publish: Publish;
@@ -25,6 +27,7 @@ const contentStyle = {
export const Inspector = ({ publish }: InspectorProps) => {
const [selectedInstanceData] = useSelectedInstanceData();
+ const tabsRef = useRef<HTMLDivElement>(null);
if (selectedInstanceData === undefined) {
return (
@@ -38,40 +41,34 @@ export const Inspector = ({ publish }: InspectorProps) => {
}
return (
- // @todo: Nit: I wonder if this width was supposed to be defined by the parent container layout
- <Tabs
- defaultValue="style"
- css={{
- width: "100%",
- position:
- "relative" /* Hack - value picker popover positioning depends on it */,
- }}
- >
- <TabsList>
- <TabsTrigger value="style">
- <Text>Style</Text>
- </TabsTrigger>
- {/* @note: events would be part of props */}
- <TabsTrigger value="props">
- <Text>Props</Text>
- </TabsTrigger>
- <TabsTrigger value="inspect">
- <Text>Inspect</Text>
- </TabsTrigger>
- </TabsList>
- <TabsContent value="style" css={contentStyle}>
- <StylePanel
- publish={publish}
- selectedInstanceData={selectedInstanceData}
- />
- </TabsContent>
- <TabsContent value="props" css={contentStyle}>
- <PropsPanel
- publish={publish}
- key={selectedInstanceData.id /* Re-render when instance changes */}
- selectedInstanceData={selectedInstanceData}
- />
- </TabsContent>
- </Tabs>
+ <FloatingPanelProvider container={tabsRef}>
+ <Tabs defaultValue="style" ref={tabsRef}>
+ <TabsList>
+ <TabsTrigger value="style">
+ <Text>Style</Text>
+ </TabsTrigger>
+ {/* @note: events would be part of props */}
+ <TabsTrigger value="props">
+ <Text>Props</Text>
+ </TabsTrigger>
+ <TabsTrigger value="inspect">
+ <Text>Inspect</Text>
+ </TabsTrigger>
+ </TabsList>
+ <TabsContent value="style" css={contentStyle}>
+ <StylePanel
+ publish={publish}
+ selectedInstanceData={selectedInstanceData}
+ />
+ </TabsContent>
+ <TabsContent value="props" css={contentStyle}>
+ <PropsPanel
+ publish={publish}
+ key={selectedInstanceData.id /* Re-render when instance changes */}
+ selectedInstanceData={selectedInstanceData}
+ />
+ </TabsContent>
+ </Tabs>
+ </FloatingPanelProvider>
);
};
diff --git a/apps/designer/app/designer/features/props-panel/control.tsx b/apps/designer/app/designer/features/props-panel/control.tsx
index f8ff70cf6d..aeb4e890c1 100644
--- a/apps/designer/app/designer/features/props-panel/control.tsx
+++ b/apps/designer/app/designer/features/props-panel/control.tsx
@@ -13,7 +13,7 @@ import {
Switch,
TextField,
} from "@webstudio-is/design-system";
-import { ValuePickerPopover } from "../style-panel/shared/value-picker-popover";
+import { FloatingPanel } from "~/designer/shared/floating-panel/";
import { ImageManager } from "~/designer/shared/image-manager";
import { Checkbox } from "@webstudio-is/design-system";
import { Asset } from "@webstudio-is/asset-uploader";
@@ -153,7 +153,7 @@ type ImageControlProps = {
const ImageControl = ({ asset, onChange }: ImageControlProps) => {
return (
- <ValuePickerPopover
+ <FloatingPanel
title="Images"
content={
<ImageManager
@@ -164,7 +164,7 @@ const ImageControl = ({ asset, onChange }: ImageControlProps) => {
}
>
<TextField defaultValue={asset?.name ?? " - "} />
- </ValuePickerPopover>
+ </FloatingPanel>
);
};
diff --git a/apps/designer/app/designer/features/style-panel/controls/font-family/font-family-control.tsx b/apps/designer/app/designer/features/style-panel/controls/font-family/font-family-control.tsx
index 20a6b77084..4101f3be7b 100644
--- a/apps/designer/app/designer/features/style-panel/controls/font-family/font-family-control.tsx
+++ b/apps/designer/app/designer/features/style-panel/controls/font-family/font-family-control.tsx
@@ -2,7 +2,7 @@ import { TextField } from "@webstudio-is/design-system";
import { FontsManager } from "~/designer/shared/fonts-manager";
import type { ControlProps } from "../../style-sections";
import { getFinalValue } from "../../shared/get-final-value";
-import { ValuePickerPopover } from "../../shared/value-picker-popover";
+import { FloatingPanel } from "~/designer/shared/floating-panel";
import { useState } from "react";
import { toValue } from "@webstudio-is/css-engine";
@@ -23,7 +23,7 @@ export const FontFamilyControl = ({
const setValue = setProperty(styleConfig.property);
return (
- <ValuePickerPopover
+ <FloatingPanel
title="Fonts"
content={<FontsManager value={toValue(value)} onChange={setValue} />}
onOpenChange={setIsOpen}
@@ -32,6 +32,6 @@ export const FontFamilyControl = ({
defaultValue={toValue(value)}
state={isOpen ? "active" : undefined}
/>
- </ValuePickerPopover>
+ </FloatingPanel>
);
};
diff --git a/apps/designer/app/designer/features/style-panel/controls/image/image-control.tsx b/apps/designer/app/designer/features/style-panel/controls/image/image-control.tsx
index a63af97951..680ab105e6 100644
--- a/apps/designer/app/designer/features/style-panel/controls/image/image-control.tsx
+++ b/apps/designer/app/designer/features/style-panel/controls/image/image-control.tsx
@@ -1,7 +1,7 @@
import { TextField } from "@webstudio-is/design-system";
import type { ControlProps } from "../../style-sections";
import { getFinalValue } from "../../shared/get-final-value";
-import { ValuePickerPopover } from "../../shared/value-picker-popover";
+import { FloatingPanel } from "~/designer/shared/floating-panel";
import { ImageManager } from "~/designer/shared/image-manager";
import { useAssets } from "~/designer/shared/assets";
import { toValue } from "@webstudio-is/css-engine";
@@ -31,7 +31,7 @@ export const ImageControl = ({
);
return (
- <ValuePickerPopover
+ <FloatingPanel
title="Images"
content={
<ImageManager
@@ -43,6 +43,6 @@ export const ImageControl = ({
}
>
<TextField defaultValue={selectedAsset?.asset.name} />
- </ValuePickerPopover>
+ </FloatingPanel>
);
};
diff --git a/apps/designer/app/designer/features/style-panel/sections/flex-child/flex-child.tsx b/apps/designer/app/designer/features/style-panel/sections/flex-child/flex-child.tsx
index 9a783d3d59..ae4945ebeb 100644
--- a/apps/designer/app/designer/features/style-panel/sections/flex-child/flex-child.tsx
+++ b/apps/designer/app/designer/features/style-panel/sections/flex-child/flex-child.tsx
@@ -17,7 +17,7 @@ import {
OrderLastIcon,
EllipsesIcon,
} from "@webstudio-is/icons";
-import { ValuePickerPopover } from "../../shared/value-picker-popover";
+import { FloatingPanel } from "~/designer/shared/floating-panel";
export const FlexChildSection = (props: RenderCategoryProps) => {
return (
@@ -159,7 +159,7 @@ const FlexChildSectionSizingPopover = ({
sectionStyle,
}: RenderCategoryProps) => {
return (
- <ValuePickerPopover
+ <FloatingPanel
title="Sizing"
content={
<Grid
@@ -199,7 +199,7 @@ const FlexChildSectionSizingPopover = ({
<Flex>
<EllipsesIcon />
</Flex>
- </ValuePickerPopover>
+ </FloatingPanel>
);
};
@@ -257,7 +257,7 @@ const FlexChildSectionOrder = (props: RenderCategoryProps) => {
const FlexChildSectionOrderPopover = (props: RenderCategoryProps) => {
const { deleteProperty, sectionStyle } = props;
return (
- <ValuePickerPopover
+ <FloatingPanel
title="Order"
content={
<Grid css={{ padding: "$spacing$9" }}>
@@ -275,7 +275,7 @@ const FlexChildSectionOrderPopover = (props: RenderCategoryProps) => {
<Flex>
<EllipsesIcon />
</Flex>
- </ValuePickerPopover>
+ </FloatingPanel>
);
};
diff --git a/apps/designer/app/designer/features/style-panel/sections/typography/typography.tsx b/apps/designer/app/designer/features/style-panel/sections/typography/typography.tsx
index 4e07d430db..462a6a302f 100644
--- a/apps/designer/app/designer/features/style-panel/sections/typography/typography.tsx
+++ b/apps/designer/app/designer/features/style-panel/sections/typography/typography.tsx
@@ -33,7 +33,7 @@ import {
TextUppercaseIcon,
} from "@webstudio-is/icons";
import { ToggleGroupControl } from "../../controls/toggle/toggle-control";
-import { ValuePickerPopover } from "../../shared/value-picker-popover";
+import { FloatingPanel } from "~/designer/shared/floating-panel";
export const TypographySection = (props: RenderCategoryProps) => {
return (
@@ -254,7 +254,7 @@ export const TypographySectionAdvancedPopover = (
const setTextOverflow = setProperty("textOverflow");
const setHyphens = setProperty("hyphens");
return (
- <ValuePickerPopover
+ <FloatingPanel
title="Advanced Typography"
content={
<Grid css={{ padding: "$spacing$9", gap: "$spacing$9" }}>
@@ -348,7 +348,7 @@ export const TypographySectionAdvancedPopover = (
</IconButtonDeprecated>
</Tooltip>
</Flex>
- </ValuePickerPopover>
+ </FloatingPanel>
);
};
diff --git a/apps/designer/app/designer/features/style-panel/shared/value-picker-popover.tsx b/apps/designer/app/designer/features/style-panel/shared/value-picker-popover.tsx
deleted file mode 100644
index c365d1a50a..0000000000
--- a/apps/designer/app/designer/features/style-panel/shared/value-picker-popover.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
- Popover,
- PopoverTrigger,
- PopoverContent,
- PopoverHeader,
- PopoverPortal,
-} from "@webstudio-is/design-system";
-import { MutableRefObject, useRef, useState } from "react";
-
-const usePickerSideOffset = (
- isOpen: boolean
-): [MutableRefObject<HTMLButtonElement | null>, number] => {
- const ref = useRef<HTMLButtonElement | null>(null);
- // Hack - depends on a relative position of a parent container to calculate the offset.
- const sideOffset =
- isOpen && ref.current !== null ? ref.current.offsetLeft : 0;
- return [ref, sideOffset];
-};
-
-type ValuePickerPopoverProps = {
- title: string;
- content: JSX.Element;
- children: JSX.Element;
- onOpenChange?: (isOpen: boolean) => void;
-};
-
-export const ValuePickerPopover = ({
- title,
- content,
- children,
- onOpenChange,
-}: ValuePickerPopoverProps) => {
- const [isOpen, setIsOpen] = useState(false);
- const [ref, sideOffset] = usePickerSideOffset(isOpen);
- const handleOpenChange = (open: boolean) => {
- setIsOpen(open);
- onOpenChange?.(open);
- };
- return (
- <Popover open={isOpen} onOpenChange={handleOpenChange} modal>
- <PopoverTrigger
- asChild
- ref={ref}
- onClick={() => {
- handleOpenChange(true);
- }}
- >
- {children}
- </PopoverTrigger>
- <PopoverPortal>
- <PopoverContent
- sideOffset={sideOffset}
- side="right"
- hideArrow
- align="start"
- css={{ width: "$spacing$30" }}
- >
- {content}
- <PopoverHeader title={title} />
- </PopoverContent>
- </PopoverPortal>
- </Popover>
- );
-};
diff --git a/apps/designer/app/designer/shared/floating-panel/floating-panel-provider.tsx b/apps/designer/app/designer/shared/floating-panel/floating-panel-provider.tsx
new file mode 100644
index 0000000000..bf76472f83
--- /dev/null
+++ b/apps/designer/app/designer/shared/floating-panel/floating-panel-provider.tsx
@@ -0,0 +1,21 @@
+import { createContext, RefObject } from "react";
+
+export const FloatingPanelContext = createContext<{
+ container: RefObject<HTMLElement>;
+}>({
+ container: {
+ current: null,
+ },
+});
+
+export const FloatingPanelProvider = ({
+ children,
+ container,
+}: {
+ children: JSX.Element;
+ container: RefObject<HTMLElement>;
+}) => (
+ <FloatingPanelContext.Provider value={{ container }}>
+ {children}
+ </FloatingPanelContext.Provider>
+);
diff --git a/apps/designer/app/designer/shared/floating-panel/floating-panel.tsx b/apps/designer/app/designer/shared/floating-panel/floating-panel.tsx
new file mode 100644
index 0000000000..23ef63159f
--- /dev/null
+++ b/apps/designer/app/designer/shared/floating-panel/floating-panel.tsx
@@ -0,0 +1,78 @@
+import {
+ Popover,
+ PopoverTrigger,
+ PopoverContent,
+ PopoverHeader,
+ PopoverPortal,
+} from "@webstudio-is/design-system";
+import { MutableRefObject, useContext, useRef, useState } from "react";
+import { FloatingPanelContext } from "./floating-panel-provider";
+
+const useSideOffset = ({
+ isOpen,
+}: {
+ isOpen: boolean;
+}): [MutableRefObject<HTMLButtonElement | null>, number] => {
+ const triggerRef = useRef<HTMLButtonElement | null>(null);
+ const { container } = useContext(FloatingPanelContext);
+ if (isOpen === false) {
+ // Prevent computation if the panel is closed
+ return [triggerRef, 0];
+ }
+ const containerRect = container?.current?.getBoundingClientRect();
+ const triggerRect = triggerRef.current?.getBoundingClientRect();
+ return [triggerRef, (triggerRect?.left ?? 0) - (containerRect?.left ?? 0)];
+};
+
+const useLogic = (onOpenChange?: (isOpen: boolean) => void) => {
+ const [isOpen, setIsOpen] = useState(false);
+ const [triggerRef, sideOffset] = useSideOffset({ isOpen });
+ const handleOpenChange = (open: boolean) => {
+ setIsOpen(open);
+ onOpenChange?.(open);
+ };
+ return { isOpen, handleOpenChange, triggerRef, sideOffset };
+};
+
+// @todo add support for positioning next to the left panel
+type FloatingPanelProps = {
+ title: string;
+ content: JSX.Element;
+ children: JSX.Element;
+ onOpenChange?: (isOpen: boolean) => void;
+};
+
+export const FloatingPanel = ({
+ title,
+ content,
+ children,
+ onOpenChange,
+}: FloatingPanelProps) => {
+ const { isOpen, handleOpenChange, triggerRef, sideOffset } =
+ useLogic(onOpenChange);
+ return (
+ <Popover open={isOpen} onOpenChange={handleOpenChange} modal>
+ <PopoverTrigger
+ asChild
+ ref={triggerRef}
+ onClick={() => {
+ handleOpenChange(true);
+ }}
+ >
+ {children}
+ </PopoverTrigger>
+ <PopoverPortal>
+ <PopoverContent
+ sideOffset={sideOffset}
+ side="left"
+ hideArrow
+ align="start"
+ css={{ width: "$spacing$30" }}
+ >
+ {content}
+ <PopoverHeader title={title} />
+ </PopoverContent>
+ </PopoverPortal>
+ </Popover>
+ );
+};
diff --git a/apps/designer/app/designer/shared/floating-panel/index.ts b/apps/designer/app/designer/shared/floating-panel/index.ts
new file mode 100644
index 0000000000..5d69754e93
--- /dev/null
+++ b/apps/designer/app/designer/shared/floating-panel/index.ts
@@ -0,0 +1,2 @@
+export * from "./floating-panel";
+export * from "./floating-panel-provider";