From a7beb306429bcb92556876018d6d3421d40e2796 Mon Sep 17 00:00:00 2001
From: Radhika Bhatnagar <aradhika@us.ibm.com>
Date: Mon, 8 Oct 2018 14:21:39 -0400
Subject: [PATCH 1/2] Issue #114 - Fix DAP issues for Modal

change role from main to dialog on div
add label for dialog role
remove banner and content-info per html 5 usage
any to service method for compiling
---
 src/modal/alert-modal.component.ts  |  2 +-
 src/modal/modal-footer.component.ts |  2 +-
 src/modal/modal-header.component.ts |  2 +-
 src/modal/modal.component.ts        | 10 +++++++++-
 src/modal/modal.service.ts          |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/modal/alert-modal.component.ts b/src/modal/alert-modal.component.ts
index fd5aae97f9..6c4b06a81d 100644
--- a/src/modal/alert-modal.component.ts
+++ b/src/modal/alert-modal.component.ts
@@ -58,7 +58,7 @@ import Modal from "./modal.decorator";
 @Component({
 	selector: "ibm-alert-modal",
 	template: `
-		<ibm-modal [modalType]="modalType">
+		<ibm-modal [modalType]="modalType" [modalLabel]="modalTitle">
 			<ibm-modal-header (closeSelect)="closeModal()">
 				<p class="bx--modal-header__label bx--type-delta">{{modalLabel}}</p>
       			<p class="bx--modal-header__heading bx--type-beta">{{modalTitle}}</p>
diff --git a/src/modal/modal-footer.component.ts b/src/modal/modal-footer.component.ts
index a5e09c248b..04dc058c05 100644
--- a/src/modal/modal-footer.component.ts
+++ b/src/modal/modal-footer.component.ts
@@ -8,7 +8,7 @@ import { Component } from "@angular/core";
 @Component({
 	selector: "ibm-modal-footer",
 	template: `
-		<footer role="contentinfo" class="bx--modal-footer">
+		<footer class="bx--modal-footer">
 			<ng-content></ng-content>
 		</footer>
 	`
diff --git a/src/modal/modal-header.component.ts b/src/modal/modal-header.component.ts
index c92d05ef9a..7747317017 100644
--- a/src/modal/modal-header.component.ts
+++ b/src/modal/modal-header.component.ts
@@ -18,7 +18,7 @@ import { Component, Output, EventEmitter, Input } from "@angular/core";
 @Component({
 	selector: "ibm-modal-header",
 	template: `
-		<header class="{{modalType}} bx--modal-header" role="banner">
+		<header class="{{modalType}} bx--modal-header">
 			<div class="bx--modal-header">
 				<ng-content></ng-content>
 			</div>
diff --git a/src/modal/modal.component.ts b/src/modal/modal.component.ts
index 9981d592c2..e6db7b0694 100644
--- a/src/modal/modal.component.ts
+++ b/src/modal/modal.component.ts
@@ -90,10 +90,11 @@ import { cycleTabs } from "./../common/tab.service";
 			<div
 				class="bx--modal-container"
 				[@modalState]="modalState"
-				role="main"
+				role="dialog"
 				aria-modal="true"
 				tabindex="0"
 				style="z-index:1;"
+				[attr.aria-label]="modalLabel"
 				#modal>
 				<ng-content></ng-content>
 			</div>
@@ -125,6 +126,13 @@ export class ModalComponent implements AfterViewInit, OnInit, OnDestroy {
 	 * @memberof ModalComponent
 	 */
 	@Input() modalType = "default";
+
+	/**
+	 * Label for the modal.
+	 * @memberof ModalComponent
+	 */
+	@Input() modalLabel = "default";
+
 	/**
 	 * Emits event when click occurs within `n-overlay` element. This is to track click events occuring outside bounds of the `Modal` object.
 	 * @memberof ModalComponent
diff --git a/src/modal/modal.service.ts b/src/modal/modal.service.ts
index e07a48fc56..577f72d6bf 100644
--- a/src/modal/modal.service.ts
+++ b/src/modal/modal.service.ts
@@ -86,7 +86,7 @@ export class ModalService {
 	 * @returns {ComponentRef<any>}
 	 * @memberof ModalService
 	 */
-	show(data: {modalType?: string, modalLabel?: string, modalTitle?: string, modalContent?: string, buttons?: []}) {
+	show(data: {modalType?: string, modalLabel?: string, modalTitle?: string, modalContent?: string, buttons?: any[]}) {
 		return this.create({
 			component: AlertModalComponent,
 			inputs: {

From d9cf85c17451420603cb7e6c479301f799c51f46 Mon Sep 17 00:00:00 2001
From: Radhika Bhatnagar <aradhika@us.ibm.com>
Date: Mon, 15 Oct 2018 09:43:47 -0400
Subject: [PATCH 2/2] resolve indentation

---
 src/modal/modal.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modal/modal.service.ts b/src/modal/modal.service.ts
index b6a3b903f5..f605c309e5 100644
--- a/src/modal/modal.service.ts
+++ b/src/modal/modal.service.ts
@@ -87,7 +87,7 @@ export class ModalService {
 	 * @returns {ComponentRef<any>}
 	 * @memberof ModalService
 	 */
-show(data: AlertModalData) {
+	show(data: AlertModalData) {
 		return this.create({
 			component: AlertModalComponent,
 			inputs: {