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.

Sign up for GitHub

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

Jump to bottom

made sidebar always visible on settings page #5823

Merged
merged 2 commits into from
Jun 11, 2024
Merged

made sidebar always visible on settings page #5823

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c9338c
made sidebar always visible on settings page
RobertoSimonini1 Jun 11, 2024
2d573be
lint fix
RobertoSimonini1 Jun 11, 2024
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: 3 additions & 1 deletion .../twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -69,6 +70,7 @@ export const NavigationDrawer = ({
const isMobile = useIsMobile();
const theme = useTheme();
const isNavigationDrawerOpen = useRecoilValue(isNavigationDrawerOpenState);
const isSettingsPage = useIsSettingsPage();

const handleHover = () => {
setIsHovered(true);
Expand All @@ -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,
Expand Down
Loading