From 474ea9615dd5dde7995226f98bc41b225d846daa Mon Sep 17 00:00:00 2001
From: Alexa V <239999+axelavargas@users.noreply.github.com>
Date: Tue, 23 Jul 2024 11:28:16 +0200
Subject: [PATCH] Dashboard Scene: Make Variables non-sticky on mobile (#90755)

* Make variables not sticky on mobile

* Removes scrollable body

* Remove unused CSS

* Remove unnecessary cx

---------

Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
---
 .../scene/DashboardControls.tsx               |  7 ++-
 .../scene/DashboardSceneRenderer.tsx          | 49 ++++++++++++++++---
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/DashboardControls.tsx b/public/app/features/dashboard-scene/scene/DashboardControls.tsx
index b4396867d6b..3e992340079 100644
--- a/public/app/features/dashboard-scene/scene/DashboardControls.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardControls.tsx
@@ -158,8 +158,7 @@ function getStyles(theme: GrafanaTheme2) {
       gap: theme.spacing(1),
       flexDirection: 'row',
       flexWrap: 'nowrap',
-      position: 'sticky',
-      top: 0,
+      position: 'relative',
       background: theme.colors.background.canvas,
       zIndex: theme.zIndex.activePanel,
       width: '100%',
@@ -168,6 +167,10 @@ function getStyles(theme: GrafanaTheme2) {
         flexDirection: 'column-reverse',
         alignItems: 'stretch',
       },
+      [theme.breakpoints.up('sm')]: {
+        position: 'sticky',
+        top: 0,
+      },
     }),
     embedded: css({
       background: 'unset',
diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx b/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
index 8c50aa0585c..97cc9322015 100644
--- a/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardSceneRenderer.tsx
@@ -1,10 +1,11 @@
 import { css, cx } from '@emotion/css';
 import { useLocation } from 'react-router-dom';
+import { useMedia } from 'react-use';
 
 import { GrafanaTheme2, PageLayoutType } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { SceneComponentProps } from '@grafana/scenes';
-import { CustomScrollbar, useStyles2 } from '@grafana/ui';
+import { CustomScrollbar, useStyles2, useTheme2 } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 import { EntityNotFound } from 'app/core/components/PageNotFound/EntityNotFound';
 import { getNavModel } from 'app/core/selectors/navModel';
@@ -75,15 +76,14 @@ export function DashboardSceneRenderer({ model }: SceneComponentProps<DashboardS
               <controls.Component model={controls} />
             </div>
           )}
-          <CustomScrollbar
+          <PanelsContainer
             // This id is used by the image renderer to scroll through the dashboard
-            divId="page-scrollbar"
-            autoHeightMin={'100%'}
-            className={styles.scrollbarContainer}
+            id="page-scrollbar"
+            className={styles.panelsContainer}
             testId={selectors.pages.Dashboard.DashNav.scrollContainer}
           >
             <div className={cx(styles.canvasContent)}>{body}</div>
-          </CustomScrollbar>
+          </PanelsContainer>
         </div>
       )}
       {overlay && <overlay.Component model={overlay} />}
@@ -100,6 +100,10 @@ function getStyles(theme: GrafanaTheme2) {
       gridTemplateColumns: `1fr`,
       gridTemplateRows: '1fr',
       height: '100%',
+      [theme.breakpoints.down('sm')]: {
+        display: 'flex',
+        flexDirection: 'column',
+      },
     }),
     pageContainerWithControls: css({
       gridTemplateAreas: `
@@ -119,7 +123,7 @@ function getStyles(theme: GrafanaTheme2) {
         "scopes controls"
         "scopes panels"`,
     }),
-    scrollbarContainer: css({
+    panelsContainer: css({
       gridArea: 'panels',
     }),
     controlsWrapper: css({
@@ -156,3 +160,34 @@ function getStyles(theme: GrafanaTheme2) {
     }),
   };
 }
+
+interface PanelsContainerProps {
+  id: string;
+  children: React.ReactNode;
+  className?: string;
+  testId?: string;
+}
+/**
+ * Removes the scrollbar on mobile and uses a custom scrollbar on desktop
+ */
+const PanelsContainer = ({ id, children, className, testId }: PanelsContainerProps) => {
+  const theme = useTheme2();
+  const isMobile = useMedia(`(max-width: ${theme.breakpoints.values.sm}px)`);
+  const styles = useStyles2(() => ({
+    nonScrollable: css({
+      height: '100%',
+      display: 'flex',
+      flexDirection: 'column',
+    }),
+  }));
+
+  return isMobile ? (
+    <div id={id} className={cx(className, styles.nonScrollable)} data-testid={testId}>
+      {children}
+    </div>
+  ) : (
+    <CustomScrollbar divId={id} autoHeightMin={'100%'} className={className} testId={testId}>
+      {children}
+    </CustomScrollbar>
+  );
+};