From e439bc2314ccbc1f315802e3984694aecdd42654 Mon Sep 17 00:00:00 2001
From: Lisa Knox <lisaknox83@gmail.com>
Date: Tue, 23 Jan 2024 11:49:19 -0500
Subject: [PATCH] 21317: fixed collapse occlusion
 Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>

---
 .../multiselect-toolbar/MultiselectToolbar.tsx     | 14 +++++++-------
 .../ms-toolbar-overflow-wrapper.tsx                |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 87c9abe7ca..a4092b79ab 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -65,13 +65,13 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     button: {
         width: "2.5rem",
         height: "2.5rem ",
-        paddingLeft: 0
+        paddingLeft: 0,
     },
     iconContainer: {
         height: '100%',
     },
     icon: {
-        marginLeft: '-0.5rem'
+        marginLeft: '-0.5rem',
     }
 });
 
@@ -123,7 +123,7 @@ export const MultiselectToolbar = connect(
             <React.Fragment>
                 <Toolbar
                     className={isTransitioning ? classes.transition: classes.root}
-                    style={{ width: `${(actions.length * 2.5) + 8}rem` }}
+                    style={{ width: `${(actions.length * 2.5) + 5}rem` }}
                     data-cy='multiselect-toolbar'
                     >
                     {actions.length ? (
@@ -133,11 +133,11 @@ export const MultiselectToolbar = connect(
                             return hasAlts ? (
                                 <Tooltip
                                     className={classes.button}
-                                    title={currentPathIsTrash || (useAlts && useAlts(singleSelectedUuid, iconProps)) ? altName : name}
                                     data-targetid={name}
+                                    title={currentPathIsTrash || (useAlts && useAlts(singleSelectedUuid, iconProps)) ? altName : name}
                                     key={i}
                                     disableFocusListener
-                                >
+                                    >
                                     <span className={classes.iconContainer}>
                                         <IconButton
                                             data-cy='multiselect-button'
@@ -152,11 +152,11 @@ export const MultiselectToolbar = connect(
                             ) : (
                                 <Tooltip
                                     className={classes.button}
-                                    title={action.name}
                                     data-targetid={name}
+                                    title={action.name}
                                     key={i}
                                     disableFocusListener
-                                >
+                                    >
                                     <span className={classes.iconContainer}>
                                         <IconButton
                                             data-cy='multiselect-button'
diff --git a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
index ee88a1efae..645536c104 100644
--- a/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/ms-toolbar-overflow-wrapper.tsx
@@ -31,7 +31,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         order: 99,
         position: 'sticky',
         right: '-2rem',
-        backgroundColor: 'white',
     },
 });
 
@@ -69,7 +68,7 @@ export const IntersectionObserverWrapper = withStyles(styles)((props: WrapperPro
         setVisibilityMap({})
         const observer = new IntersectionObserver(handleIntersection, {
             root: navRef.current,
-            rootMargin: '0px -20px 0px 0px',
+            rootMargin: '0px -30px 0px 0px',
             threshold: 1,
         });
         // We are adding observers to child elements of the container div
-- 
2.30.2