From 7331bf499fada215663d751efab033efdaccf31a Mon Sep 17 00:00:00 2001
From: mhartington <mikehartington@gmail.com>
Date: Thu, 10 Aug 2017 10:14:57 -0400
Subject: [PATCH] fix(actionSheet): render cancel button in different group

---
 .../components/action-sheet/action-sheet.tsx  | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/components/action-sheet/action-sheet.tsx b/packages/core/src/components/action-sheet/action-sheet.tsx
index 85da0152d8..89399ac839 100644
--- a/packages/core/src/components/action-sheet/action-sheet.tsx
+++ b/packages/core/src/components/action-sheet/action-sheet.tsx
@@ -147,6 +147,22 @@ export class ActionSheet {
       userCssClass += ' ' + this.cssClass;
     }
 
+    let cancelButton: ActionSheetButton;
+    let buttons = this.buttons
+      .map(b => {
+        if (typeof b === 'string') {
+          b = { text: b };
+        }
+        if (!b.cssClass) {
+          b.cssClass = '';
+        }
+        if (b.role === 'cancel') {
+          cancelButton = b;
+          return null;
+        }
+        return b;
+      })
+      .filter(b => b !== null);
     return [
       <ion-backdrop
         onClick={this.backdropClick.bind(this)}
@@ -161,9 +177,8 @@ export class ActionSheet {
             {this.subTitle
               ? <div class="action-sheet-sub-title">{this.subTitle}</div>
               : null}
-            {this.buttons.map(b =>
-              <button class={this.buttonClass(b)}
-                onClick={() => this.click(b)}>
+            {buttons.map(b =>
+              <button class={this.buttonClass(b)} onClick={() => this.click(b)}>
                 {b.icon
                   ? <ion-icon name={b.icon} class="action-sheet-icon" />
                   : null}
@@ -171,6 +186,23 @@ export class ActionSheet {
               </button>
             )}
           </div>
+          {cancelButton
+            ? <div class="action-sheet-group">
+                <button
+                  class={this.buttonClass(cancelButton)}
+                  onClick={() => this.click(cancelButton)}
+                >
+                  {cancelButton.icon
+                    ? <ion-icon
+                        name={cancelButton.icon}
+                        class="action-sheet-icon"
+                      />
+                    : null}
+                  {cancelButton.text}
+                </button>
+
+              </div>
+            : null}
         </div>
       </div>
     ];
@@ -179,13 +211,12 @@ export class ActionSheet {
   buttonClass(button: ActionSheetButton): CssClassMap {
     let buttonClass: string[] = !button.role
       ? ['action-sheet-button']
-      : [`action-sheet-button`, `action-sheet-${button.role}`]
+      : [`action-sheet-button`, `action-sheet-${button.role}`];
     return buttonClass.reduce((prevValue: any, cssClass: any) => {
       prevValue[cssClass] = true;
       return prevValue;
     }, {});
   }
-
 }
 
 export interface ActionSheetOptions {