Small refactor. Fixes library dropdown.
This commit is contained in:
parent
e094b8b539
commit
79cf71cccb
@ -13,6 +13,8 @@ import {
|
|||||||
|
|
||||||
import "./DropdownMenu.scss";
|
import "./DropdownMenu.scss";
|
||||||
|
|
||||||
|
import * as DropdownMenuRadix from "@radix-ui/react-dropdown-menu";
|
||||||
|
|
||||||
const DropdownMenu = ({
|
const DropdownMenu = ({
|
||||||
children,
|
children,
|
||||||
open,
|
open,
|
||||||
@ -23,10 +25,10 @@ const DropdownMenu = ({
|
|||||||
const MenuTriggerComp = getMenuTriggerComponent(children);
|
const MenuTriggerComp = getMenuTriggerComponent(children);
|
||||||
const MenuContentComp = getMenuContentComponent(children);
|
const MenuContentComp = getMenuContentComponent(children);
|
||||||
return (
|
return (
|
||||||
<>
|
<DropdownMenuRadix.Root open={open}>
|
||||||
{MenuTriggerComp}
|
{MenuTriggerComp}
|
||||||
{open && MenuContentComp}
|
{open && MenuContentComp}
|
||||||
</>
|
</DropdownMenuRadix.Root>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -15,8 +15,6 @@ import { withInternalFallback } from "../hoc/withInternalFallback";
|
|||||||
import { composeEventHandlers } from "../../utils";
|
import { composeEventHandlers } from "../../utils";
|
||||||
import { useTunnels } from "../context/tunnels";
|
import { useTunnels } from "../context/tunnels";
|
||||||
|
|
||||||
import * as DropdownMenuRadix from "@radix-ui/react-dropdown-menu";
|
|
||||||
|
|
||||||
const MainMenu = Object.assign(
|
const MainMenu = Object.assign(
|
||||||
withInternalFallback(
|
withInternalFallback(
|
||||||
"MainMenu",
|
"MainMenu",
|
||||||
@ -40,7 +38,7 @@ const MainMenu = Object.assign(
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<mainMenuTunnel.In>
|
<mainMenuTunnel.In>
|
||||||
<DropdownMenuRadix.Root open={appState.openMenu === "canvas"}>
|
<DropdownMenu open={appState.openMenu === "canvas"}>
|
||||||
<DropdownMenu.Trigger
|
<DropdownMenu.Trigger
|
||||||
onToggle={() => {
|
onToggle={() => {
|
||||||
setAppState({
|
setAppState({
|
||||||
@ -67,7 +65,7 @@ const MainMenu = Object.assign(
|
|||||||
</fieldset>
|
</fieldset>
|
||||||
)}
|
)}
|
||||||
</DropdownMenu.Content>
|
</DropdownMenu.Content>
|
||||||
</DropdownMenuRadix.Root>
|
</DropdownMenu>
|
||||||
</mainMenuTunnel.In>
|
</mainMenuTunnel.In>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user