Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show menu drawer on app menu hover when its on collapsed state #7

Merged
merged 1 commit into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compliance-web/src/components/Shared/CopyButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import { useState } from "react";
import { IconButton } from "@mui/material";
import { FileCopy, FileCopyOutlined } from "@mui/icons-material";
import { BCPalette } from "epic.theme";
Expand All @@ -13,7 +13,7 @@ const CopyButton = ({ ...props }) => {
navigator.clipboard.writeText(text);
};

const [hover, setHover] = React.useState<boolean>(false);
const [hover, setHover] = useState<boolean>(false);

return (
<IconButton
Expand Down
Original file line number Diff line number Diff line change
@@ -1,41 +1,62 @@
import { theme } from "@/styles/theme";
import { ListItem, Box, List } from "@mui/material";
import { Fragment } from "react/jsx-runtime";
import { ListItem, Box, List, Drawer } from "@mui/material";
import RouteItemsList, { RouteMenuItem } from "./RouteItemsList";
import { useMenuStore } from "@/store/menuStore";
import MenuItemsList from "./MenuItemsList";
import { useState } from "react";
import { APP_SIDE_NAV_WIDTH } from "@/utils/constants";

export default function MenuItemIconsList() {
const routeMenuItems: RouteMenuItem[] = RouteItemsList();

const { toggleMenu } = useMenuStore();
const { appHeaderHeight } = useMenuStore();

const [hoverMenu, setHoverMenu] = useState<boolean>(false);

const renderMenuIcons = () => {
return routeMenuItems.map((route) => {
return (
<Fragment key={route.routeName}>
<ListItem
key={route.routeName}
onClick={() => toggleMenu(route.routeName)}
disablePadding
sx={{ cursor: "pointer" }}
>
<Box
sx={{
color: theme.palette.common.white,
width: "100%",
display: "flex",
alignItems: "center",
justifyContent: "center",
padding: "1rem",
}}
>
{route.icon ?? route.icon}
</Box>
</ListItem>
</Fragment>
);
});
return routeMenuItems.map((route) => (
<ListItem
key={route.routeName}
onMouseEnter={() => setHoverMenu(true)}
disablePadding
sx={{ cursor: "pointer" }}
>
<Box
sx={{
color: theme.palette.common.white,
width: "100%",
display: "flex",
alignItems: "center",
justifyContent: "center",
padding: "1rem",
}}
>
{route.icon ?? route.icon}
</Box>
</ListItem>
));
};

return <List>{renderMenuIcons()}</List>;
return (
<>
<List>{renderMenuIcons()}</List>
<Drawer
open={hoverMenu}
variant="persistent"
onMouseLeave={() => setHoverMenu(false)}
sx={{
flexShrink: 0,
[`& .MuiDrawer-paper`]: {
width: APP_SIDE_NAV_WIDTH,
boxSizing: "border-box",
background: theme.palette.primary.main,
height: `calc(100vh - ${appHeaderHeight}px)`,
top: appHeaderHeight,
},
}}
>
<MenuItemsList />
</Drawer>
</>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ExpandMenuButton from "./ExpandMenuButton";
import MenuItemsList from "./MenuItemsList";
import { AppConfig } from "@/utils/config";
import MenuItemIconsList from "./MenuItemIconsList";
import { APP_SIDE_NAV_WIDTH, APP_SIDE_NAV_WIDTH_COLLAPSED } from "@/utils/constants";

export default function SideNavBar() {
const { expandMenu } = useMenuStore();
Expand All @@ -16,7 +17,7 @@ export default function SideNavBar() {
<Box
sx={{
bgcolor: theme.palette.primary.main,
width: expandMenu ? 260 : 68,
width: expandMenu ? APP_SIDE_NAV_WIDTH : APP_SIDE_NAV_WIDTH_COLLAPSED,
height: "100%",
display: "flex",
flexDirection: "column",
Expand Down
13 changes: 8 additions & 5 deletions compliance-web/src/routes/__root.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import EAOAppBar from "@/components/Shared/Header/EAOAppBar";
import PageNotFound from "@/components/Shared/PageNotFound";
import SideNavBar from "@/components/Shared/SideNav/SideNavBar";
import { useMenuStore } from "@/store/menuStore";
import { Box } from "@mui/system";
import { createRootRouteWithContext, Outlet } from "@tanstack/react-router";
import { TanStackRouterDevtools } from "@tanstack/router-devtools";
import { useState, useRef, useEffect } from "react";
import { useRef, useEffect } from "react";
import { AuthContextProps } from "react-oidc-context";

type RouterContext = {
Expand All @@ -17,14 +18,16 @@ export const Route = createRootRouteWithContext<RouterContext>()({
});

function Layout() {
const [headerHeight, setHeaderHeight] = useState(0);
const { appHeaderHeight, setAppHeaderHeight } =
useMenuStore();

const appBarRef = useRef<HTMLDivElement | null>(null);

useEffect(() => {
if (appBarRef.current) {
setHeaderHeight(appBarRef.current.offsetHeight);
setAppHeaderHeight(appBarRef.current.offsetHeight);
}
}, []);
}, [setAppHeaderHeight]);

return (
<>
Expand All @@ -33,7 +36,7 @@ function Layout() {
sx={{
display: "flex",
overflow: "hidden",
height: `calc(100vh - ${headerHeight}px)`,
height: `calc(100vh - ${appHeaderHeight}px)`,
}}
>
<SideNavBar />
Expand Down
8 changes: 8 additions & 0 deletions compliance-web/src/store/menuStore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@ import { persist } from "zustand/middleware";
interface MenuState {
openMenus: { [key: string]: boolean };
expandMenu: boolean;
appHeaderHeight: number;
toggleMenu: (routeName: string) => void;
toggleExpandMenu: () => void;
setAppHeaderHeight: (height: number) => void;
}

export const useMenuStore = create<MenuState>()(
persist(
(set) => ({
openMenus: {},
expandMenu: true,
appHeaderHeight: 0,
toggleMenu: (routeName: string) => {
set((state) => ({
openMenus: {
Expand All @@ -26,6 +29,11 @@ export const useMenuStore = create<MenuState>()(
expandMenu: !state.expandMenu,
}));
},
setAppHeaderHeight: (height: number) => {
set(() => ({
appHeaderHeight: height,
}));
}
}),
{
name: "menu-storage", // name of the item in the storage
Expand Down
3 changes: 3 additions & 0 deletions compliance-web/src/utils/constants.ts
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
// App Constants should go here

export const APP_SIDE_NAV_WIDTH = 260;
export const APP_SIDE_NAV_WIDTH_COLLAPSED = 68;
Loading