From a34da3e2482b7a9914eedab8bcba1ad194e81ae0 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Fri, 22 Apr 2022 11:04:04 +0100
Subject: [PATCH] Navigation: Implement scrolling navbar + fix clickable area
 of grafana logo (#48045)

* Attach nav item menus to a portal that's a sibling of the chevron to prevent incorrect stacking

* add scrollbar to navbar

* Make clickable area of grafana logo full size

* hide vertical track as well

* prettier...
---
 .../components/NavBar/Next/NavBarMenu.tsx     |  2 +-
 .../components/NavBar/Next/NavBarNext.tsx     | 64 ++++++++++++-------
 public/app/core/components/NavBar/utils.ts    |  3 +
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/public/app/core/components/NavBar/Next/NavBarMenu.tsx b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
index 00e40a6e5f1..2a6cebd020e 100644
--- a/public/app/core/components/NavBar/Next/NavBarMenu.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarMenu.tsx
@@ -391,7 +391,7 @@ const getCollapsibleStyles = (theme: GrafanaTheme2) => ({
     position: 'relative',
     display: 'grid',
     gridAutoFlow: 'column',
-    gridTemplateColumns: '56px auto',
+    gridTemplateColumns: `${theme.spacing(7)} auto`,
   }),
   collapsibleMenuItem: css({
     height: theme.spacing(6),
diff --git a/public/app/core/components/NavBar/Next/NavBarNext.tsx b/public/app/core/components/NavBar/Next/NavBarNext.tsx
index 0612dc02d13..11961c6d8eb 100644
--- a/public/app/core/components/NavBar/Next/NavBarNext.tsx
+++ b/public/app/core/components/NavBar/Next/NavBarNext.tsx
@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';
 import { css, cx } from '@emotion/css';
 import { cloneDeep } from 'lodash';
 import { GrafanaTheme2, NavModelItem, NavSection } from '@grafana/data';
-import { Icon, IconName, useTheme2 } from '@grafana/ui';
+import { CustomScrollbar, Icon, IconName, useTheme2 } from '@grafana/ui';
 import { config, locationService } from '@grafana/runtime';
 import { getKioskMode } from 'app/core/navigation/kiosk';
 import { KioskMode, StoreState } from 'app/types';
@@ -13,10 +13,10 @@ import { NavBarMenu } from './NavBarMenu';
 import NavBarItem from './NavBarItem';
 import { useSelector } from 'react-redux';
 import { NavBarItemWithoutMenu } from './NavBarItemWithoutMenu';
-import { FocusScope } from '@react-aria/focus';
 import { NavBarContext } from '../context';
 import { NavBarToggle } from './NavBarToggle';
 import { NavBarMenuPortalContainer } from './NavBarMenuPortalContainer';
+import { FocusScope } from '@react-aria/focus';
 
 const onOpenSearch = () => {
   locationService.partial({ search: 'open' });
@@ -90,6 +90,7 @@ export const NavBarNext = React.memo(() => {
 
             <ul className={styles.itemList}>
               <NavBarItemWithoutMenu
+                elClassName={styles.grafanaLogoInner}
                 isActive={isMatchOrChildMatch(homeItem, activeItem)}
                 label="Home"
                 className={styles.grafanaLogo}
@@ -97,29 +98,36 @@ export const NavBarNext = React.memo(() => {
               >
                 <Icon name="grafana" size="xl" />
               </NavBarItemWithoutMenu>
-              <NavBarItem className={styles.search} isActive={activeItem === searchItem} link={searchItem}>
-                <Icon name="search" size="xl" />
-              </NavBarItem>
 
-              {coreItems.map((link, index) => (
-                <NavBarItem
-                  key={`${link.id}-${index}`}
-                  isActive={isMatchOrChildMatch(link, activeItem)}
-                  link={{ ...link, subTitle: undefined, onClick: undefined }}
-                >
-                  {link.icon && <Icon name={link.icon as IconName} size="xl" />}
-                  {link.img && <img src={link.img} alt={`${link.text} logo`} />}
+              <CustomScrollbar hideVerticalTrack hideHorizontalTrack>
+                <NavBarItem className={styles.search} isActive={activeItem === searchItem} link={searchItem}>
+                  <Icon name="search" size="xl" />
                 </NavBarItem>
-              ))}
 
-              {pluginItems.length > 0 &&
-                pluginItems.map((link, index) => (
-                  <NavBarItem key={`${link.id}-${index}`} isActive={isMatchOrChildMatch(link, activeItem)} link={link}>
+                {coreItems.map((link, index) => (
+                  <NavBarItem
+                    key={`${link.id}-${index}`}
+                    isActive={isMatchOrChildMatch(link, activeItem)}
+                    link={{ ...link, subTitle: undefined, onClick: undefined }}
+                  >
                     {link.icon && <Icon name={link.icon as IconName} size="xl" />}
                     {link.img && <img src={link.img} alt={`${link.text} logo`} />}
                   </NavBarItem>
                 ))}
 
+                {pluginItems.length > 0 &&
+                  pluginItems.map((link, index) => (
+                    <NavBarItem
+                      key={`${link.id}-${index}`}
+                      isActive={isMatchOrChildMatch(link, activeItem)}
+                      link={link}
+                    >
+                      {link.icon && <Icon name={link.icon as IconName} size="xl" />}
+                      {link.img && <img src={link.img} alt={`${link.text} logo`} />}
+                    </NavBarItem>
+                  ))}
+              </CustomScrollbar>
+
               {configItems.map((link, index) => (
                 <NavBarItem
                   key={`${link.id}-${index}`}
@@ -171,7 +179,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     zIndex: theme.zIndex.sidemenu,
     padding: `${theme.spacing(1)} 0`,
     position: 'relative',
-    width: theme.spacing(7),
+    width: `calc(${theme.spacing(7)} + 1px)`,
     borderRight: `1px solid ${theme.colors.border.weak}`,
 
     [theme.breakpoints.down('md')]: {
@@ -207,13 +215,22 @@ const getStyles = (theme: GrafanaTheme2) => ({
     },
   }),
   grafanaLogo: css({
+    alignItems: 'stretch',
+    display: 'flex',
+    flexShrink: 0,
+    justifyContent: 'stretch',
+  }),
+  grafanaLogoInner: css({
     alignItems: 'center',
     display: 'flex',
-    img: {
-      height: theme.spacing(3),
-      width: theme.spacing(3),
-    },
+    height: '100%',
     justifyContent: 'center',
+    width: '100%',
+
+    '> div': {
+      height: 'auto',
+      width: 'auto',
+    },
   }),
   search: css({
     display: 'none',
@@ -244,4 +261,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
     right: '0px',
     transform: `translateX(50%)`,
   }),
+  menuPortalContainer: css({
+    zIndex: theme.zIndex.sidemenu,
+  }),
 });
diff --git a/public/app/core/components/NavBar/utils.ts b/public/app/core/components/NavBar/utils.ts
index 80b8bca775f..21bc5add093 100644
--- a/public/app/core/components/NavBar/utils.ts
+++ b/public/app/core/components/NavBar/utils.ts
@@ -8,6 +8,9 @@ import { getFooterLinks } from '../Footer/Footer';
 import { HelpModal } from '../help/HelpModal';
 
 export const SEARCH_ITEM_ID = 'search';
+export const NAV_MENU_PORTAL_CONTAINER_ID = 'navbar-menu-portal-container';
+
+export const getNavMenuPortalContainer = () => document.getElementById(NAV_MENU_PORTAL_CONTAINER_ID) ?? document.body;
 
 export const getForcedLoginUrl = (url: string) => {
   const queryParams = new URLSearchParams(url.split('?')[1]);