From 3bc1ab244c8fba8b655a3392a7901b7c2b09784e Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Thu, 24 Jan 2019 16:13:30 -0800
Subject: [PATCH 1/4] fix(stepper): ensure step state is not minified

---
 src/lib/stepper/step-header.html | 35 +-------------------------------
 src/lib/stepper/step-header.ts   | 10 +++++++++
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
index e9570c5d0878..a18fb89d7fdd 100644
--- a/src/lib/stepper/step-header.html
+++ b/src/lib/stepper/step-header.html
@@ -3,45 +3,12 @@
      [ngSwitch]="state">
 
   <div class="mat-step-icon-content">
-    <ng-container *ngSwitchCase="'number'" [ngSwitch]="!!(iconOverrides && iconOverrides.number)">
-      <ng-container
-        *ngSwitchCase="true"
-        [ngTemplateOutlet]="iconOverrides.number"
-        [ngTemplateOutletContext]="_getIconContext()"></ng-container>
-      <span *ngSwitchDefault>{{index + 1}}</span>
-    </ng-container>
-
-    <ng-container *ngSwitchCase="'edit'" [ngSwitch]="!!(iconOverrides && iconOverrides.edit)">
-      <ng-container
-        *ngSwitchCase="true"
-        [ngTemplateOutlet]="iconOverrides.edit"
-        [ngTemplateOutletContext]="_getIconContext()"></ng-container>
-      <mat-icon *ngSwitchDefault>create</mat-icon>
-    </ng-container>
-
-    <ng-container *ngSwitchCase="'done'" [ngSwitch]="!!(iconOverrides && iconOverrides.done)">
-      <ng-container
-        *ngSwitchCase="true"
-        [ngTemplateOutlet]="iconOverrides.done"
-        [ngTemplateOutletContext]="_getIconContext()"></ng-container>
-      <mat-icon *ngSwitchDefault>done</mat-icon>
-    </ng-container>
-
-    <ng-container *ngSwitchCase="'error'" [ngSwitch]="!!(iconOverrides && iconOverrides.error)">
-      <ng-container
-        *ngSwitchCase="true"
-        [ngTemplateOutlet]="iconOverrides.error"
-        [ngTemplateOutletContext]="_getIconContext()"></ng-container>
-      <mat-icon *ngSwitchDefault>warning</mat-icon>
-    </ng-container>
-
-    <!-- Custom state. -->
     <ng-container *ngSwitchDefault [ngSwitch]="!!(iconOverrides && iconOverrides[state])">
       <ng-container
         *ngSwitchCase="true"
         [ngTemplateOutlet]="iconOverrides[state]"
         [ngTemplateOutletContext]="_getIconContext()"></ng-container>
-      <mat-icon *ngSwitchDefault>{{state}}</mat-icon>
+      <mat-icon *ngSwitchDefault>{{_getDefaultIconForState(state)}}</mat-icon>
     </ng-container>
   </div>
 </div>
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index ae97ba44cdf3..1d0a52d91631 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -101,4 +101,14 @@ export class MatStepHeader extends CdkStepHeader implements OnDestroy {
       optional: this.optional
     };
   }
+
+  _getDefaultIconForState(state: string): string {
+    if (state == 'number') {
+      return `${this.index + 1}`;
+    }
+    return ({
+      'edit': 'create',
+      'error': 'warning',
+    } as {[key: string]: string})[state] || state;
+  }
 }

From ce7bffbab9e091609253ed08b0ae3371dae46f1c Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Thu, 24 Jan 2019 16:15:33 -0800
Subject: [PATCH 2/4] address feedback

---
 src/lib/stepper/step-header.html | 18 +++++++-----------
 src/lib/stepper/step-header.ts   | 13 ++++++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
index a18fb89d7fdd..a78e63052438 100644
--- a/src/lib/stepper/step-header.html
+++ b/src/lib/stepper/step-header.html
@@ -1,15 +1,11 @@
 <div class="mat-step-header-ripple" mat-ripple [matRippleTrigger]="_getHostElement()"></div>
-<div class="mat-step-icon-state-{{state}} mat-step-icon" [class.mat-step-icon-selected]="selected"
-     [ngSwitch]="state">
-
-  <div class="mat-step-icon-content">
-    <ng-container *ngSwitchDefault [ngSwitch]="!!(iconOverrides && iconOverrides[state])">
-      <ng-container
-        *ngSwitchCase="true"
-        [ngTemplateOutlet]="iconOverrides[state]"
-        [ngTemplateOutletContext]="_getIconContext()"></ng-container>
-      <mat-icon *ngSwitchDefault>{{_getDefaultIconForState(state)}}</mat-icon>
-    </ng-container>
+<div class="mat-step-icon-state-{{state}} mat-step-icon" [class.mat-step-icon-selected]="selected">
+  <div class="mat-step-icon-content" [ngSwitch]="!!(iconOverrides && iconOverrides[state])">
+    <ng-container
+      *ngSwitchCase="true"
+      [ngTemplateOutlet]="iconOverrides[state]"
+      [ngTemplateOutletContext]="_getIconContext()"></ng-container>
+    <mat-icon *ngSwitchDefault>{{_getDefaultIconForState(state)}}</mat-icon>
   </div>
 </div>
 <div class="mat-step-label"
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 1d0a52d91631..7f3e14739d02 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -102,13 +102,16 @@ export class MatStepHeader extends CdkStepHeader implements OnDestroy {
     };
   }
 
-  _getDefaultIconForState(state: string): string {
+  _getDefaultIconForState(state: StepState): string {
     if (state == 'number') {
       return `${this.index + 1}`;
     }
-    return ({
-      'edit': 'create',
-      'error': 'warning',
-    } as {[key: string]: string})[state] || state;
+    if (state == 'edit') {
+      return 'create';
+    }
+    if (state == 'error') {
+      return 'warning';
+    }
+    return state;
   }
 }

From f95e396c7a14a5a07a3e38395e13d56ec97d4306 Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Thu, 24 Jan 2019 16:14:18 -0800
Subject: [PATCH 3/4] update api goldens

---
 tools/public_api_guard/lib/stepper.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/public_api_guard/lib/stepper.d.ts b/tools/public_api_guard/lib/stepper.d.ts
index dcb061d770f7..e5426f5081e9 100644
--- a/tools/public_api_guard/lib/stepper.d.ts
+++ b/tools/public_api_guard/lib/stepper.d.ts
@@ -29,6 +29,7 @@ export declare class MatStepHeader extends CdkStepHeader implements OnDestroy {
     selected: boolean;
     state: StepState;
     constructor(_intl: MatStepperIntl, _focusMonitor: FocusMonitor, _elementRef: ElementRef<HTMLElement>, changeDetectorRef: ChangeDetectorRef);
+    _getDefaultIconForState(state: StepState): string;
     _getHostElement(): HTMLElement;
     _getIconContext(): MatStepperIconContext;
     _stringLabel(): string | null;

From 9c23924b782c9c76298e5ea5cd41e5a9e969e541 Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Fri, 25 Jan 2019 09:52:19 -0800
Subject: [PATCH 4/4] fix number state

---
 src/lib/stepper/step-header.html        | 5 ++++-
 src/lib/stepper/step-header.ts          | 2 +-
 tools/public_api_guard/lib/stepper.d.ts | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib/stepper/step-header.html b/src/lib/stepper/step-header.html
index a78e63052438..be0493f18a77 100644
--- a/src/lib/stepper/step-header.html
+++ b/src/lib/stepper/step-header.html
@@ -5,7 +5,10 @@
       *ngSwitchCase="true"
       [ngTemplateOutlet]="iconOverrides[state]"
       [ngTemplateOutletContext]="_getIconContext()"></ng-container>
-    <mat-icon *ngSwitchDefault>{{_getDefaultIconForState(state)}}</mat-icon>
+    <ng-container *ngSwitchDefault [ngSwitch]="state">
+      <span *ngSwitchCase="'number'">{{_getDefaultTextForState(state)}}</span>
+      <mat-icon *ngSwitchDefault>{{_getDefaultTextForState(state)}}</mat-icon>
+    </ng-container>
   </div>
 </div>
 <div class="mat-step-label"
diff --git a/src/lib/stepper/step-header.ts b/src/lib/stepper/step-header.ts
index 7f3e14739d02..70463e2e29e7 100644
--- a/src/lib/stepper/step-header.ts
+++ b/src/lib/stepper/step-header.ts
@@ -102,7 +102,7 @@ export class MatStepHeader extends CdkStepHeader implements OnDestroy {
     };
   }
 
-  _getDefaultIconForState(state: StepState): string {
+  _getDefaultTextForState(state: StepState): string {
     if (state == 'number') {
       return `${this.index + 1}`;
     }
diff --git a/tools/public_api_guard/lib/stepper.d.ts b/tools/public_api_guard/lib/stepper.d.ts
index e5426f5081e9..cd9f4d2255ee 100644
--- a/tools/public_api_guard/lib/stepper.d.ts
+++ b/tools/public_api_guard/lib/stepper.d.ts
@@ -29,7 +29,7 @@ export declare class MatStepHeader extends CdkStepHeader implements OnDestroy {
     selected: boolean;
     state: StepState;
     constructor(_intl: MatStepperIntl, _focusMonitor: FocusMonitor, _elementRef: ElementRef<HTMLElement>, changeDetectorRef: ChangeDetectorRef);
-    _getDefaultIconForState(state: StepState): string;
+    _getDefaultTextForState(state: StepState): string;
     _getHostElement(): HTMLElement;
     _getIconContext(): MatStepperIconContext;
     _stringLabel(): string | null;