Skip to content

Commit 1bbb27f

Browse files
committed
Changes to address aot compiler failures
1 parent cd6ba68 commit 1bbb27f

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

src/demo-app/stepper/stepper-demo.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h3>Linear Vertical Stepper Demo using a single form</h3>
44
<form [formGroup]="formGroup">
55
<md-vertical-stepper formArrayName="formArray" [linear]="!isNonLinear">
6-
<md-step formGroupName="0" [stepControl]="formArray.get([0])">
6+
<md-step formGroupName="0" [stepControl]="formArray?.get([0])">
77
<ng-template mdStepLabel>Fill out your name</ng-template>
88
<md-input-container>
99
<input mdInput placeholder="First Name" formControlName="firstNameFormCtrl" required>
@@ -19,7 +19,7 @@ <h3>Linear Vertical Stepper Demo using a single form</h3>
1919
</div>
2020
</md-step>
2121

22-
<md-step formGroupName="1" [stepControl]="formArray.get([1])" optional>
22+
<md-step formGroupName="1" [stepControl]="formArray?.get([1])" optional>
2323
<ng-template mdStepLabel>
2424
<div>Fill out your email address</div>
2525
</ng-template>

src/lib/stepper/step-label.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
import {Directive, TemplateRef} from '@angular/core';
1010
import {CdkStepLabel} from '@angular/cdk/stepper';
1111

12+
/** Workaround for https://github.com/angular/angular/issues/17849 */
13+
export const _MdStepLabel = CdkStepLabel;
14+
1215
@Directive({
1316
selector: '[mdStepLabel], [matStepLabel]',
1417
})
15-
export class MdStepLabel extends CdkStepLabel {
18+
export class MdStepLabel extends _MdStepLabel {
1619
constructor(template: TemplateRef<any>) {
1720
super(template);
1821
}

src/lib/stepper/stepper-button.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@ import {Directive} from '@angular/core';
1010
import {CdkStepper, CdkStepperNext, CdkStepperPrevious} from '@angular/cdk/stepper';
1111
import {MdStepper} from './stepper';
1212

13+
/** Workaround for https://github.com/angular/angular/issues/17849 */
14+
export const _MdStepperNext = CdkStepperNext;
15+
export const _MdStepperPrevious = CdkStepperPrevious;
16+
1317
/** Button that moves to the next step in a stepper workflow. */
1418
@Directive({
1519
selector: 'button[mdStepperNext], button[matStepperNext]',
1620
host: {'(click)': '_stepper.next()'},
1721
providers: [{provide: CdkStepper, useExisting: MdStepper}]
1822
})
19-
export class MdStepperNext extends CdkStepperNext { }
23+
export class MdStepperNext extends _MdStepperNext { }
2024

2125
/** Button that moves to the previous step in a stepper workflow. */
2226
@Directive({
2327
selector: 'button[mdStepperPrevious], button[matStepperPrevious]',
2428
host: {'(click)': '_stepper.previous()'},
2529
providers: [{provide: CdkStepper, useExisting: MdStepper}]
2630
})
27-
export class MdStepperPrevious extends CdkStepperPrevious { }
31+
export class MdStepperPrevious extends _MdStepperPrevious { }

src/lib/stepper/stepper.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,18 @@ import {
3232
import {FormControl, FormGroupDirective, NgForm} from '@angular/forms';
3333
import {MdStepHeader} from './step-header';
3434

35+
/** Workaround for https://github.com/angular/angular/issues/17849 */
36+
export const _MdStep = CdkStep;
37+
export const _MdStepper = CdkStepper;
38+
3539
@Component({
3640
moduleId: module.id,
3741
selector: 'md-step, mat-step',
3842
templateUrl: 'step.html',
3943
providers: [{provide: MD_ERROR_GLOBAL_OPTIONS, useExisting: MdStep}],
4044
encapsulation: ViewEncapsulation.None
4145
})
42-
export class MdStep extends CdkStep implements ErrorOptions {
46+
export class MdStep extends _MdStep implements ErrorOptions {
4347
/** Content for step label given by <ng-template matStepLabel> or <ng-template mdStepLabel>. */
4448
@ContentChild(MdStepLabel) stepLabel: MdStepLabel;
4549

@@ -70,7 +74,7 @@ export class MdStep extends CdkStep implements ErrorOptions {
7074
@Directive({
7175
selector: '[mdStepper]'
7276
})
73-
export class MdStepper extends CdkStepper implements ErrorOptions {
77+
export class MdStepper extends _MdStepper implements ErrorOptions {
7478
/** The list of step headers of the steps in the stepper. */
7579
@ViewChildren(MdStepHeader, {read: ElementRef}) _stepHeader: QueryList<ElementRef>;
7680

0 commit comments

Comments
 (0)