refactor(sidebar-nav): minor fixes

xidedix · xidedix · commit 13f65487307f · 2024-10-28T18:23:46.000+01:00
diff --git a/projects/coreui-angular/src/lib/sidebar/sidebar-nav/sidebar-nav-link.component.ts b/projects/coreui-angular/src/lib/sidebar/sidebar-nav/sidebar-nav-link.component.ts
@@ -85,7 +85,7 @@ export class SidebarNavLinkComponent implements OnInit, OnDestroy {
     this.url =
       typeof this.item.url === 'string'
         ? this.item.url
-        : this.router.serializeUrl(this.router.createUrlTree(this.item.url as any[]));
+        : this.router.serializeUrl(this.router.createUrlTree((this.item.url as any[]) ?? ['']));
     this.linkType = this.getLinkType();
     this.href = this.isDisabled() ? '' : this.item.href || this.url;
     this.linkActive = this.router.url.split(/[?#(;]/)[0] === this.href.split(/[?#(;]/)[0];
@@ -110,7 +110,7 @@ export class SidebarNavLinkComponent implements OnInit, OnDestroy {
 
   public isExternalLink(): boolean {
     const linkPath = Array.isArray(this.item.url) ? this.item.url[0] : this.item.url;
-    return !!this.item.href || linkPath.substring(0, 4) === 'http';
+    return !!this.item.href || linkPath?.substring(0, 4) === 'http';
   }
 
   linkClicked(): void {
diff --git a/projects/coreui-angular/src/lib/sidebar/sidebar-nav/sidebar-nav.component.ts b/projects/coreui-angular/src/lib/sidebar/sidebar-nav/sidebar-nav.component.ts
@@ -160,22 +160,26 @@ export class SidebarNavGroupComponent implements OnInit, OnDestroy {
 
   onAnimationStart($event: AnimationEvent) {
     this.display = { display: 'block' };
-    if ($event.toState === 'open') {
-      const host = this.sidebarNav.nativeElement;
-      this.renderer.setStyle(host, 'height', `${host['scrollHeight']}px`);
-    }
+    setTimeout(() => {
+      const host = this.sidebarNav?.nativeElement;
+      if ($event.toState === 'open' && host) {
+        this.renderer.setStyle(host, 'height', `${host['scrollHeight']}px`);
+      }
+    });
   }
 
   onAnimationDone($event: AnimationEvent) {
-    if ($event.toState === 'open') {
-      const host = this.sidebarNav.nativeElement;
-      this.renderer.setStyle(host, 'height', 'auto');
-    }
-    if ($event.toState === 'closed') {
-      setTimeout(() => {
-        this.display = null;
-      });
-    }
+    setTimeout(() => {
+      const host = this.sidebarNav?.nativeElement;
+      if ($event.toState === 'open' && host) {
+        this.renderer.setStyle(host, 'height', 'auto');
+      }
+      if ($event.toState === 'closed') {
+        setTimeout(() => {
+          this.display = null;
+        });
+      }
+    });
   }
 }
 
