Skip to content

Commit e7b0e40

Browse files
mmalerbaandrewseguin
authored andcommitted
fix(stepper): ensure step state is not minified (#14933)
* fix(stepper): ensure step state is not minified * update api goldens * address feedback * fix number state
1 parent 58254ae commit e7b0e40

File tree

3 files changed

+23
-43
lines changed

3 files changed

+23
-43
lines changed

src/lib/stepper/step-header.html

Lines changed: 9 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,13 @@
11
<div class="mat-step-header-ripple" mat-ripple [matRippleTrigger]="_getHostElement()"></div>
2-
<div class="mat-step-icon-state-{{state}} mat-step-icon" [class.mat-step-icon-selected]="selected"
3-
[ngSwitch]="state">
4-
5-
<div class="mat-step-icon-content">
6-
<ng-container *ngSwitchCase="'number'" [ngSwitch]="!!(iconOverrides && iconOverrides.number)">
7-
<ng-container
8-
*ngSwitchCase="true"
9-
[ngTemplateOutlet]="iconOverrides.number"
10-
[ngTemplateOutletContext]="_getIconContext()"></ng-container>
11-
<span *ngSwitchDefault>{{index + 1}}</span>
12-
</ng-container>
13-
14-
<ng-container *ngSwitchCase="'edit'" [ngSwitch]="!!(iconOverrides && iconOverrides.edit)">
15-
<ng-container
16-
*ngSwitchCase="true"
17-
[ngTemplateOutlet]="iconOverrides.edit"
18-
[ngTemplateOutletContext]="_getIconContext()"></ng-container>
19-
<mat-icon *ngSwitchDefault>create</mat-icon>
20-
</ng-container>
21-
22-
<ng-container *ngSwitchCase="'done'" [ngSwitch]="!!(iconOverrides && iconOverrides.done)">
23-
<ng-container
24-
*ngSwitchCase="true"
25-
[ngTemplateOutlet]="iconOverrides.done"
26-
[ngTemplateOutletContext]="_getIconContext()"></ng-container>
27-
<mat-icon *ngSwitchDefault>done</mat-icon>
28-
</ng-container>
29-
30-
<ng-container *ngSwitchCase="'error'" [ngSwitch]="!!(iconOverrides && iconOverrides.error)">
31-
<ng-container
32-
*ngSwitchCase="true"
33-
[ngTemplateOutlet]="iconOverrides.error"
34-
[ngTemplateOutletContext]="_getIconContext()"></ng-container>
35-
<mat-icon *ngSwitchDefault>warning</mat-icon>
36-
</ng-container>
37-
38-
<!-- Custom state. -->
39-
<ng-container *ngSwitchDefault [ngSwitch]="!!(iconOverrides && iconOverrides[state])">
40-
<ng-container
41-
*ngSwitchCase="true"
42-
[ngTemplateOutlet]="iconOverrides[state]"
43-
[ngTemplateOutletContext]="_getIconContext()"></ng-container>
44-
<mat-icon *ngSwitchDefault>{{state}}</mat-icon>
2+
<div class="mat-step-icon-state-{{state}} mat-step-icon" [class.mat-step-icon-selected]="selected">
3+
<div class="mat-step-icon-content" [ngSwitch]="!!(iconOverrides && iconOverrides[state])">
4+
<ng-container
5+
*ngSwitchCase="true"
6+
[ngTemplateOutlet]="iconOverrides[state]"
7+
[ngTemplateOutletContext]="_getIconContext()"></ng-container>
8+
<ng-container *ngSwitchDefault [ngSwitch]="state">
9+
<span *ngSwitchCase="'number'">{{_getDefaultTextForState(state)}}</span>
10+
<mat-icon *ngSwitchDefault>{{_getDefaultTextForState(state)}}</mat-icon>
4511
</ng-container>
4612
</div>
4713
</div>

src/lib/stepper/step-header.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,17 @@ export class MatStepHeader extends CdkStepHeader implements OnDestroy {
101101
optional: this.optional
102102
};
103103
}
104+
105+
_getDefaultTextForState(state: StepState): string {
106+
if (state == 'number') {
107+
return `${this.index + 1}`;
108+
}
109+
if (state == 'edit') {
110+
return 'create';
111+
}
112+
if (state == 'error') {
113+
return 'warning';
114+
}
115+
return state;
116+
}
104117
}

tools/public_api_guard/lib/stepper.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export declare class MatStepHeader extends CdkStepHeader implements OnDestroy {
2929
selected: boolean;
3030
state: StepState;
3131
constructor(_intl: MatStepperIntl, _focusMonitor: FocusMonitor, _elementRef: ElementRef<HTMLElement>, changeDetectorRef: ChangeDetectorRef);
32+
_getDefaultTextForState(state: StepState): string;
3233
_getHostElement(): HTMLElement;
3334
_getIconContext(): MatStepperIconContext;
3435
_stringLabel(): string | null;

0 commit comments

Comments
 (0)