The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix cropped view/link overlay icons in collapsed navigation sidebar (#18883)
Abdul Rahmanec459d8dc834
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsxindex c10f31b0b6b..65db82302f6 100644--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx@@ -31,7 +31,7 @@ const StyledRow = styled.div<{ isExpanded: boolean }>`justify-content: ${({ isExpanded }) =>isExpanded ? 'space-between' : 'center'};transition: gap calc(${themeCssVariables.animation.duration.normal} * 1s) ease;- width: 100%;+ width: ${({ isExpanded }) => (isExpanded ? '100%' : 'max-content')};`;const StyledTabsPill = styled.div`diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsxindex 782436a3af0..1b66714ad6c 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsx@@ -1,7 +1,9 @@import { useIsSettingsDrawer } from '@/navigation/hooks/useIsSettingsDrawer';+import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';-import { useIsMobile } from 'twenty-ui/utilities';import { themeCssVariables } from 'twenty-ui/theme-constants';+import { useIsMobile } from 'twenty-ui/utilities';const StyledSection = styled.div<{ isSettingsDrawer?: boolean }>`margin-bottom: ${({ isSettingsDrawer }) =>@@ -12,12 +14,13 @@ const StyledSection = styled.div<{ isSettingsDrawer?: boolean }>`const StyledSectionInnerContainerMinusScrollPadding = styled.div<{isMobile: boolean;isSettingsDrawer: boolean;+ isMainNavCollapsed: boolean;}>`display: flex;flex-direction: column;gap: ${themeCssVariables.betweenSiblingsGap};- width: ${({ isMobile, isSettingsDrawer }) =>- isMobile || isSettingsDrawer+ width: ${({ isMobile, isSettingsDrawer, isMainNavCollapsed }) =>+ isMobile || isSettingsDrawer || isMainNavCollapsed? '100%': `calc(100% - ${themeCssVariables.spacing[2]})`};`;@@ -31,11 +34,18 @@ export const NavigationDrawerSection = ({}) => {const isMobile = useIsMobile();const isSettingsDrawer = useIsSettingsDrawer();+ const isNavigationDrawerExpanded = useAtomStateValue(+ isNavigationDrawerExpandedState,+ );+ const isMainNavCollapsed =+ !isSettingsDrawer && !isMobile && !isNavigationDrawerExpanded;+return (<StyledSection isSettingsDrawer={isSettingsDrawer} className={className}><StyledSectionInnerContainerMinusScrollPaddingisMobile={isMobile}isSettingsDrawer={isSettingsDrawer}+ isMainNavCollapsed={isMainNavCollapsed}>{children}</StyledSectionInnerContainerMinusScrollPadding>