fix: auto merge fails

qlik-oss · Mar 16, 2023 · 66c97d6 · 66c97d6
1 parent 01500f2
commit 66c97d6
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/apis/nucleus/src/components/listbox/ListBoxInline.jsx b/apis/nucleus/src/components/listbox/ListBoxInline.jsx
@@ -183,14 +183,12 @@ function ListBoxInline({ options, layout }) {
   const isLocked = layout.qListObject.qDimensionInfo.qLocked === true;
   const isRtl = direction === 'rtl';
   const isDrillDown = layout.qListObject.qDimensionInfo.qGrouping === 'H';
-  const listboxSelectionToolbarItems = toolbar
-    ? createListboxSelectionToolbar({
-        layout,
-        model,
-        translator,
-        selectionState,
-      })
-    : [];
+  const listboxSelectionToolbarItems = createListboxSelectionToolbar({
+    layout,
+    model,
+    translator,
+    selectionState,
+  });
 
   const showTitle = true;
   const showSearchToggle = search === 'toggle' && showSearch;
@@ -235,19 +233,15 @@ function ListBoxInline({ options, layout }) {
 
   return (
     <>
-      {toolbarDetachedOnly && <ActionsToolbar {...getActionToolbarProps(true)} />}
+      {toolbarDetachedOnly && <ActionsToolbar direction={direction} {...getActionToolbarProps(true)} />}
       <StyledGrid
         className="listbox-container"
         container
         tabIndex={keyboard.enabled && !keyboard.active ? 0 : -1}
         direction="column"
         gap={0}
         containerPadding={containerPadding}
-        style={{
-          height: '100%',
-          minHeight: `${minHeight}px`,
-          flexFlow: 'column nowrap',
-        }}
+        style={{ height: '100%', minHeight: `${minHeight}px`, flexFlow: 'column nowrap' }}
         onKeyDown={handleKeyDown}
         onMouseEnter={handleOnMouseEnter}
         onMouseLeave={handleOnMouseLeave}
@@ -304,15 +298,18 @@ function ListBoxInline({ options, layout }) {
               )}
               <Grid item sx={{ justifyContent: isRtl ? 'flex-end' : 'flex-start' }} className={classes.listBoxHeader}>
                 {showTitle && (
-                  <Title variant="h6" noWrap title={layout.title}>
+                  <Title variant="h6" noWrap ref={titleRef} title={layout.title}>
                     {layout.title}
                   </Title>
                 )}
               </Grid>
             </Grid>
             <Grid item xs />
             <Grid item>
-              <ActionsToolbar {...getActionToolbarProps(showToolbarDetached({ containerRef, titleRef, iconsWidth }))} />
+              <ActionsToolbar
+                direction={direction}
+                {...getActionToolbarProps(showToolbarDetached({ containerRef, titleRef, iconsWidth }))}
+              />
             </Grid>
           </Grid>
         )}