Skip to content

fix(chip,stepper): compile cleanly with "fullTemplateTypeCheck" #8889

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
Dec 13, 2017
Merged

fix(chip,stepper): compile cleanly with "fullTemplateTypeCheck" #8889

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
8 changes: 4 additions & 4 deletions src/lib/chips/chip-list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@ export class MatChipList extends _MatChipListMixinBase implements MatFormFieldCo
/** The chip input to add more chips */
protected _chipInput: MatChipInput;

/** The aria-describedby attribute on the chip list for improved a11y. */
protected _ariaDescribedby: string;

/** Id of the chip list */
protected _id: string;

Expand All @@ -156,7 +153,10 @@ export class MatChipList extends _MatChipListMixinBase implements MatFormFieldCo
/** Placeholder for the chip list. Alternatively, placeholder can be set on MatChipInput */
protected _placeholder: string;

/** Tab index for the chip list. */
/** The aria-describedby attribute on the chip list for improved a11y. */
_ariaDescribedby: string;

/** Tab index for the chip list. */
_tabIndex = 0;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/lib/stepper/step-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[class.mat-step-label-active]="active"
[class.mat-step-label-selected]="selected">
<!-- If there is a label template, use it. -->
<ng-container *ngIf="_templateLabel()" [ngTemplateOutlet]="label.template">
<ng-container *ngIf="_templateLabel()" [ngTemplateOutlet]="_templateLabel()!.template">
</ng-container>
<!-- It there is no label template, fall back to the text label. -->
<div class="mat-step-text-label" *ngIf="_stringLabel()">{{label}}</div>
Expand Down