Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

fix(chips): Move trailing icon to isolated gridcell #2097

Merged
merged 3 commits into from
Feb 16, 2020
Merged

fix(chips): Move trailing icon to isolated gridcell #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d02a9f5
fix(chips): Move trailing icon to isolated gridcell
trimox Feb 16, 2020
4d939a5
Merge branch 'master' into fix/chip-element-icon-location
trimox Feb 16, 2020
2e134fa
Merge branch 'master' into fix/chip-element-icon-location
trimox Feb 16, 2020
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
1 change: 1 addition & 0 deletions packages/chips/chip-set.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ export class MdcChipSet extends MDCComponent<MDCChipSetFoundation>

this._dropSubscriptions();
this._chipRemovalSubscription?.unsubscribe();
this._foundation?.destroy();
}

// Implemented as part of ControlValueAccessor.
Expand Down
6 changes: 5 additions & 1 deletion packages/chips/chip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ export class MdcChipCheckmark {
<mdc-chip-text *ngIf="label">{{label}}</mdc-chip-text>
<ng-content></ng-content>
</mdc-chip-primary-action>
</span>`,
</span>
<span role="gridcell" *ngIf="!!trailingIcon">
<ng-content select="mdc-chip-icon[trailing]"></ng-content>
</span>
`,
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
providers: [MdcRipple]
Expand Down