fix(ld-sidenav): show tooltip with slotted icon

emdgroup-liquid · Apr 1, 2022 · 7a8d409 · 7a8d409
1 parent 2b80985
commit 7a8d409
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/liquid/components/ld-sidenav/ld-sidenav-navitem/ld-sidenav-navitem.tsx b/src/liquid/components/ld-sidenav/ld-sidenav-navitem/ld-sidenav-navitem.tsx
@@ -131,12 +131,12 @@ export class LdSidenavNavitem implements InnerFocusable {
     this.sidenavAlignement = this.sidenav.align
     this.sidenavExpandsOnMouseEnter =
       this.sidenav.expandTrigger === 'mouseenter'
-    if (
-      !['secondary', 'tertiary'].includes(this.mode) &&
-      !this.el.querySelector('[slot="icon"]')
-    ) {
+    if (!['secondary', 'tertiary'].includes(this.mode)) {
       this.tooltipContent = this.el.textContent.trim()
-      this.abbreviation = this.getabbreviation()
+
+      if (!this.el.querySelector('[slot="icon"]')) {
+        this.abbreviation = this.getabbreviation()
+      }
     }
   }
 

diff --git a/src/liquid/components/ld-sidenav/test/__snapshots__/ld-sidenav.spec.ts.snap b/src/liquid/components/ld-sidenav/test/__snapshots__/ld-sidenav.spec.ts.snap
@@ -386,7 +386,9 @@ exports[`ld-sidenav collapses to narrow 1`] = `
               </mock:shadow-root>
               <div class="ld-sidenav-navitem__tooltip-trigger" slot="trigger"></div>
               <div class="ld-sidenav-navitem__tooltip-content">
-                <ld-typo></ld-typo>
+                <ld-typo>
+                  Artificial intelligence
+                </ld-typo>
               </div>
             </ld-tooltip>
           </div>