Merge branch 'master' into barnabasmolnar/mainmenu-radix

2023-07-21 15:24:54 +02:00
parent 5b11660cc0 e57dc405fa
commit c9df3e143b
325 changed files with 23700 additions and 15889 deletions
@@ -1,11 +1,10 @@
-import { useOutsideClickHook } from "../../hooks/useOutsideClick";
 import { Island } from "../Island";
-
 import { useDevice } from "../App";
 import clsx from "clsx";
 import Stack from "../Stack";
-import React from "react";
+import React, { useRef } from "react";
 import { DropdownMenuContentPropsContext } from "./common";
+import { useOutsideClick } from "../../hooks/useOutsideClick";

 import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";

@@ -28,7 +27,9 @@ const MenuContent = ({
  sideOffset?: number;
 }) => {
  const device = useDevice();
-  const menuRef = useOutsideClickHook(() => {
+  const menuRef = useRef<HTMLDivElement>(null);
+
+  useOutsideClick(menuRef, () => {
    onClickOutside?.();
  });

@@ -55,7 +56,7 @@ const MenuContent = ({
          <Island
            className="dropdown-menu-container"
            padding={2}
-            style={{ zIndex: 1 }}
+            style={{ zIndex: 2 }}
          >
            {children}
          </Island>