From a452cf94444aab21b48881e8176eb179b634e62c Mon Sep 17 00:00:00 2001 From: Carter Date: Fri, 11 Apr 2025 14:07:35 -0600 Subject: [PATCH] fixed side menu being non-interactive when closed and not on mobile --- src/navigation/BottomNavigator.tsx | 4 ++-- src/navigation/SideNavigator.tsx | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/navigation/BottomNavigator.tsx b/src/navigation/BottomNavigator.tsx index 928090a..9003d97 100644 --- a/src/navigation/BottomNavigator.tsx +++ b/src/navigation/BottomNavigator.tsx @@ -151,13 +151,13 @@ export default function BottomNavigator(props: Props) { value="jobsites" /> )} - {isMiVent && ( + {/* {isMiVent && ( } value="ventilation" /> - )} + )} */} {isBXT() && user.hasFeature("security") && ( } value="security" /> diff --git a/src/navigation/SideNavigator.tsx b/src/navigation/SideNavigator.tsx index 9ed80b6..0a2cc9d 100644 --- a/src/navigation/SideNavigator.tsx +++ b/src/navigation/SideNavigator.tsx @@ -17,7 +17,7 @@ import { useTheme } from "@mui/material"; import classNames from "classnames"; -import { useWidth } from "../hooks/useWidth"; +import { useMobile, useWidth } from "../hooks/useWidth"; import { makeStyles } from "@mui/styles"; import BindaptIcon from "../products/Bindapt/BindaptIcon"; import { useLocation, useNavigate } from "react-router-dom"; @@ -64,7 +64,6 @@ const useStyles = makeStyles((theme: Theme) => ({ }) }, sideMenuOnClosed: { - pointerEvents: "none", transition: theme.transitions.create(["width", "z-index", "opacity"], { easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.leavingScreen @@ -119,6 +118,7 @@ export default function SideNavigator(props: Props) { const classes = useStyles(); const location = useLocation(); const [{ user }] = useGlobalState() + const isMobile = useMobile(); const navigate = useNavigate(); @@ -397,6 +397,7 @@ export default function SideNavigator(props: Props) { open={open} onOpen={onOpen} onClose={onClose} + sx={{ pointerEvents: isMobile&&!open ? "none" : "auto"}} >