From 725a25628567f6f8183626b0fb1becc828e62e03 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira <62335616+lucaseduoli@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:43:58 -0300 Subject: [PATCH] fix: remove useSidebar to fix errors of SidebarWrapper when opening playground page (#4767) * Added open to data of wrapper * Fix PageComponent and Header to not use useSidebar anymore --- src/frontend/src/components/ui/sidebar.tsx | 1 + .../FlowPage/components/PageComponent/index.tsx | 10 +++------- .../pages/MainPage/components/header/index.tsx | 15 +++------------ 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/frontend/src/components/ui/sidebar.tsx b/src/frontend/src/components/ui/sidebar.tsx index 0ea0817d7..72c83dc0b 100644 --- a/src/frontend/src/components/ui/sidebar.tsx +++ b/src/frontend/src/components/ui/sidebar.tsx @@ -131,6 +131,7 @@ const SidebarProvider = React.forwardRef< "group/sidebar-wrapper flex h-full w-full text-foreground has-[[data-variant=inset]]:bg-background", className, )} + data-open={open} ref={ref} {...props} > diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx index 2397fef21..c2313a4e5 100644 --- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx @@ -6,7 +6,7 @@ import CanvasControls, { import FlowToolbar from "@/components/flowToolbarComponent"; import ForwardedIconComponent from "@/components/genericIconComponent"; import LoadingComponent from "@/components/loadingComponent"; -import { SidebarTrigger, useSidebar } from "@/components/ui/sidebar"; +import { SidebarTrigger } from "@/components/ui/sidebar"; import { COLOR_OPTIONS, NOTE_NODE_MIN_HEIGHT, @@ -504,8 +504,6 @@ export default function Page({ view }: { view?: boolean }): JSX.Element { reactFlowWrapper.current?.style.setProperty("--selected", accentColor); }; - const { open } = useSidebar(); - useEffect(() => { const handleGlobalMouseMove = (event) => { if (isAddingNote) { @@ -592,9 +590,7 @@ export default function Page({ view }: { view?: boolean }): JSX.Element { button]:border-0 [&>button]:bg-background hover:[&>button]:bg-accent", - open - ? "pointer-events-none -translate-x-full opacity-0" - : "pointer-events-auto opacity-100", + "pointer-events-auto opacity-100 group-data-[open=true]/sidebar-wrapper:pointer-events-none group-data-[open=true]/sidebar-wrapper:-translate-x-full group-data-[open=true]/sidebar-wrapper:opacity-0", )} position="top-left" > @@ -603,7 +599,7 @@ export default function Page({ view }: { view?: boolean }): JSX.Element { name="PanelRightClose" className="h-4 w-4" /> - Components + Components { const [debouncedSearch, setDebouncedSearch] = useState(""); - const { open } = useSidebar(); // Debounce the setSearch function from the parent const debouncedSetSearch = useCallback( @@ -57,15 +55,8 @@ const HeaderComponent = ({ className="flex items-center pb-8 text-xl font-semibold" data-testid="mainpage_title" > -
-
+
+