fix up styling

Author: adolgachev

src/material/chips/chip-row.ts

@@ -41,16 +41,16 @@ 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-leading-action]': '!!editIcon',
+    '[class.mdc-evolution-chip--with-leading-action]': '_hasLeadingActionIcon()',
     '[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',
@@ -108,6 +108,16 @@ export class MatChipRow extends MatChip implements AfterViewInit {
     });
   }
 
+  protected _hasLeadingActionIcon() {
+    // The leading action (edit) icon is hidden while editing.
+    return !this._isEditing && !!this.editIcon;
+  }
+
+  protected _hasLeadingIcon() {
+    // The leading icon is hidden while editing.
+    return !this._isEditing && !!this.leadingIcon;
+  }
+
   override _hasTrailingIcon() {
     // The trailing icon is hidden while editing.
     return !this._isEditing && super._hasTrailingIcon();

src/material/chips/chip.scss

@@ -136,8 +136,14 @@ $fallbacks: m3-chip.get-tokens(m3-system.$theme-with-system-vars);
 
   // Moved out into variables, because the selectors are too long.
   $with-graphic: '.mdc-evolution-chip--with-primary-graphic';
+  $with-leading: '.mdc-evolution-chip--with-leading-action';
   $with-trailing: '.mdc-evolution-chip--with-trailing-action';
 
+  .mat-mdc-standard-chip#{$with-leading} & {
+    padding-left: 0;
+    padding-right: $_action-padding;
+  }
+
   .mat-mdc-standard-chip#{$with-trailing} & {
     padding-left: $_action-padding;
     padding-right: 0;
@@ -148,6 +154,11 @@ $fallbacks: m3-chip.get-tokens(m3-system.$theme-with-system-vars);
     padding-right: $_action-padding;
   }
 
+  .mat-mdc-standard-chip#{$with-leading}#{$with-trailing} & {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
   .mat-mdc-standard-chip#{$with-graphic}#{$with-trailing} & {
     padding-left: 0;
     padding-right: 0;
@@ -207,7 +218,6 @@ $fallbacks: m3-chip.get-tokens(m3-system.$theme-with-system-vars);
     padding-right: $_trailing-action-padding;
   }
 
-
   .mdc-evolution-chip--with-avatar#{$with-graphic}#{$with-trailing} & {
     padding-left: $_avatar-trailing-padding;
     padding-right: $_avatar-trailing-padding;
@@ -306,15 +316,14 @@ $fallbacks: m3-chip.get-tokens(m3-system.$theme-with-system-vars);
     padding-right: $_avatar-trailing-padding;
   }
 
-  .mdc-evolution-chip--with-avatar#{$with-graphic}#{$with-leading} & {
-    padding-left: 0;
-    padding-right: $_avatar-trailing-padding;
-  }
-
   [dir='rtl'] .mdc-evolution-chip--with-avatar#{$with-graphic}#{$with-trailing} & {
     padding-left: $_avatar-trailing-padding;
     padding-right: $_avatar-leading-padding;
   }
+
+  .mdc-evolution-chip--with-avatar#{$with-graphic}#{$with-leading} & {
+    padding-left: 0;
+  }
 }
 
 .mdc-evolution-chip__checkmark {