From 3440889ad0f712883c94d3dd7b9c9316881ad7fd Mon Sep 17 00:00:00 2001 From: RobertoSimonini1 Date: Tue, 11 Jun 2024 17:39:51 +0200 Subject: [PATCH] made sidebar always visible on settings page (#5823) I made the sidebar/menu always visible on settings page even if the navigationDrawerOpen is false This aims to fix #5811 --- .../navigation-drawer/components/NavigationDrawer.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx index 2b9863915ab1..524e87947691 100644 --- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx +++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx @@ -5,6 +5,7 @@ import { motion } from 'framer-motion'; import { useRecoilValue } from 'recoil'; import { MOBILE_VIEWPORT } from 'twenty-ui'; +import { useIsSettingsPage } from '@/navigation/hooks/useIsSettingsPage'; import { isNavigationDrawerOpenState } from '@/ui/navigation/states/isNavigationDrawerOpenState'; import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile'; @@ -69,6 +70,7 @@ export const NavigationDrawer = ({ const isMobile = useIsMobile(); const theme = useTheme(); const isNavigationDrawerOpen = useRecoilValue(isNavigationDrawerOpenState); + const isSettingsPage = useIsSettingsPage(); const handleHover = () => { setIsHovered(true); @@ -90,7 +92,7 @@ export const NavigationDrawer = ({ initial={false} animate={{ width: isMobile ? mobileWidth : desktopWidth, - opacity: isNavigationDrawerOpen ? 1 : 0, + opacity: isNavigationDrawerOpen || isSettingsPage ? 1 : 0, }} transition={{ duration: theme.animation.duration.normal,