From 20349b69cae6db237a10702fbe80f5bbac32c637 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Wed, 28 Jun 2023 21:19:10 +0200
Subject: [PATCH 1/2] Revert "revert: fix: Vertical scrollbar in data browser
 is outside visible area when scrolling horizontally (#2457) (#2477)"

This reverts commit 2f1d84e41c24507b516b933037807f1061182991.
---
 .../DataBrowserHeaderBar/DataBrowserHeaderBar.scss         | 2 +-
 src/dashboard/Data/Browser/Browser.scss                    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
index df45061d13..df511a075c 100644
--- a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
+++ b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
@@ -8,7 +8,7 @@
 @import 'stylesheets/globals.scss';
 
 .bar {
-  position: absolute;
+  position: sticky;
   top: 0;
   left: 0;
   height: 30px;
diff --git a/src/dashboard/Data/Browser/Browser.scss b/src/dashboard/Data/Browser/Browser.scss
index b39eee98cb..6d3ea83a4e 100644
--- a/src/dashboard/Data/Browser/Browser.scss
+++ b/src/dashboard/Data/Browser/Browser.scss
@@ -14,12 +14,13 @@
   right: 0;
   bottom: 0;
   overflow: auto;
-  padding-top: 30px;
+  width: calc(100% - 300px);
 }
 
 body:global(.expanded) {
   .browser {
     left: $sidebarCollapsedWidth;
+    width: calc(100% - $sidebarCollapsedWidth);
   }
 }
 
@@ -82,9 +83,7 @@ body:global(.expanded) {
   top: 30px;
   bottom: 0;
   left: 0;
-  min-width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
+  width: 100%;
 }
 
 .table .empty {

From 6841c082636a320b1995abb80ceb152b5fd26f18 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Wed, 19 Jul 2023 02:08:15 +0200
Subject: [PATCH 2/2] changes

---
 src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss | 4 ++--
 src/dashboard/Data/Browser/Browser.scss                       | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
index df511a075c..7e2d2ec501 100644
--- a/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
+++ b/src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.scss
@@ -14,8 +14,8 @@
   height: 30px;
   background: #66637a;
   white-space: nowrap;
-  display: inline-block;
-  min-width: 100%;
+  display: flex;
+  flex: 1;
   // to resolve rendering issue with retina displays
   -webkit-transform: translate3d(0,0,0);
 }
diff --git a/src/dashboard/Data/Browser/Browser.scss b/src/dashboard/Data/Browser/Browser.scss
index 8e012ad1c2..a8562c5563 100644
--- a/src/dashboard/Data/Browser/Browser.scss
+++ b/src/dashboard/Data/Browser/Browser.scss
@@ -14,13 +14,12 @@
   right: 0;
   bottom: 0;
   overflow: auto;
-  width: calc(100% - 300px);
+  display: flex;
 }
 
 body:global(.expanded) {
   .browser {
     left: $sidebarCollapsedWidth;
-    width: calc(100% - $sidebarCollapsedWidth);
   }
 }