Skip to content

The open alternative to Salesforce, designed for AI.

Fix navbar folder not opening on page refresh when it has an active child item (#19619)

Abdul Rahman3f495124a53c
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts
index 075c23dccd8..84a3df633fd 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemFolderOpenState.ts
@@ -1,15 +1,15 @@
+import { isNonEmptyString } from '@sniptt/guards';
import { useLocation, useNavigate } from 'react-router-dom';
import { NavigationMenuItemType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { useIsMobile } from 'twenty-ui/utilities';
-import { isNonEmptyString } from '@sniptt/guards';
import { type NavigationMenuItem } from '~/generated-metadata/graphql';
+import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';
import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';
-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
import { isLocationMatchingNavigationMenuItem } from '@/navigation-menu-item/common/utils/isLocationMatchingNavigationMenuItem';
+import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
-import { currentNavigationMenuItemFolderIdState } from '@/navigation-menu-item/common/states/currentNavigationMenuItemFolderIdState';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
@@ -38,7 +38,25 @@ export const useNavigationMenuItemFolderOpenState = ({
currentNavigationMenuItemFolderIdState,
);
- const isOpen = openNavigationMenuItemFolderIds.includes(folderId);
+ const selectedNavigationMenuItemIndex = navigationMenuItems.findIndex(
+ (item) => {
+ const computedLink = getNavigationMenuItemComputedLink(
+ item,
+ objectMetadataItems,
+ views,
+ );
+ return isLocationMatchingNavigationMenuItem(
+ currentPath,
+ currentViewPath,
+ item.type,
+ computedLink,
+ );
+ },
+ );
+
+ const isExplicitlyOpen = openNavigationMenuItemFolderIds.includes(folderId);
+ const hasActiveChild = selectedNavigationMenuItemIndex >= 0;
+ const isOpen = isExplicitlyOpen || hasActiveChild;
const handleToggle = () => {
if (isMobile) {
@@ -47,7 +65,7 @@ export const useNavigationMenuItemFolderOpenState = ({
);
} else {
setOpenNavigationMenuItemFolderIds((current) =>
- isOpen
+ current.includes(folderId)
? current.filter((id) => id !== folderId)
: [...current, folderId],
);
@@ -78,22 +96,6 @@ export const useNavigationMenuItemFolderOpenState = ({
}
};
- const selectedNavigationMenuItemIndex = navigationMenuItems.findIndex(
- (item) => {
- const computedLink = getNavigationMenuItemComputedLink(
- item,
- objectMetadataItems,
- views,
- );
- return isLocationMatchingNavigationMenuItem(
- currentPath,
- currentViewPath,
- item.type,
- computedLink,
- );
- },
- );
-
return {
isOpen,
handleToggle,