diff --git a/apps/web/src/components/global-menu-wrapper/index.js b/apps/web/src/components/global-menu-wrapper/index.js index 1aebd83ae..bf281fdd1 100644 --- a/apps/web/src/components/global-menu-wrapper/index.js +++ b/apps/web/src/components/global-menu-wrapper/index.js @@ -71,7 +71,12 @@ function GlobalMenuWrapper() { }, }} > - + ); } diff --git a/apps/web/src/components/menu/index.js b/apps/web/src/components/menu/index.js index 6c6f6294d..57b7b0811 100644 --- a/apps/web/src/components/menu/index.js +++ b/apps/web/src/components/menu/index.js @@ -62,12 +62,12 @@ function useMenuFocus(items) { return [focusIndex, setFocusIndex, isSubmenuOpen, setIsSubmenuOpen]; } -function Menu({ items, data, closeMenu }) { +function Menu({ items, data, title, closeMenu }) { const [focusIndex, setFocusIndex, isSubmenuOpen, setIsSubmenuOpen] = useMenuFocus(items); return ( - + {items.map((item, index) => ( - + )} diff --git a/apps/web/src/hooks/use-menu.js b/apps/web/src/hooks/use-menu.js index b969d55ac..a27de29ad 100644 --- a/apps/web/src/hooks/use-menu.js +++ b/apps/web/src/hooks/use-menu.js @@ -179,11 +179,15 @@ function mapMenuItems(items, data) { color, iconColor, - items: hasSubmenu ? mapMenuItems(items, data) : [], - modifier: modifier?.join("+"), }; + if (hasSubmenu) + menuItem.items = mapMenuItems(items, { + ...data, + parent: menuItem, + }); + prev.push(menuItem); return prev;