diff --git a/src/components/molecules/menu/menu.tsx b/src/components/molecules/menu/menu.tsx index 27ba7acf4..6c47f73cf 100644 --- a/src/components/molecules/menu/menu.tsx +++ b/src/components/molecules/menu/menu.tsx @@ -14,7 +14,7 @@ import { cn } from "@utilities"; import { useModalStore, useProjectStore, useToastStore } from "@store"; import { Button, IconSvg } from "@components/atoms"; -import { PopoverListWrapper, PopoverListContent, PopoverListTrigger } from "@components/molecules/popover/index"; +import { PopoverListWrapper, PopoverListContent, PopoverListTrigger } from "@components/molecules/popover"; import { NewProject, ProjectsIcon } from "@assets/image"; @@ -22,10 +22,10 @@ export const Menu = ({ className, isOpen = false }: MenuProps) => { const { t } = useTranslation(["menu", "errors"]); const { getProjectsList, projectsList } = useProjectStore(); const navigate = useNavigate(); - const [sortedProjectsList, setSortedProjectsList] = useState([]); + const { projectId } = useParams(); const { openModal } = useModalStore(); const addToast = useToastStore((state) => state.addToast); - const { projectId } = useParams(); + const [sortedProjectsList, setSortedProjectsList] = useState([]); useEffect(() => { const sortedProjects = projectsList.slice().sort((a, b) => a.name.localeCompare(b.name)); @@ -88,10 +88,10 @@ export const Menu = ({ className, isOpen = false }: MenuProps) => { - +
  • -
    +
    { {popoverItems.length ? ( -
    +
    {popoverItems.map((item, index) => (
    { @@ -28,7 +28,10 @@ const useBasePopover = ( const data = useFloating({ placement, open, - onOpenChange: setOpen, + onOpenChange: (isOpen) => { + onOpenChange?.(isOpen); + setOpen(isOpen); + }, whileElementsMounted: autoUpdate, middleware: [ offset(5),