add edit icon to chip

Author: adolgachev

src/dev-app/chips/chips-demo.html

@@ -172,6 +172,9 @@ <h4>Input is last child of chip grid</h4>
               [editable]="editable"
               (removed)="remove(person)"
               (edited)="edit(person, $event)">
+              <button matChipEdit aria-label="Edit contributor">
+                <mat-icon>edit</mat-icon>
+              </button>
               {{person.name}}
               <button matChipRemove aria-label="Remove contributor">
                 <mat-icon>close</mat-icon>

src/material/chips/chip-icons.ts

@@ -9,7 +9,7 @@
 import {ENTER, SPACE} from '@angular/cdk/keycodes';
 import {Directive} from '@angular/core';
 import {MatChipAction} from './chip-action';
-import {MAT_CHIP_AVATAR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON} from './tokens';
+import {MAT_CHIP_AVATAR, MAT_CHIP_EDIT, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON} from './tokens';
 
 /** Avatar image within a chip. */
 @Directive({
@@ -42,6 +42,53 @@ export class MatChipTrailingIcon extends MatChipAction {
   override _isPrimary = false;
 }
 
+/**
+ * Directive to remove the parent chip when the trailing icon is clicked or
+ * when the ENTER key is pressed on it.
+ *
+ * Recommended for use with the Material Design "cancel" icon
+ * available at https://material.io/icons/#ic_cancel.
+ *
+ * Example:
+ *
+ * ```
+ * <mat-chip>
+ *   <mat-icon matChipEdit>cancel</mat-icon>
+ * </mat-chip>
+ * ```
+ */
+
+@Directive({
+  selector: '[matChipEdit]',
+  host: {
+    'class':
+      'mat-mdc-chip-edit mat-mdc-chip-avatar mat-focus-indicator ' +
+      'mdc-evolution-chip__icon mdc-evolution-chip__icon--primary',
+    'role': 'button',
+    '[attr.aria-hidden]': 'null',
+  },
+  providers: [{provide: MAT_CHIP_EDIT, useExisting: MatChipEdit}],
+})
+export class MatChipEdit extends MatChipAction {
+  override _isPrimary = false;
+
+  override _handleClick(event: MouseEvent): void {
+    if (!this.disabled) {
+      event.stopPropagation();
+      event.preventDefault();
+      // this._parentChip.remove();
+    }
+  }
+
+  override _handleKeydown(event: KeyboardEvent) {
+    if ((event.keyCode === ENTER || event.keyCode === SPACE) && !this.disabled) {
+      event.stopPropagation();
+      event.preventDefault();
+      // this._parentChip.remove();
+    }
+  }
+}
+
 /**
  * Directive to remove the parent chip when the trailing icon is clicked or
  * when the ENTER key is pressed on it.

src/material/chips/chip-row.html

@@ -2,6 +2,13 @@
   <span class="mat-mdc-chip-focus-overlay"></span>
 }
 
+@if (editIcon) {
+  <span
+    class="mdc-evolution-chip__cell mdc-evolution-chip__cell--primary"
+    role="gridcell">
+  <ng-content select="[matChipEdit]"></ng-content>
+</span>
+}
 <span class="mdc-evolution-chip__cell mdc-evolution-chip__cell--primary" role="gridcell"
     matChipAction
     [disabled]="disabled"

src/material/chips/chip-row.ts

@@ -23,7 +23,8 @@ import {takeUntil} from 'rxjs/operators';
 import {MatChip, MatChipEvent} from './chip';
 import {MatChipAction} from './chip-action';
 import {MatChipEditInput} from './chip-edit-input';
-import {MAT_CHIP} from './tokens';
+import {MatChipEdit} from './chip-icons';
+import {MAT_CHIP, MAT_CHIP_EDIT} from './tokens';
 
 /** Represents an event fired on an individual `mat-chip` when it is edited. */
 export interface MatChipEditedEvent extends MatChipEvent {
@@ -41,15 +42,15 @@ export interface MatChipEditedEvent extends MatChipEvent {
   styleUrl: 'chip.css',
   host: {
     'class': 'mat-mdc-chip mat-mdc-chip-row mdc-evolution-chip',
-    '[class.mat-mdc-chip-with-avatar]': 'leadingIcon',
+    '[class.mat-mdc-chip-with-avatar]': '_hasLeadingIcon()',
     '[class.mat-mdc-chip-disabled]': 'disabled',
     '[class.mat-mdc-chip-editing]': '_isEditing',
     '[class.mat-mdc-chip-editable]': 'editable',
     '[class.mdc-evolution-chip--disabled]': 'disabled',
     '[class.mdc-evolution-chip--with-trailing-action]': '_hasTrailingIcon()',
-    '[class.mdc-evolution-chip--with-primary-graphic]': 'leadingIcon',
-    '[class.mdc-evolution-chip--with-primary-icon]': 'leadingIcon',
-    '[class.mdc-evolution-chip--with-avatar]': 'leadingIcon',
+    '[class.mdc-evolution-chip--with-primary-graphic]': '_hasLeadingIcon()',
+    '[class.mdc-evolution-chip--with-primary-icon]': '_hasLeadingIcon()',
+    '[class.mdc-evolution-chip--with-avatar]': '_hasLeadingIcon()',
     '[class.mat-mdc-chip-highlighted]': 'highlighted',
     '[class.mat-mdc-chip-with-trailing-icon]': '_hasTrailingIcon()',
     '[id]': 'id',
@@ -89,6 +90,9 @@ export class MatChipRow extends MatChip implements AfterViewInit {
   /** The default chip edit input that is used if none is projected into this chip row. */
   @ViewChild(MatChipEditInput) defaultEditInput?: MatChipEditInput;
 
+  /** The chip's leading edit icon. */
+  @ContentChild(MAT_CHIP_EDIT) editIcon: MatChipEdit;
+
   /** The projected chip edit input. */
   @ContentChild(MatChipEditInput) contentEditInput?: MatChipEditInput;
 
@@ -107,6 +111,11 @@ export class MatChipRow extends MatChip implements AfterViewInit {
     });
   }
 
+  /** Returns whether the chip has a leading icon. */
+  _hasLeadingIcon() {
+    return !!(this.editIcon || this.leadingIcon);
+  }
+
   override _hasTrailingIcon() {
     // The trailing icon is hidden while editing.
     return !this._isEditing && super._hasTrailingIcon();

src/material/chips/chip.ts

@@ -44,8 +44,14 @@ import {
 } from '../core';
 import {Subject, Subscription, merge} from 'rxjs';
 import {MatChipAction} from './chip-action';
-import {MatChipAvatar, MatChipRemove, MatChipTrailingIcon} from './chip-icons';
-import {MAT_CHIP, MAT_CHIP_AVATAR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON} from './tokens';
+import {MatChipAvatar, MatChipEdit, MatChipRemove, MatChipTrailingIcon} from './chip-icons';
+import {
+  MAT_CHIP,
+  MAT_CHIP_AVATAR,
+  MAT_CHIP_EDIT,
+  MAT_CHIP_REMOVE,
+  MAT_CHIP_TRAILING_ICON,
+} from './tokens';
 
 /** Represents an event fired on an individual `mat-chip`. */
 export interface MatChipEvent {
@@ -133,6 +139,10 @@ export class MatChip implements OnInit, AfterViewInit, AfterContentInit, DoCheck
   @ContentChildren(MAT_CHIP_TRAILING_ICON, {descendants: true})
   protected _allTrailingIcons: QueryList<MatChipTrailingIcon>;
 
+  /** All edit icons present in the chip. */
+  @ContentChildren(MAT_CHIP_EDIT, {descendants: true})
+  protected _allEditIcons: QueryList<MatChipEdit>;
+
   /** All remove icons present in the chip. */
   @ContentChildren(MAT_CHIP_REMOVE, {descendants: true})
   protected _allRemoveIcons: QueryList<MatChipRemove>;
@@ -279,6 +289,7 @@ export class MatChip implements OnInit, AfterViewInit, AfterContentInit, DoCheck
     this._actionChanges = merge(
       this._allLeadingIcons.changes,
       this._allTrailingIcons.changes,
+      this._allEditIcons.changes,
       this._allRemoveIcons.changes,
     ).subscribe(() => this._changeDetectorRef.markForCheck());
   }

src/material/chips/module.ts

@@ -13,7 +13,7 @@ import {MatChip} from './chip';
 import {MAT_CHIPS_DEFAULT_OPTIONS, MatChipsDefaultOptions} from './tokens';
 import {MatChipEditInput} from './chip-edit-input';
 import {MatChipGrid} from './chip-grid';
-import {MatChipAvatar, MatChipRemove, MatChipTrailingIcon} from './chip-icons';
+import {MatChipAvatar, MatChipEdit, MatChipRemove, MatChipTrailingIcon} from './chip-icons';
 import {MatChipInput} from './chip-input';
 import {MatChipListbox} from './chip-listbox';
 import {MatChipRow} from './chip-row';
@@ -24,6 +24,7 @@ import {MatChipAction} from './chip-action';
 const CHIP_DECLARATIONS = [
   MatChip,
   MatChipAvatar,
+  MatChipEdit,
   MatChipEditInput,
   MatChipGrid,
   MatChipInput,

src/material/chips/tokens.ts

@@ -46,6 +46,13 @@ export const MAT_CHIP_AVATAR = new InjectionToken('MatChipAvatar');
  */
 export const MAT_CHIP_TRAILING_ICON = new InjectionToken('MatChipTrailingIcon');
 
+/**
+ * Injection token that can be used to reference instances of `MatChipEdit`. It serves as
+ * alternative token to the actual `MatChipEdit` class which could cause unnecessary
+ * retention of the class and its directive metadata.
+ */
+export const MAT_CHIP_EDIT = new InjectionToken('MatChipEdit');
+
 /**
  * Injection token that can be used to reference instances of `MatChipRemove`. It serves as
  * alternative token to the actual `MatChipRemove` class which could cause unnecessary