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
This commit is contained in:
@ -5,6 +5,7 @@ import { motion } from 'framer-motion';
|
|||||||
import { useRecoilValue } from 'recoil';
|
import { useRecoilValue } from 'recoil';
|
||||||
import { MOBILE_VIEWPORT } from 'twenty-ui';
|
import { MOBILE_VIEWPORT } from 'twenty-ui';
|
||||||
|
|
||||||
|
import { useIsSettingsPage } from '@/navigation/hooks/useIsSettingsPage';
|
||||||
import { isNavigationDrawerOpenState } from '@/ui/navigation/states/isNavigationDrawerOpenState';
|
import { isNavigationDrawerOpenState } from '@/ui/navigation/states/isNavigationDrawerOpenState';
|
||||||
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
|
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
|
||||||
|
|
||||||
@ -69,6 +70,7 @@ export const NavigationDrawer = ({
|
|||||||
const isMobile = useIsMobile();
|
const isMobile = useIsMobile();
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const isNavigationDrawerOpen = useRecoilValue(isNavigationDrawerOpenState);
|
const isNavigationDrawerOpen = useRecoilValue(isNavigationDrawerOpenState);
|
||||||
|
const isSettingsPage = useIsSettingsPage();
|
||||||
|
|
||||||
const handleHover = () => {
|
const handleHover = () => {
|
||||||
setIsHovered(true);
|
setIsHovered(true);
|
||||||
@ -90,7 +92,7 @@ export const NavigationDrawer = ({
|
|||||||
initial={false}
|
initial={false}
|
||||||
animate={{
|
animate={{
|
||||||
width: isMobile ? mobileWidth : desktopWidth,
|
width: isMobile ? mobileWidth : desktopWidth,
|
||||||
opacity: isNavigationDrawerOpen ? 1 : 0,
|
opacity: isNavigationDrawerOpen || isSettingsPage ? 1 : 0,
|
||||||
}}
|
}}
|
||||||
transition={{
|
transition={{
|
||||||
duration: theme.animation.duration.normal,
|
duration: theme.animation.duration.normal,
|
||||||
|
|||||||
Reference in New Issue
Block a user