Merge branch 'master' into AlertModalComponent

Author: zvonimirfras

src/dialog/overflow-menu/overflow-menu-option.component.ts

@@ -23,10 +23,7 @@ import {
 		<button
 			class="bx--overflow-menu-options__btn"
 			role="menuitem"
-			[ngClass]="{
-				'bx--overflow-menu-options__option--danger': type === 'danger',
-				'bx--overflow-menu-options__option--disabled': disabled
-			}"
+			[disabled]="disabled"
 			[tabindex]="(disabled ? -1 : null)"
 			[title]="(titleEnabled ? content : '')">
 			<ng-content></ng-content>
@@ -37,6 +34,15 @@ export class OverflowMenuOption {
 	@HostBinding("class") optionClass = "bx--overflow-menu-options__option";
 	@HostBinding("attr.role") role = "presentation";
 
+	@HostBinding("class.bx--overflow-menu-options__option--danger")
+	public get isDanger(): Boolean {
+		return this.type === "danger";
+	}
+
+	@HostBinding("class.bx--overflow-menu-options__option--disabled")
+	public get isDisabled(): Boolean {
+		return this.disabled;
+	}
 	/**
 	 * toggles between `normal` and `danger` states
 	 */

src/dialog/overflow-menu/overflow-menu-pane.component.ts

@@ -81,8 +81,6 @@ export class OverflowMenuPane extends Dialog {
 	}
 
 	private listItems() {
-		const buttonClass = ".bx--overflow-menu-options__btn";
-		const disabledClass = ".bx--overflow-menu-options__option--disabled";
-		return Array.from<any>(this.dialog.nativeElement.querySelectorAll(`${buttonClass}:not(${disabledClass})`));
+		return Array.from<any>(this.dialog.nativeElement.querySelectorAll(".bx--overflow-menu-options__btn:not([disabled])"));
 	}
 }

src/i18n/en.json

@@ -68,6 +68,9 @@
 	"MODAL" : {
 		"CLOSE": "Close modal"
 	},
+	"OVERFLOW_MENU" : {
+		"OVERFLOW": "Overflow"
+	},
 	"SIDENAV": {
 		"NAV_LABEL": "Side navigation"
 	},