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.

refactor: control floating panel open state (#4331)

Bogdan Chadkin73dd80ae2709
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.tsx
index e739955d17..6730177750 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
@@ -68,7 +68,8 @@ export const FontFamilyControl = () => {
suffix={
<FloatingPanel
title="Fonts"
- onOpenChange={setIsFontMangerOpen}
+ isOpen={isFontManagerOpen}
+ onIsOpenChange={setIsFontMangerOpen}
content={
<FontsManager
value={value.type === "fontFamily" ? value : undefined}
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.tsx
index e5fd1eebbe..87fb272d02 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,4 +1,4 @@
-import { useRef } from "react";
+import { useRef, useState } from "react";
import { getStyleDeclKey, type StyleDecl } from "@webstudio-is/sdk";
import {
FloatingPanel,
@@ -35,6 +35,7 @@ $selectedInstanceSelector.set(["box"]);
export const BackgroundContentStory = () => {
const elementRef = useRef<HTMLDivElement>(null);
+ const [isOpen, setIsOpen] = useState(true);
return (
<>
@@ -42,7 +43,8 @@ export const BackgroundContentStory = () => {
<FloatingPanelProvider container={elementRef}>
<FloatingPanel
- open={true}
+ isOpen={isOpen}
+ onIsOpenChange={setIsOpen}
title="Background"
content={<BackgroundContent index={0} />}
>
diff --git a/apps/builder/app/builder/shared/floating-panel.tsx b/apps/builder/app/builder/shared/floating-panel.tsx
index 837b9da209..3fc491d6e1 100644
--- a/apps/builder/app/builder/shared/floating-panel.tsx
+++ b/apps/builder/app/builder/shared/floating-panel.tsx
@@ -74,24 +74,13 @@ export const FloatingPanelProvider = ({
</FloatingPanelContext.Provider>
);
-const useLogic = (open?: boolean, onOpenChange?: (isOpen: boolean) => void) => {
- const { container: containerRef } = useContext(FloatingPanelContext);
- const [isOpen, setIsOpen] = useState(Boolean(open));
- const [triggerRef, sideOffset] = useSideOffset({ isOpen, containerRef });
- 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;
- open?: boolean;
- onOpenChange?: (isOpen: boolean) => void;
+ isOpen?: boolean;
+ onIsOpenChange?: (isOpen: boolean) => void;
// collisionPadding is the distance in pixels from the boundary edges where collision detection should occur.
collisionPadding?:
| number
@@ -107,18 +96,19 @@ export const FloatingPanel = ({
title,
content,
children,
- open,
+ isOpen: externalIsOpen,
align,
- onOpenChange,
+ onIsOpenChange: setExternalIsOpen,
collisionPadding,
}: FloatingPanelProps) => {
- const { isOpen, handleOpenChange, triggerRef, sideOffset } = useLogic(
- open,
- onOpenChange
- );
+ 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={handleOpenChange} modal>
+ <FloatingPanelPopover open={isOpen} onOpenChange={setIsOpen} modal>
<FloatingPanelPopoverTrigger asChild ref={triggerRef}>
{children}
</FloatingPanelPopoverTrigger>