fix: pass route extras in routerLink (#2905)

Signed-off-by: Akshat Patel <akshat@live.ca> Co-authored-by: Andrea Paolucci <35496522+Licen-it@users.noreply.github.com>
carbon-design-system · May 29, 2024 · 1c1c314 · 1c1c314
1 parent 65c7392
commit 1c1c314
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/src/ui-shell/sidenav/side-nav.component.spec.ts b/src/ui-shell/sidenav/side-nav.component.spec.ts
@@ -18,7 +18,7 @@ class FooComponent { }
 @Component({
 	template: `
 		<cds-sidenav [allowExpansion]="allowExpansion" [hidden]="hidden">
-			<cds-sidenav-menu title="Example Title"></cds-sidenav-menu>
+			<cds-sidenav-menu title="Example Title"></cds-sidenav-menu>
 			<cds-sidenav-item
 				[route]="route"
 				[useRouter]="useRouter"
@@ -67,7 +67,7 @@ describe("SideNav", () => {
 		});
 	});
 
-	it("should work", () => {
+	it("should work", () => {
 		fixture = TestBed.createComponent(SideNav);
 		expect(fixture.componentInstance instanceof SideNav).toBe(true);
 	});
@@ -81,7 +81,7 @@ describe("SideNav", () => {
 			fixture.detectChanges();
 		});
 
-		it("should emit the navigation status promise when the link is activated and call onNavigation", async () => {
+		it("should emit the navigation status promise when the link is activated and call onNavigation", async () => {
 			wrapper = fixture.componentInstance;
 			spyOn(wrapper, "onNavigation").and.callThrough();
 			fixture.detectChanges();
@@ -110,7 +110,7 @@ describe("SideNav", () => {
 		it("should set the sidenav-menu title to Example Title", () => {
 			fixture.detectChanges();
 			element = fixture.debugElement.query(By.css("cds-sidenav-menu"));
-			expect(element.nativeElement.textContent).toEqual("Example Title");
+			expect(element.nativeElement.textContent).toEqual("Example Title");
 		});
 
 		it("should toggle expanded on click", () => {
@@ -140,16 +140,6 @@ describe("SideNav", () => {
 			fixture.detectChanges();
 		});
 
-		it("should not emit the navigation status promise when the link is activated and call onNavigation", async () => {
-			wrapper = fixture.componentInstance;
-			spyOn(wrapper, "onNavigation").and.callThrough();
-			fixture.detectChanges();
-			element = fixture.debugElement.query(By.css(".cds--side-nav__link"));
-			element.nativeElement.click();
-			fixture.detectChanges();
-			expect(wrapper.onNavigation).not.toHaveBeenCalled();
-		});
-
 		it("should expand sidenav-menu on click", () => {
 			wrapper = fixture.componentInstance;
 			fixture.detectChanges();
@@ -167,7 +157,7 @@ describe("SideNav", () => {
 		it("should set the sidenav-menu title to Example Title", () => {
 			fixture.detectChanges();
 			element = fixture.debugElement.query(By.css("cds-sidenav-menu"));
-			expect(element.nativeElement.textContent).toEqual("Example Title");
+			expect(element.nativeElement.textContent).toEqual("Example Title");
 		});
 
 		it("should toggle expanded on click", () => {

diff --git a/src/ui-shell/sidenav/sidenav-item.component.ts b/src/ui-shell/sidenav/sidenav-item.component.ts
@@ -18,21 +18,22 @@ import { Router } from "@angular/router";
 	selector: "cds-sidenav-item, ibm-sidenav-item",
 	template: `
 		<a *ngIf="!useRouter; else sidenavItemRouterTpl"
-		   class="cds--side-nav__link"
-		   [ngClass]="{
+			class="cds--side-nav__link"
+			[ngClass]="{
 				'cds--side-nav__item--active': active
 			}"
-		   [href]="href"
-		   [attr.aria-current]="(active ? 'page' : null)"
-		   [attr.title]="title ? title : null"
-		   (click)="navigate($event)">
+			[href]="href"
+			[attr.aria-current]="(active ? 'page' : null)"
+			[attr.title]="title ? title : null"
+			(click)="navigate($event)">
 			<ng-template [ngTemplateOutlet]="sidenavItemContentTpl"></ng-template>
 		</a>
 
 		<ng-template #sidenavItemRouterTpl>
 			<a
 				[routerLink]="route"
 				routerLinkActive="cds--side-nav__item--active"
+				(click)="navigate($event)"
 				ariaCurrentWhenActive="page"
 				[attr.title]="title ? title : null"
 				class="cds--side-nav__link">