8000 feat(material/stepper): allow for orientation to be changed dynamically by crisbeto · Pull Request #22139 · angular/components · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat(material/stepper): allow for orientation to be changed dynamically #22139

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.

Sign up for GitHub

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 1 commit into from
Apr 2, 2021
Merged

feat(material/stepper): allow for orientation to be changed dynamically #22139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 7 additions & 12 deletions src/cdk/stepper/stepper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,16 @@ export class CdkStepper implements AfterContentInit, AfterViewInit, OnDestroy {
/** Used to track unique ID for each stepper component. */
_groupId: number;

// Note that this isn't an `Input` so it doesn't bleed into the Material stepper.
/** Orientation of the stepper. */
@Input()
get orientation(): StepperOrientation { return this._orientation; }
set orientation(value: StepperOrientation) {
this._updateOrientation(value);
// This is a protected method so that `MatSteppter` can hook into it.
this._orientation = value;

if (this._keyManager) {
this._keyManager.withVerticalOrientation(value === 'vertical');
}
}

/**
Expand Down Expand Up @@ -432,16 +437,6 @@ export class CdkStepper implements AfterContentInit, AfterViewInit, OnDestroy {
this._getGuidelineLogic(step, isCurrentStep, state);
}

/** Updates the stepper orientation. */
protected _updateOrientation(value: StepperOrientation) {
// This is a protected method so that `MatSteppter` can hook into it.
this._orientation = value;

if (this._keyManager) {
this._keyManager.withVerticalOrientation(value === 'vertical');
}
}

private _getDefaultIndicatorLogic(step: CdkStep, isCurrentStep: boolean): StepState {
if (step._showError && step.hasError && !isCurrentStep) {
return STEP_STATE.ERROR;
Expand Down
18 changes: 13 additions & 5 deletions src/dev-app/stepper/stepper-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<p>
<mat-checkbox [(ngModel)]="disableRipple">Disable header ripple</mat-checkbox>
</p>
<p>
<mat-checkbox [(ngModel)]="isVertical">Vertical</mat-checkbox>
</p>
<p>
<button mat-stroked-button (click)="showLabelBottom = !showLabelBottom">
Toggle label position
Expand All @@ -18,10 +21,15 @@
</mat-form-field>
</p>

<h3>Linear Vertical Stepper Demo using a single form</h3>
<h3>Linear Stepper Demo using a single form</h3>
<form [formGroup]="formGroup">
<mat-vertical-stepper #linearVerticalStepper="matVerticalStepper" formArrayName="formArray"
[linear]="!isNonLinear" [disableRipple]="disableRipple" [color]="theme">
<mat-stepper
#linearStepper="matVerticalStepper"
formArrayName="formArray"
[orientation]="isVertical ? 'vertical' : 'horizontal'"
[linear]="!isNonLinear"
[disableRipple]="disableRipple"
[color]="theme">
<mat-step formGroupName="0" [stepControl]="formArray?.get([0]) === null ? undefined! : formArray?.get([0])!">
<ng-template matStepLabel>Fill out your name</ng-template>
<mat-form-field>
Expand Down Expand Up @@ -61,10 +69,10 @@ <h3>Linear Vertical Stepper Demo using a single form</h3>
Everything seems correct.
<div>
<button mat-button>Done</button>
<button type="button" mat-button (click)="linearVerticalStepper.reset()">Reset</button>
<button type="button" mat-button (click)="linearStepper.reset()">Reset</button>
</div>
</mat-step>
</mat-vertical-stepper>
</mat-stepper>
</form>

<h3>Linear Horizontal Stepper Demo using a different form for each step</h3>
Expand Down
1 change: 1 addition & 0 deletions src/dev-app/stepper/stepper-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export class StepperDemo implements OnInit {
isNonEditable = false;
disableRipple = false;
showLabelBottom = false;
isVertical = false;

nameFormGroup: FormGroup;
emailFormGroup: FormGroup;
Expand Down
1 change: 1 addition & 0 deletions src/material/stepper/public-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* found in the LICENSE file a 8000 t https://angular.io/license
*/

export {StepperOrientation} from '@angular/cdk/stepper';
export * from './stepper-module';
export * from './step-label';
export * from './stepper';
Expand Down
4 changes: 2 additions & 2 deletions src/material/stepper/stepper-animations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const matStepperAnimations: {
readonly verticalStepTransition: AnimationTriggerMetadata;
} = {
/** Animation that transitions the step along the X axis in a horizontal stepper. */
horizontalStepTransition: trigger('stepTransition', [
horizontalStepTransition: trigger('horizontalStepTransition', [
state('previous', style({transform: 'translate3d(-100%, 0, 0)', visibility: 'hidden'})),
// Transition to '', rather than `visible`, because visibility on a child element overrides
// the one from the parent, making this element focusable inside of a `hidden` element.
Expand All @@ -33,7 +33,7 @@ export const matStepperAnimations: {
]),

/** Animation that transitions the step along the Y axis in a vertical stepper. */
verticalStepTransition: trigger('stepTransition', [
verticalStepTransition: trigger('verticalStepTransition', [
state('previous', style({height: '0px', visibility: 'hidden'})),
state('next', style({height: '0px', visibility: 'hidden'})),
// Transition to '', rather than `visible`, because visibility on a child element overrides
Expand Down
39 changes: 0 additions & 39 deletions src/material/stepper/stepper-horizontal.html
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/material/stepper/stepper-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ import {MatStepContent} from './step-content';
],
exports: [
MatCommonModule,
MatHorizontalStepper,
MatVerticalStepper,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically this change shouldn't be necessary, but for some reason keeping the old steppers in the exports causes a null pointer exception in the ViewEngine compiler.

MatStep,
MatStepLabel,
MatStepper,
Expand Down
37 changes: 0 additions & 37 deletions src/material/stepper/stepper-vertical.html
View file
Open in desktop

This file was deleted.

74 changes: 74 additions & 0 deletions src/material/stepper/stepper.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<ng-container [ngSwitch]="orientation">
<!-- Horizontal stepper -->
<ng-container *ngSwitchCase="'horizontal'">
<div class="mat-horizontal-stepper-header-container">
<ng-container *ngFor="let step of steps; let i = index; let isLast = last">
<ng-container
[ngTemplateOutlet]="stepTemplate"
[ngTemplateOutletContext]="{step: step, i: i}"></ng-container>
<div *ngIf="!isLast" class="mat-stepper-horizontal-line"></div>
</ng-container>
</div>

<div class="mat-horizontal-content-container">
<div *ngFor="let step of steps; let i = index"
class="mat-horizontal-stepper-content" role="tabpanel"
[@horizontalStepTransition]="_getAnimationDirection(i)"
(@horizontalStepTransition.done)="_animationDone.next($event)"
[id]="_getStepContentId(i)"
[attr.aria-labelledby]="_getStepLabelId(i)"
[attr.aria-expanded]="selectedIndex === i">
<ng-container [ngTemplateOutlet]="step.content"></ng-container>
</div>
</div>
</ng-container>

<!-- Vertical stepper -->
<ng-container *ngSwitchCase="'vertical'">
<div class="mat-step" *ngFor="let step of steps; let i = index; let isLast = last">
<ng-container
[ngTemplateOutlet]="stepTemplate"
[ngTemplateOutletContext]="{step: step, i: i}"></ng-container>
<div class="mat-vertical-content-container" [class.mat-stepper-vertical-line]="!isLast">
<div class="mat-vertical-stepper-content" role="tabpanel"
[@verticalStepTransition]="_getAnimationDirection(i)"
(@verticalStepTransition.done)="_animationDone.next($event)"
[id]="_getStepContentId(i)"
[attr.aria-labelledby]="_getStepLabelId(i)"
[attr.aria-expanded]="selectedIndex === i">
<div class="mat-vertical-content">
<ng-container [ngTemplateOutlet]="step.content"></ng-container>
</div>
</div>
</div>
</div>
</ng-container>

</ng-container>

<!-- Common step templating -->
<ng-template let-step="step" let-i="i" #stepTemplate>
<mat-step-header
[class.mat-horizontal-stepper-header]="orientation === 'horizontal'"
[class.mat-vertical-stepper-header]="orientation === 'vertical'"
(click)="step.select()"
(keydown)="_onKeydown($event)"
[tabIndex]="_getFocusIndex() === i ? 0 : -1"
[id]="_getStepLabelId(i)"
[attr.aria-posinset]="i + 1"
[attr.aria-setsize]="steps.length"
[attr.aria-controls]="_getStepContentId(i)"
[attr.aria-selected]="selectedIndex == i"
[attr.aria-label]="step.ariaLabel || null"
[attr.aria-labelledby]="(!step.ariaLabel && step.ariaLabelledby) ? step.ariaLabelledby : null"
[index]="i"
[state]="_getIndicatorType(i, step.state)"
[label]="step.stepLabel || step.label"
[selected]="selectedIndex === i"
[active]="step.completed || selectedIndex === i || !linear"
[optional]="step.optional"
[errorMessage]="step.errorMessage"
[iconOverrides]="_iconOverrides"
[disableRipple]="disableRipple"
[color]="step.color || color"></mat-step-header>
</ng-template>
Loading
0