Преглед на файлове

Small refactor. Fixes library dropdown.

barnabasmolnar преди 2 години
родител
ревизия
79cf71cccb
променени са 2 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 4 2
      src/components/dropdownMenu/DropdownMenu.tsx
  2. 2 4
      src/components/main-menu/MainMenu.tsx

+ 4 - 2
src/components/dropdownMenu/DropdownMenu.tsx

@@ -13,6 +13,8 @@ import {
 
 import "./DropdownMenu.scss";
 
+import * as DropdownMenuRadix from "@radix-ui/react-dropdown-menu";
+
 const DropdownMenu = ({
   children,
   open,
@@ -23,10 +25,10 @@ const DropdownMenu = ({
   const MenuTriggerComp = getMenuTriggerComponent(children);
   const MenuContentComp = getMenuContentComponent(children);
   return (
-    <>
+    <DropdownMenuRadix.Root open={open}>
       {MenuTriggerComp}
       {open && MenuContentComp}
-    </>
+    </DropdownMenuRadix.Root>
   );
 };
 

+ 2 - 4
src/components/main-menu/MainMenu.tsx

@@ -15,8 +15,6 @@ import { withInternalFallback } from "../hoc/withInternalFallback";
 import { composeEventHandlers } from "../../utils";
 import { useTunnels } from "../context/tunnels";
 
-import * as DropdownMenuRadix from "@radix-ui/react-dropdown-menu";
-
 const MainMenu = Object.assign(
   withInternalFallback(
     "MainMenu",
@@ -40,7 +38,7 @@ const MainMenu = Object.assign(
 
       return (
         <mainMenuTunnel.In>
-          <DropdownMenuRadix.Root open={appState.openMenu === "canvas"}>
+          <DropdownMenu open={appState.openMenu === "canvas"}>
             <DropdownMenu.Trigger
               onToggle={() => {
                 setAppState({
@@ -67,7 +65,7 @@ const MainMenu = Object.assign(
                 </fieldset>
               )}
             </DropdownMenu.Content>
-          </DropdownMenuRadix.Root>
+          </DropdownMenu>
         </mainMenuTunnel.In>
       );
     },