Add an AlertModalComponent

src/calendar/month-view/calendar-month.component.ts

@@ -1,7 +1,7 @@
 import {
 	Component,
 	Input,
-	OnInit,
+	OnInit
 } from "@angular/core";
 import { DateTimeModel } from "./../date-time-model.class";
 import { range } from "../../common/utils";

src/calendar/months-view/calendar-months.component.ts

@@ -1,7 +1,7 @@
 import {
 	Component,
 	Input,
-	OnInit,
+	OnInit
 } from "@angular/core";
 import { DateTimeModel } from "./../date-time-model.class";
 import { range } from "../../common/utils";

src/calendar/quarter-view/calendar-quarter.component.ts

@@ -2,7 +2,7 @@ import { TranslateService } from "@ngx-translate/core";
 import {
 	Component,
 	Input,
-	OnInit,
+	OnInit
 } from "@angular/core";
 import { DateTimeModel } from "./../date-time-model.class";
 import { range } from "../../common/utils";

src/calendar/year-view/calendar-year.component.ts

@@ -1,7 +1,7 @@
 import {
 	Component,
 	Input,
-	OnInit,
+	OnInit
 } from "@angular/core";
 import { DateTimeModel } from "./../date-time-model.class";
 import { range } from "../../common/utils";

src/dialog/tooltip/tooltip.stories.ts

@@ -13,7 +13,7 @@ storiesOf("Tooltip", module)
 			imports: [
 				DialogModule,
 				TranslateModule.forRoot()
-			],
+			]
 		})
 	)
 	.addDecorator(withKnobs)

src/modal/alert-modal.component.ts

@@ -0,0 +1,131 @@
+import {
+	Component,
+	Injector,
+	OnInit,
+	ElementRef,
+	AfterViewInit
+} from "@angular/core";
+import {
+	trigger,
+	state,
+	style,
+	transition,
+	animate
+} from "@angular/animations";
+import Modal from "./modal.decorator";
+import { ModalService } from "./modal.service";
+
+/**
+ * Component to create standard modals for presenting content or asking for user's input.
+ * It can show as a passive modal showing only text or show as a transactional modal with
+ * multiple buttons for different actions for the user to choose from.
+ *
+ * Using a modal in your application requires `ibm-modal-placeholder` which would generally be
+ * placed near the end of your app component template (app.component.ts or app.component.html) as:
+ *
+ * ```html
+ * <ibm-modal-placeholder></ibm-modal-placeholder>
+ * ```
+ *
+ * Example of opening the modal:
+ *
+ * ```typescript
+ * \@Component({
+ *  selector: "app-modal-demo",
+ *  template: `
+ *   <button class="btn--primary" (click)="openModal()">Open modal</button>
+ *   <ibm-modal-placeholder></ibm-modal-placeholder>`
+ * })
+ * export class ModalDemo {
+ * 	openModal() {
+ * 		this.modalService.show({
+ *			modalType: "default",
+ *			headerLabel: "optional header text",
+ *			title: "Modal title",
+ *			text: "Modal text",
+ *			buttons: [{
+ *				text: "Button text",
+ *				type: "primary",
+ *				click: clickFunction
+ *			}]
+ *		});
+ * 	}
+ * }
+ * ```
+ *
+ * @export
+ * @class AlertModalComponent
+ */
+@Modal()
+@Component({
+	selector: "ibm-alert-modal",
+	template: `
+		<ibm-modal [modalType]="modalType">
+			<ibm-modal-header (closeSelect)="closeModal()">
+				<p class="bx--modal-header__label bx--type-delta">{{headerLabel}}</p>
+      			<p class="bx--modal-header__heading bx--type-beta">{{title}}</p>
+			</ibm-modal-header>
+			<div class="bx--modal-content">
+				<p>{{text}}</p>
+			</div>
+			<ibm-modal-footer *ngIf="buttons.length > 0">
+				<ng-container *ngFor="let button of buttons; let i = index">
+					<button
+						ibmButton="{{button.type}}"
+						(click)="buttonClicked(i)"
+						[id]="button.id"
+						[attr.modal-primary-focus]="button.type.indexOf('primary') !== -1 ? '' : null">
+						{{button.text}}
+					</button>
+				</ng-container>
+			</ibm-modal-footer>
+		</ibm-modal>
+	`
+})
+export class AlertModalComponent {
+	modalType = "default";
+	headerLabel: string;
+	title: string;
+	text: string;
+	buttons = [];
+
+	/**
+	 * Creates an instance of `AlertModalComponent`.
+	 * @param {ModalService} modalService
+	 * @memberof AlertModalComponent
+	 */
+	constructor(
+		private injector: Injector,
+		private elementRef: ElementRef
+	) {
+		this.modalType = this.injector.get("modalType");
+		this.headerLabel = this.injector.get("headerLabel");
+		this.title = this.injector.get("title");
+		this.text = this.injector.get("text");
+
+		this.buttons = this.injector.get("buttons") || [];
+		for (let i = 0; i < this.buttons.length; i++) {
+			const button = this.buttons[i];
+			if (!button.id) {
+				button.id = `alert-modal-button-${i}`;
+			}
+			if (!button.type) {
+				button.type = "secondary";
+			}
+		}
+	}
+
+	buttonClicked(buttonIndex) {
+		const button = this.buttons[buttonIndex];
+		if (button.click) {
+			button.click();
+		}
+
+		this.closeModal();
+	}
+
+	closeModal() {
+		// let call the @Modal.destroy() explicitly or otherwise the modal won't close
+		this["destroy"]();
+	}
+}

src/modal/modal-header.component.ts

@@ -19,9 +19,9 @@ import { Component, Output, EventEmitter, Input } from "@angular/core";
 	selector: "ibm-modal-header",
 	template: `
 		<header class="{{modalType}} bx--modal-header" role="banner">
-			<h5 class="bx--modal-header__heading">
+			<div class="bx--modal-header">
 				<ng-content></ng-content>
-			</h5>
+			</div>
 			<button
 				class="bx--modal-close"
 				attr.aria-label="{{'MODAL.CLOSE' | translate}}"
@@ -35,7 +35,7 @@ import { Component, Output, EventEmitter, Input } from "@angular/core";
 					width="10"
 					aria-label="close the modal"
 					alt="close the modal">
-					<title>close the modal</title>
+					<title>{{'MODAL.CLOSE' | translate}}</title>
 					<path d="M6.32 5L10 8.68 8.68 10 5 6.32 1.32 10 0 8.68 3.68 5 0 1.32 1.32 0 5 3.68 8.68 0 10 1.32 6.32 5z"></path>
 				</svg>
 			</button>

src/modal/modal.component.ts

@@ -24,7 +24,7 @@ import { cycleTabs } from "./../common/tab.service";
 /**
  * Component to create modals for presenting content.
  *
- * Using a modal in your application requires `n-modal-placeholder` which would generally be
+ * Using a modal in your application requires `ibm-modal-placeholder` which would generally be
  * placed near the end of your app component template (app.component.ts or app.component.html) as:
  *
  * ```html
@@ -49,7 +49,7 @@ import { cycleTabs } from "./../common/tab.service";
  * 			</button>
  * 			{{modalText}}
  * 			</section>
- * 			<ibm-modal-footer><button class="btn--primary cancel-button" (click)="closeModal()">Close</button></ibm-modal-footer>
+ * 			<ibm-modal-footer><button ibmButton="primary" (click)="closeModal()">Close</button></ibm-modal-footer>
  * 		</ibm-modal>`,
  * 	styleUrls: ["./sample-modal.component.scss"]
  * })
@@ -68,7 +68,7 @@ import { cycleTabs } from "./../common/tab.service";
  * \@Component({
  *  selector: "app-modal-demo",
  *  template: `
- *   <button class="btn--primary" (click)="openModal('drill')">Drill-down modal</button>
+ *   <button ibmButton="primary" (click)="openModal('drill')">Drill-down modal</button>
  *   <ibm-modal-placeholder></ibm-modal-placeholder>`
  * })
  * export class ModalDemo {
@@ -86,7 +86,7 @@ import { cycleTabs } from "./../common/tab.service";
 @Component({
 	selector: "ibm-modal",
 	template: `
-		<ibm-overlay (overlaySelect)="overlaySelected.emit()">
+		<ibm-overlay [modalType]="modalType" (overlaySelect)="overlaySelected.emit()">
 			<div
 				class="bx--modal-container"
 				[@modalState]="modalState"
@@ -121,7 +121,7 @@ export class ModalComponent implements AfterViewInit, OnInit, OnDestroy {
 	@Input() size = "default";
 	/**
 	 * Classification of the modal.
-	 * @type {"default" | "warning" | "error"}
+	 * @type {"default" | "danger"}
 	 * @memberof ModalComponent
 	 */
 	@Input() modalType = "default";

src/modal/modal.module.ts

@@ -17,6 +17,8 @@ import { ModalComponent } from "./modal.component";
 import { ModalFooterComponent } from "./modal-footer.component";
 import { OverlayComponent } from "./overlay.component";
 import { ModalHeaderComponent } from "./modal-header.component";
+import { AlertModalComponent } from "./alert-modal.component";
+import { ButtonModule } from "../forms/forms.module";
 
 // exports
 export { default as Modal } from "./modal.decorator";
@@ -36,19 +38,22 @@ export const MODAL_PLACEHOLDER_SERVICE_PROVIDER = {
 
 @NgModule({
 	declarations: [
+		AlertModalComponent,
 		ModalPlaceholderComponent,
 		ModalComponent,
 		ModalHeaderComponent,
 		ModalFooterComponent,
 		OverlayComponent
 	],
 	exports: [
+		AlertModalComponent,
 		ModalPlaceholderComponent,
 		ModalComponent,
 		ModalHeaderComponent,
 		ModalFooterComponent
 	],
 	entryComponents: [
+		AlertModalComponent,
 		ModalComponent,
 		ModalFooterComponent,
 		ModalHeaderComponent
@@ -61,6 +66,7 @@ export const MODAL_PLACEHOLDER_SERVICE_PROVIDER = {
 	],
 	imports: [
 		CommonModule,
+		ButtonModule,
 		TranslateModule,
 		StaticIconModule
 	]

src/modal/modal.service.ts

@@ -8,6 +8,7 @@ import { ModalComponent } from "./modal.component";
 import { ModalPlaceholderService } from "./modal-placeholder.service";
 import { ReplaySubject } from "rxjs";
 import { Injectable } from "@angular/core";
+import { AlertModalComponent } from "./alert-modal.component";
 
 
 /**
@@ -67,6 +68,33 @@ export class ModalService {
 		return component;
 	}
 
+	/**
+	 * Creates and renders a new alert modal component.
+	 * @param data You can pass in `title`, `text` and `buttons` to be used in the modal.
+	 * `buttons` is an array of objects
+	 * ```
+	 * {
+	 * 		text: "Button text",
+	 * 		type: "primary" | "secondary" | "tertiary" | "ghost" | "danger" | "danger--primary" = "primary",
+	 * 		click: clickFunction,
+	 * }
+	 * ```
+	 * @returns {ComponentRef<any>}
+	 * @memberof ModalService
+	 */
+	show(data: {modalType?: string, headerLabel?: string, title: string, text: string, buttons?: null}) {
+		return this.create({
+			component: AlertModalComponent,
+			inputs: {
+				modalType: data.modalType,
+				headerLabel: data.headerLabel,
+				title: data.title,
+				text: data.text,
+				buttons: data.buttons || []
+			}
+		});
+	}
+
 	/**
 	 * Destroys the modal on the supplied index.
 	 * When called without parameters it destroys the most recently created/top most modal.