From b5680811d3385df2d1ce68cc1bf722ba2ba06c0c Mon Sep 17 00:00:00 2001
From: Lisa Knox <lisa.knox@curii.com>
Date: Fri, 4 Oct 2024 11:54:56 -0400
Subject: [PATCH] 22155: eliminated layout shift when switching tabs

Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>
---
 .../workbench2/src/components/data-explorer/data-explorer.tsx | 4 +++-
 .../src/components/multiselect-toolbar/MultiselectToolbar.tsx | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx
index 95e89d57f8..98a58deb6d 100644
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@ -58,6 +58,7 @@ const styles: CustomStyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     titleWrapper: {
         display: "flex",
         justifyContent: "space-between",
+        marginTop: "-5px",
     },
     msToolbarStyles: {
         paddingTop: "0.6rem",
@@ -131,6 +132,7 @@ const styles: CustomStyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     dataTable: {
         height: "100%",
         overflowY: "auto",
+        marginTop: "-10px",
     },
     container: {
         height: "100%",
@@ -374,7 +376,7 @@ export const DataExplorer = withStyles(styles)(
                                 </Grid>
                             )}
                         </div>
-                        {!this.multiSelectToolbarInTitle &&
+                        {this.multiSelectToolbarInTitle ? <div className={classes.subToolbarWrapper} /> :
                             <div className={classNames(classes.subToolbarWrapper, path?.includes('search-results') ? classes.searchResultsToolbar : null)}>
                                 {!this.state.hideToolbar && <MultiselectToolbar
                                     forceMultiSelectMode={forceMultiSelectMode}
diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index b2d96124ef..1f653f2bad 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -62,6 +62,7 @@ const styles: CustomStyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         height: "2.5rem ",
         paddingLeft: 0,
         border: "1px solid transparent",
+        zIndex: 10,
     },
     iconContainer: {
         height: '100%',
-- 
2.30.2