-
Notifications
You must be signed in to change notification settings - Fork 6.8k
feat(stepper): Merge initial prototype of stepper into the upstream stepper branch. #5742
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
33c6299
Prototyping
jwshinjwshin 366b4c3
Further work
jwshinjwshin d8e3075
Further prototyping
jwshinjwshin f94d966
Further prototyping
jwshinjwshin 23bfd0c
Further work
jwshinjwshin 63d141e
Adding event emitters
jwshinjwshin 471df0f
Adding "selectedIndex" attribute to stepper and working on TemplateOu…
jwshinjwshin 1d6ebb2
Prototyping
jwshinjwshin 03e5849
Further work
jwshinjwshin c1cb73f
Further prototyping
jwshinjwshin e90c839
Further prototyping
jwshinjwshin 992a07a
Further work
jwshinjwshin 9e5720a
Adding event emitters
jwshinjwshin 66bec54
Merge branch 'stepper1' of github.com:g1shin/material2 into stepper1
jwshinjwshin 617c270
Template rendering and selectIndex control done.
jwshinjwshin 42c1f14
Work in progress for accessibility
jwshinjwshin b879732
Added functionalities based on the tentative API doc.
jwshinjwshin f89b8bc
Refactor code for cdk-stepper and cdk-step
jwshinjwshin a529bf3
Add support for templated label
jwshinjwshin 34ac69e
Added support for keyboard events and focus changes for accessibility.
jwshinjwshin aee0abf
Updated vertical stepper + added comments
jwshinjwshin fcb94ff
Merge remote-tracking branch 'upstream/master' into stepper2
jwshinjwshin 5e9085f
Fix package-lock.json
jwshinjwshin f417435
Fix indention
jwshinjwshin 36ad2cc
Changes made based on the review
jwshinjwshin 836c0ac
Changes based on review - event properties, selectors, SPACE support,…
jwshinjwshin 78c9eb5
Add select() for step component + refactor to avoid circular dependen…
jwshinjwshin 26f73f9
API change based on review
jwshinjwshin a56e57f
Minor code clean up based on review.
jwshinjwshin 3c1f4fd
Several name changes, etc based on review
jwshinjwshin 0c3f7c4
Add to compatibility mode list and refactor to avoid circular dependency
jwshinjwshin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added functionalities based on the tentative API doc.
- Loading branch information
commit b8797326cff4341fd9857bc3b0817df1e47fb4a3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <h2>Veritcal Stepper Demo</h2> | ||
| <mat-stepper [orientation]="'vertical'" [(selectedIndex)]="verticalActiveIndex"> | ||
| <mat-step *ngFor="let step of steps" [label]="step.label" | ||
| [active]="step.active" [completed]="step.completed"> | ||
| <mat-step *ngFor="let step of steps" [label]="step.label"> | ||
| <div>{{step.content}}</div> | ||
| <div>optional {{step.optional}}</div> | ||
| <div>editable {{step.editable}}</div> | ||
| </mat-step> | ||
| </mat-stepper> | ||
|
|
||
| <h2>Horizontal Stepper Demo</h2> | ||
| <mat-stepper [orientation]="'horizontal'" [(selectedIndex)]="horizontalActiveIndex"> | ||
| <mat-step *ngFor="let step of steps" [label]="step.label" | ||
| [active]="step.active" [completed]="step.completed"> | ||
| <mat-step *ngFor="let step of steps" [label]="step.label"> | ||
| <div>{{step.content}}</div> | ||
| </mat-step> | ||
| </mat-stepper> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: indent 2