Merge branch 'master' into dependabot/npm_and_yarn/integration/ng7/engine.io-and-socket.io-6.4.2

Author: Akshat55

src/code-snippet/code-snippet.component.ts

@@ -33,7 +33,7 @@ export enum SnippetType {
 		</ng-container>
 
 		<ng-template #notInline>
-			<div class="bx--snippet-container" [attr.aria-label]="translations.CODE_SNIPPET_TEXT">
+			<div class="bx--snippet-container" [attr.aria-label]="translations.CODE_SNIPPET_TEXT" role="textbox" aria-readonly="true">
 				<ng-container *ngIf="skeleton">
 					<span *ngIf="display === 'single'; else multiSkeleton"></span>
 					<ng-template #multiSkeleton>

src/combobox/combobox.component.ts

@@ -735,7 +735,9 @@ export class ComboBox implements OnChanges, AfterViewInit, AfterContentInit, OnD
 		this.showClearButton = !!searchString;
 		this.view.filterBy(searchString);
 		if (searchString !== "") {
-			this.openDropdown();
+			if (!this.open) {
+				this.openDropdown();
+			}
 		} else {
 			this.selectedValue = "";
 			if (this.type === "multi" &&

src/modal/modal-header.component.ts

@@ -5,7 +5,6 @@ import {
 	Input
 } from "@angular/core";
 import { I18n } from "carbon-components-angular/i18n";
-import { ExperimentalService } from "carbon-components-angular/experimental";
 
 /**
  * ***Inputs***
@@ -55,7 +54,7 @@ export class ModalHeader {
 	 */
 	@Output() closeSelect = new EventEmitter();
 
-	constructor(protected i18n: I18n, protected experimental: ExperimentalService) {}
+	constructor(protected i18n: I18n) {}
 
 	/**
 	 * Handles click for the close icon button within the `Modal`.

src/notification/toast.component.ts

@@ -7,7 +7,6 @@ import {
 
 import { ToastContent } from "./notification-content.interface";
 import { Notification } from "./notification.component";
-import { ExperimentalService } from "carbon-components-angular/experimental";
 import { NotificationDisplayService } from "./notification-display.service";
 import { I18n } from "carbon-components-angular/i18n";
 
@@ -85,10 +84,7 @@ export class Toast extends Notification implements OnInit {
 	@HostBinding("class.bx--toast-notification--warning") get isWarning() { return this.notificationObj["type"] === "warning"; }
 	@HostBinding("class.bx--toast-notification--low-contrast") get isLowContrast() { return this.notificationObj.lowContrast; }
 
-	constructor(
-		protected notificationDisplayService: NotificationDisplayService,
-		protected i18n: I18n,
-		protected experimental: ExperimentalService) {
+	constructor(protected notificationDisplayService: NotificationDisplayService, protected i18n: I18n) {
 		super(notificationDisplayService, i18n);
 		// disable inline notification styles
 		this.notificationClass = false;

src/progress-indicator/progress-indicator.component.ts

@@ -2,9 +2,10 @@ import {
 	Component,
 	Input,
 	Output,
-	EventEmitter, OnChanges, SimpleChanges
+	EventEmitter,
+	OnChanges,
+	SimpleChanges
 } from "@angular/core";
-import { ExperimentalService } from "carbon-components-angular/experimental";
 import { Step } from "./progress-indicator-step.interface";
 
 /**
@@ -83,8 +84,6 @@ export class ProgressIndicator implements OnChanges {
 	}
 	private _current: number;
 
-	constructor(protected experimental: ExperimentalService) {}
-
 	ngOnChanges(changes: SimpleChanges) {
 		if (changes.steps || changes.current) {
 			this.setProgressIndicatorStates();

src/progress-indicator/progress-indicator.module.ts

@@ -3,7 +3,6 @@ import { CommonModule } from "@angular/common";
 
 import { ProgressIndicator } from "./progress-indicator.component";
 import { DialogModule } from "carbon-components-angular/dialog";
-import { ExperimentalModule } from "carbon-components-angular/experimental";
 import { IconModule } from "carbon-components-angular/icon";
 
 @NgModule({
@@ -16,7 +15,6 @@ import { IconModule } from "carbon-components-angular/icon";
 	imports: [
 		CommonModule,
 		DialogModule,
-		ExperimentalModule,
 		IconModule
 	]
 })

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>