From 4f3ac9dee90b7576d85be70d247efdbe2908516d Mon Sep 17 00:00:00 2001
From: Dominic Carretto <trimox@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:58:18 -0500
Subject: [PATCH] fix(chips): Move trailing icon to isolated gridcell (#2097)

closes #2096
---
 packages/chips/chip-set.ts | 1 +
 packages/chips/chip.ts     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/chips/chip-set.ts b/packages/chips/chip-set.ts
index 5cccfa551..21c817dfc 100644
--- a/packages/chips/chip-set.ts
+++ b/packages/chips/chip-set.ts
@@ -216,6 +216,7 @@ export class MdcChipSet extends MDCComponent<MDCChipSetFoundation>
 
     this._dropSubscriptions();
     this._chipRemovalSubscription?.unsubscribe();
+    this._foundation?.destroy();
   }
 
   // Implemented as part of ControlValueAccessor.
diff --git a/packages/chips/chip.ts b/packages/chips/chip.ts
index 0a625a10a..6cf2fa222 100644
--- a/packages/chips/chip.ts
+++ b/packages/chips/chip.ts
@@ -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]