chore: return first active item

betagouv · Nov 19, 2024 · cb468c5 · cb468c5
1 parent 1616e2d
commit cb468c5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/app/(private)/(dashboard)/PrivateLayout.tsx b/src/app/(private)/(dashboard)/PrivateLayout.tsx
@@ -132,7 +132,7 @@ export function PrivateLayout({ children }: { children: React.ReactNode }) {
                             text: currentPage,
                             isActive: hasPathnameThisRegex(
                                 pathname,
-                                "^/community/[a-zA-Z]+.[a-zA-Z]+"
+                                "^/community/[a-zA-Z]+.[a-zA-Z]+$"
                             ),
                             items: [
                                 {
@@ -348,7 +348,7 @@ export function PrivateLayout({ children }: { children: React.ReactNode }) {
 
     const findActiveItem = (items: ItemLink[]) => {
         let tree: ItemLink[] = [];
-        items.forEach((i) => {
+        for (const i of items) {
             let childrenTree: ItemLink[] = [];
             if (i.items && i.items.length) {
                 childrenTree = findActiveItem(i.items);
@@ -357,8 +357,9 @@ export function PrivateLayout({ children }: { children: React.ReactNode }) {
                 tree = [i, ...childrenTree];
             } else if (i.isActive) {
                 tree = [i];
+                break;
             }
-        });
+        }
         return tree;
     };