Merge branch 'master' into issue-2550

Author: zvonimirfras

src/ui-shell/sidenav/sidenav-item.component.ts

@@ -23,6 +23,9 @@ import { Router } from "@angular/router";
 			<a
 				class="bx--side-nav__link"
 				[href]="href"
+				[ngClass]="{
+					'bx--side-nav__link--current': active
+				}"
 				[attr.role]="(isSubMenu ? 'menuitem' : null)"
 				[attr.aria-current]="(active ? 'page' : null)"
 				[attr.title]="title ? title : null"

src/ui-shell/sidenav/sidenav-menu.component.ts

@@ -27,7 +27,7 @@ import { SideNavItemInterface } from "./sidenav-item.interface";
 				[attr.aria-expanded]="expanded"
 				type="button">
 				<div class="bx--side-nav__icon">
-					<ng-content select="[icon]"></ng-content>
+					<ng-content select="svg, [icon]"></ng-content>
 				</div>
 				<span class="bx--side-nav__submenu-title">{{title}}</span>
 				<div class="bx--side-nav__icon bx--side-nav__icon--small bx--side-nav__submenu-chevron">
@@ -113,10 +113,6 @@ export class SideNavMenu implements AfterContentInit, OnDestroy {
 	}
 
 	protected findActiveChildren() {
-		if (this.sidenavItems.some(item => item.active)) {
-			this.hasActiveChild = true;
-		} else {
-			this.hasActiveChild = false;
-		}
+		this.hasActiveChild = this.sidenavItems.some(item => item.active);
 	}
 }

src/ui-shell/ui-shell.stories.ts

@@ -202,7 +202,7 @@ storiesOf("Components|UI Shell", module)
 	.add("Side Navigation", () => ({
 		template: `
 			<ibm-sidenav>
-				<ibm-sidenav-item>
+				<ibm-sidenav-item active="true">
 					<svg ibmIcon="fade" size="16"></svg>
 					Link
 				</ibm-sidenav-item>
@@ -212,7 +212,7 @@ storiesOf("Components|UI Shell", module)
 				</ibm-sidenav-item>
 				<ibm-sidenav-menu title="Category title">
 					<svg ibmIcon="fade" size="16"></svg>
-					<ibm-sidenav-item>Link</ibm-sidenav-item>
+					<ibm-sidenav-item active="true">Link</ibm-sidenav-item>
 					<ibm-sidenav-item>Link</ibm-sidenav-item>
 					<ibm-sidenav-item>Link</ibm-sidenav-item>
 				</ibm-sidenav-menu>