From e9a9b4b4fd167c2525c0cab4644655c4e4bdebe8 Mon Sep 17 00:00:00 2001
From: Ji Won Shin <jwshin@google.com>
Date: Tue, 8 Aug 2017 15:02:31 -0700
Subject: [PATCH] Add [stepControl] to each step based on merging

---
 src/cdk/stepper/stepper.ts             |  2 +-
 src/demo-app/stepper/stepper-demo.html | 31 +++++++++++++-------------
 src/demo-app/stepper/stepper-demo.ts   |  6 ++---
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index 807369e1f87d..3e33a1bd5c51 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -209,7 +209,7 @@ export class CdkStepper {
     stepsArray[this._selectedIndex].interacted = true;
     if (this._linear) {
       for (let i = 0; i < index; i++) {
-        if (!stepsArray[i].stepControl.valid) {
+        if (stepsArray[i].stepControl.invalid) {
           return true;
         }
       }
diff --git a/src/demo-app/stepper/stepper-demo.html b/src/demo-app/stepper/stepper-demo.html
index 56f4add44b54..88c98fe76762 100644
--- a/src/demo-app/stepper/stepper-demo.html
+++ b/src/demo-app/stepper/stepper-demo.html
@@ -1,5 +1,6 @@
-<h2>Linear Vertical Stepper Demo</h2>
 <md-checkbox [(ngModel)]="isNonLinear">Disable linear mode</md-checkbox>
+
+<h3>Linear Vertical Stepper Demo using FormArray</h3>
 <form [formGroup]="formGroup">
   <md-vertical-stepper formArrayName="formArray" [linear]="!isNonLinear">
     <md-step formGroupName="0" [stepControl]="formArray.get([0])">
@@ -42,17 +43,17 @@ <h2>Linear Vertical Stepper Demo</h2>
   </md-vertical-stepper>
 </form>
 
-<h2>Linear Vertical Stepper Demo</h2>
-<md-vertical-stepper>
-  <md-step [valid]="nameFormGroup.valid">
+<h3>Linear Horizontal Stepper Demo using multiple FormGroups</h3>
+<md-horizontal-stepper [linear]="!isNonLinear">
+  <md-step [stepControl]="nameFormGroup">
     <form [formGroup]="nameFormGroup">
       <ng-template mdStepLabel>Fill out your name</ng-template>
       <md-input-container>
-        <input mdInput placeholder="First Name" formControlName="firstNameFormCtrl" required>
+        <input mdInput placeholder="First Name" formControlName="firstNameCtrl" required>
         <md-error>This field is required</md-error>
       </md-input-container>
       <md-input-container>
-        <input mdInput placeholder="Last Name" formControlName="lastNameFormCtrl" required>
+        <input mdInput placeholder="Last Name" formControlName="lastNameCtrl" required>
         <md-error>This field is required</md-error>
       </md-input-container>
       <div>
@@ -61,13 +62,11 @@ <h2>Linear Vertical Stepper Demo</h2>
     </form>
   </md-step>
 
-  <md-step [valid]="phoneFormGroup.valid">
+  <md-step [stepControl]="phoneFormGroup">
     <form [formGroup]="phoneFormGroup">
-      <ng-template mdStepLabel>
-        <div>Fill out your phone number</div>
-      </ng-template>
+      <ng-template mdStepLabel>Fill out your phone number</ng-template>
       <md-input-container>
-        <input mdInput placeholder="Phone number" formControlName="phoneFormCtrl">
+        <input mdInput placeholder="Phone number" formControlName="phoneCtrl">
         <md-error>This field is required</md-error>
       </md-input-container>
       <div>
@@ -86,9 +85,9 @@ <h2>Linear Vertical Stepper Demo</h2>
       </div>
     </form>
   </md-step>
-</md-vertical-stepper>
+</md-horizontal-stepper>
 
-<h2>Vertical Stepper Demo</h2>
+<h3>Vertical Stepper Demo</h3>
 <md-vertical-stepper>
   <md-step>
     <ng-template mdStepLabel>Fill out your name</ng-template>
@@ -143,7 +142,7 @@ <h2>Vertical Stepper Demo</h2>
   </md-step>
 </md-vertical-stepper>
 
-<h2>Horizontal Stepper Demo</h2>
+<h3>Horizontal Stepper Demo</h3>
 <md-horizontal-stepper>
   <md-step>
     <ng-template mdStepLabel>Fill out your name</ng-template>
@@ -198,7 +197,7 @@ <h2>Horizontal Stepper Demo</h2>
   </md-step>
 </md-horizontal-stepper>
 
-<h2>Horizontal Stepper Demo</h2>
+<h3>Horizontal Stepper Demo</h3>
 <md-horizontal-stepper>
   <md-step *ngFor="let step of steps" [label]="step.label">
     <md-input-container>
@@ -211,7 +210,7 @@ <h2>Horizontal Stepper Demo</h2>
   </md-step>
 </md-horizontal-stepper>
 
-<h2>Horizontal Stepper Demo with Templated Label</h2>
+<h3>Horizontal Stepper Demo with Templated Label</h3>
 <md-horizontal-stepper>
   <md-step *ngFor="let step of steps">
     <ng-template mdStepLabel>{{step.label}}</ng-template>
diff --git a/src/demo-app/stepper/stepper-demo.ts b/src/demo-app/stepper/stepper-demo.ts
index b9d0aba261be..367feecb6e56 100644
--- a/src/demo-app/stepper/stepper-demo.ts
+++ b/src/demo-app/stepper/stepper-demo.ts
@@ -43,12 +43,12 @@ export class StepperDemo {
     });
 
     this.nameFormGroup = new FormGroup({
-      firstNameFormCtrl: new FormControl('', Validators.required),
-      lastNameFormCtrl: new FormControl('', Validators.required)
+      firstNameCtrl: new FormControl('', Validators.required),
+      lastNameCtrl: new FormControl('', Validators.required)
     });
 
     this.phoneFormGroup = new FormGroup({
-      phoneFormCtrl: new FormControl('')
+      phoneCtrl: new FormControl('')
     });
   }
 }