From 8cb0acf10559c8e8f9870e35b5e0a2a5e58a8428 Mon Sep 17 00:00:00 2001
From: Stanislav Georgiev <sgeorgiev@ca.ibm.com>
Date: Mon, 24 Sep 2018 17:26:13 -0400
Subject: [PATCH 1/2] Fixed code styling.

---
 src/modal/alert-modal.component.ts |  9 ++++-----
 src/modal/modal.stories.ts         | 19 ++++++++++++++-----
 src/modal/overlay.component.ts     |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/modal/alert-modal.component.ts b/src/modal/alert-modal.component.ts
index 594cbe992f..46656ab2e4 100644
--- a/src/modal/alert-modal.component.ts
+++ b/src/modal/alert-modal.component.ts
@@ -37,17 +37,16 @@ import { ModalService } from "./modal.service";
  *   <ibm-modal-placeholder></ibm-modal-placeholder>`
  * })
  * export class ModalDemo {
- *
  * 	openModal() {
  * 		this.modalService.show({
- *			modalType: "default" | "danger",
+ *			modalType: "default",
  *			headerLabel: "optional header text",
  *			title: "Modal title",
  *			text: "Modal text",
  *			buttons: [{
  *				text: "Button text",
- *				type: "primary" | "secondary" | "tertiary" | "ghost" | "danger" | "danger--primary" = "primary",
- *				click: clickFunction,
+ *				type: "primary",
+ *				click: clickFunction
  *			}]
  *		});
  * 	}
@@ -82,7 +81,6 @@ import { ModalService } from "./modal.service";
 	`
 })
 export class AlertModalComponent implements AfterViewInit {
-
 	modalType = "default";
 	headerLabel: string;
 	title: string;
@@ -138,6 +136,7 @@ export class AlertModalComponent implements AfterViewInit {
 	}
 
 	closeModal() {
+		// let call the @Modal.destroy() explicitly or otherwise the modal won't close
 		this["destroy"]();
 	}
 }
diff --git a/src/modal/modal.stories.ts b/src/modal/modal.stories.ts
index fa217b19da..a752c419d2 100644
--- a/src/modal/modal.stories.ts
+++ b/src/modal/modal.stories.ts
@@ -128,8 +128,13 @@ storiesOf("Modal", module)
 	.addDecorator(withKnobs)
 	.add("Transactional", () => ({
 		template: `
-		<app-alert-modal-story [modalType]="modalType" [headerLabel]="headerLabel" [title]="title" [text]="text"
-			[buttons]="buttons"></app-alert-modal-story>
+		<app-alert-modal-story
+			[modalType]="modalType"
+			[headerLabel]="headerLabel"
+			[title]="title"
+			[text]="text"
+			[buttons]="buttons">
+		</app-alert-modal-story>
 		<ibm-modal-placeholder></ibm-modal-placeholder>
 		`,
 		props: {
@@ -165,8 +170,12 @@ storiesOf("Modal", module)
 	.addDecorator(withKnobs)
 	.add("Passive", () => ({
 		template: `
-		<app-alert-modal-story [modalType]="modalType" [headerLabel]="headerLabel" [title]="title" [text]="text"
-			></app-alert-modal-story>
+		<app-alert-modal-story
+			[modalType]="modalType"
+			[headerLabel]="headerLabel"
+			[title]="title"
+			[text]="text">
+		</app-alert-modal-story>
 		<ibm-modal-placeholder></ibm-modal-placeholder>
 		`,
 		props: {
@@ -174,7 +183,7 @@ storiesOf("Modal", module)
 			headerLabel: text("headerLabel", "optional header label"),
 			title: text("title", "Passive modal title"),
 			text: text("text", "Passive modal notifications should only appear if there is an action " +
-								"the user needs to address immediately. Passive modal notifications are persistent on screen")
+				"the user needs to address immediately. Passive modal notifications are persistent on screen")
 		}
 	}))
 ;
diff --git a/src/modal/overlay.component.ts b/src/modal/overlay.component.ts
index dc44bd316d..9daa0bfe68 100644
--- a/src/modal/overlay.component.ts
+++ b/src/modal/overlay.component.ts
@@ -34,7 +34,7 @@ export class OverlayComponent {
 	 * @type {"default" | "danger"}
 	 * @memberof ModalComponent
 	 */
-	@Input() modalType = "default";
+	@Input() modalType: "default" | "danger" = "default";
 	/**
 	 * To emit the event where the user selects the overlay behind the `Modal`.
 	 * @memberof OverlayComponent

From bd67e93e3a97417929df719dcd7c996bee3b52bc Mon Sep 17 00:00:00 2001
From: Stanislav Georgiev <sgeorgiev@ca.ibm.com>
Date: Mon, 1 Oct 2018 20:38:04 -0400
Subject: [PATCH 2/2] fix(Accordion): Expanded property is not triggering the
 item to expand.

---
 src/accordion/accordion-item.component.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/accordion/accordion-item.component.ts b/src/accordion/accordion-item.component.ts
index d63f2da01c..bbab61134d 100644
--- a/src/accordion/accordion-item.component.ts
+++ b/src/accordion/accordion-item.component.ts
@@ -29,17 +29,17 @@ import {
 	`
 })
 export class AccordionItem {
-	static accodionItemCount = 0;
-	@Input() title = `Title ${AccordionItem.accodionItemCount}`;
-	@HostBinding("class.bx--accordion__item--active") @Input() expanded = false;
-	@Input() id = `accordion-item-${AccordionItem.accodionItemCount}`;
+	static accordionItemCount = 0;
+	@Input() title = `Title ${AccordionItem.accordionItemCount}`;
+	@Input() id = `accordion-item-${AccordionItem.accordionItemCount}`;
 	@Output() selected = new EventEmitter();
 
-	@HostBinding("class") itemClass = "bx--accordion__item";
+	@HostBinding("class.bx--accordion__item") itemClass = true;
+	@HostBinding("class.bx--accordion__item--active") @Input() expanded = false;
 	@HostBinding("style.display") @HostBinding("attr.role") itemType = "list-item";
 
 	constructor() {
-		AccordionItem.accodionItemCount++;
+		AccordionItem.accordionItemCount++;
 	}
 
 	public toggleExpanded() {