Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(stepper): Add support for linear stepper #2 - each step as its own form. #6117

Merged
merged 5 commits into from
Aug 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/cdk/stepper/stepper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,7 @@ export class CdkStepper {
const stepsArray = this._steps.toArray();
stepsArray[this._selectedIndex].interacted = true;
if (this._linear) {
for (let i = 0; i < index; i++) {
if (!stepsArray[i].stepControl.valid) {
return true;
}
}
return stepsArray.slice(0, index).some(step => step.stepControl.invalid);
}
return false;
}
Expand Down
95 changes: 70 additions & 25 deletions src/demo-app/stepper/stepper-demo.html
Original file line number Diff line number Diff line change
@@ -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 a single form</h3>
<form [formGroup]="formGroup">
<md-vertical-stepper formArrayName="formArray" [linear]="!isNonLinear">
<md-step formGroupName="0" [stepControl]="formArray.get([0])">
Expand Down Expand Up @@ -42,19 +43,63 @@ <h2>Linear Vertical Stepper Demo</h2>
</md-vertical-stepper>
</form>

<h2>Vertical Stepper Demo</h2>
<h3>Linear Horizontal Stepper Demo using a different form for each step</h3>
<md-horizontal-stepper [linear]="!isNonLinear">
<md-step [stepControl]="nameFormGroup">
<form [formGroup]="nameFormGroup">
<ng-template mdStepLabel>Fill out your name</ng-template>
<md-form-field>
<input mdInput placeholder="First Name" formControlName="firstNameCtrl" required>
<md-error>This field is required</md-error>
</md-form-field>
<md-form-field>
<input mdInput placeholder="Last Name" formControlName="lastNameCtrl" required>
<md-error>This field is required</md-error>
</md-form-field>
<div>
<button md-button mdStepperNext>Next</button>
</div>
</form>
</md-step>

<md-step [stepControl]="phoneFormGroup">
<form [formGroup]="phoneFormGroup">
<ng-template mdStepLabel>Fill out your phone number</ng-template>
<md-form-field>
<input mdInput placeholder="Phone number" formControlName="phoneCtrl" required>
<md-error>This field is required</md-error>
</md-form-field>
<div>
<button md-button mdStepperPrevious>Back</button>
<button md-button mdStepperNext>Next</button>
</div>
</form>
</md-step>

<md-step>
<form>
<ng-template mdStepLabel>Confirm your information</ng-template>
Everything seems correct.
<div>
<button md-button>Done</button>
</div>
</form>
</md-step>
</md-horizontal-stepper>

<h3>Vertical Stepper Demo</h3>
<md-vertical-stepper>
<md-step>
<ng-template mdStepLabel>Fill out your name</ng-template>
<md-input-container>
<md-form-field>
<input mdInput placeholder="First Name">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>

<md-input-container>
<md-form-field>
<input mdInput placeholder="Last Name">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperNext type="button">Next</button>
</div>
Expand All @@ -64,10 +109,10 @@ <h2>Vertical Stepper Demo</h2>
<ng-template mdStepLabel>
<div>Fill out your phone number</div>
</ng-template>
<md-input-container>
<md-form-field>
<input mdInput placeholder="Phone number">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperPrevious type="button">Back</button>
<button md-button mdStepperNext type="button">Next</button>
Expand All @@ -78,10 +123,10 @@ <h2>Vertical Stepper Demo</h2>
<ng-template mdStepLabel>
<div>Fill out your address</div>
</ng-template>
<md-input-container>
<md-form-field>
<input mdInput placeholder="Address">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperPrevious type="button">Back</button>
<button md-button mdStepperNext type="button">Next</button>
Expand All @@ -97,19 +142,19 @@ <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>
<md-input-container>
<md-form-field>
<input mdInput placeholder="First Name">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>

<md-input-container>
<md-form-field>
<input mdInput placeholder="Last Name">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperNext type="button">Next</button>
</div>
Expand All @@ -119,10 +164,10 @@ <h2>Horizontal Stepper Demo</h2>
<ng-template mdStepLabel>
<div>Fill out your phone number</div>
</ng-template>
<md-input-container>
<md-form-field>
<input mdInput placeholder="Phone number">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperPrevious type="button">Back</button>
<button md-button mdStepperNext type="button">Next</button>
Expand All @@ -133,10 +178,10 @@ <h2>Horizontal Stepper Demo</h2>
<ng-template mdStepLabel>
<div>Fill out your address</div>
</ng-template>
<md-input-container>
<md-form-field>
<input mdInput placeholder="Address">
<md-error>This field is required</md-error>
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperPrevious type="button">Back</button>
<button md-button mdStepperNext type="button">Next</button>
Expand All @@ -152,26 +197,26 @@ <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>
<md-form-field>
<input mdInput placeholder="Answer" [(ngModel)]="step.content">
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperPrevious>Back</button>
<button md-button mdStepperNext>Next</button>
</div>
</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>
<md-input-container>
<md-form-field>
<input mdInput placeholder="Answer" [(ngModel)]="step.content">
</md-input-container>
</md-form-field>
<div>
<button md-button mdStepperPrevious>Back</button>
<button md-button mdStepperNext>Next</button>
Expand Down
14 changes: 13 additions & 1 deletion src/demo-app/stepper/stepper-demo.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component} from '@angular/core';
import {Validators, FormBuilder, FormGroup} from '@angular/forms';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';

@Component({
moduleId: module.id,
Expand All @@ -11,6 +11,9 @@ export class StepperDemo {
formGroup: FormGroup;
isNonLinear = false;

nameFormGroup: FormGroup;
phoneFormGroup: FormGroup;

steps = [
{label: 'Confirm your name', content: 'Last name, First name.'},
{label: 'Confirm your contact information', content: '123-456-7890'},
Expand All @@ -35,5 +38,14 @@ export class StepperDemo {
})
])
});

this.nameFormGroup = this._formBuilder.group({
firstNameCtrl: ['', Validators.required],
lastNameCtrl: ['', Validators.required],
});

this.phoneFormGroup = this._formBuilder.group({
phoneCtrl: ['', Validators.required]
});
}
}