Skip to content

Commit 8ad34b7

Browse files
committed
replace trailing with secondary
1 parent fe91543 commit 8ad34b7

File tree

5 files changed

+9
-14
lines changed

5 files changed

+9
-14
lines changed

src/material/chips/chip-action.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {_StructuralStylesLoader} from '../core';
2929
'class': 'mdc-evolution-chip__action mat-mdc-chip-action',
3030
'[class.mdc-evolution-chip__action--primary]': '_isPrimary',
3131
'[class.mdc-evolution-chip__action--presentational]': '!isInteractive',
32-
'[class.mdc-evolution-chip__action--trailing]': '!_isPrimary',
32+
'[class.mdc-evolution-chip__action--secondary]': '!_isPrimary',
3333
'[attr.tabindex]': '_getTabindex()',
3434
'[attr.disabled]': '_getDisabledAttribute()',
3535
'[attr.aria-disabled]': 'disabled',

src/material/chips/chip-grid.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ describe('MatChipGrid', () => {
264264
fixture = createComponent(ChipGridWithRemove);
265265
flush();
266266
trailingActions = chipGridNativeElement.querySelectorAll(
267-
'.mdc-evolution-chip__action--trailing',
267+
'.mdc-evolution-chip__action--secondary',
268268
);
269269
}));
270270

@@ -589,7 +589,7 @@ describe('MatChipGrid', () => {
589589
const fixture = createComponent(ChipGridWithRemove, undefined, [NoopAnimationsModule]);
590590
flush();
591591
const trailingActions = chipGridNativeElement.querySelectorAll<HTMLElement>(
592-
'.mdc-evolution-chip__action--trailing',
592+
'.mdc-evolution-chip__action--secondary',
593593
);
594594
const chip = chips.get(2)!;
595595
chip.focus();

src/material/chips/chip-row.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
}
44

55
@if (!_isEditing && editIcon) {
6-
<span class="mdc-evolution-chip__cell mdc-evolution-chip__cell--primary" role="gridcell">
6+
<span class="mdc-evolution-chip__cell mdc-evolution-chip__cell--leading" role="gridcell">
77
<ng-content select="[matChipEdit]"></ng-content>
88
</span>
99
}

src/material/chips/chip-row.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ export interface MatChipEditedEvent extends MatChipEvent {
4141
styleUrl: 'chip.css',
4242
host: {
4343
'class': 'mat-mdc-chip mat-mdc-chip-row mdc-evolution-chip',
44-
'[class.mat-mdc-chip-with-avatar]': '_hasLeadingIcon()',
44+
'[class.mat-mdc-chip-with-avatar]': 'leadingIcon',
4545
'[class.mat-mdc-chip-disabled]': 'disabled',
4646
'[class.mat-mdc-chip-editing]': '_isEditing',
4747
'[class.mat-mdc-chip-editable]': 'editable',
4848
'[class.mdc-evolution-chip--disabled]': 'disabled',
4949
'[class.mdc-evolution-chip--with-leading-action]': '!!editIcon',
5050
'[class.mdc-evolution-chip--with-trailing-action]': '_hasTrailingIcon()',
51-
'[class.mdc-evolution-chip--with-primary-graphic]': '_hasLeadingIcon()',
52-
'[class.mdc-evolution-chip--with-primary-icon]': '_hasLeadingIcon()',
53-
'[class.mdc-evolution-chip--with-avatar]': '_hasLeadingIcon()',
51+
'[class.mdc-evolution-chip--with-primary-graphic]': 'leadingIcon',
52+
'[class.mdc-evolution-chip--with-primary-icon]': 'leadingIcon',
53+
'[class.mdc-evolution-chip--with-avatar]': 'leadingIcon',
5454
'[class.mat-mdc-chip-highlighted]': 'highlighted',
5555
'[class.mat-mdc-chip-with-trailing-icon]': '_hasTrailingIcon()',
5656
'[id]': 'id',
@@ -108,11 +108,6 @@ export class MatChipRow extends MatChip implements AfterViewInit {
108108
});
109109
}
110110

111-
/** Returns whether the chip has a leading icon. */
112-
protected _hasLeadingIcon() {
113-
return !this._isEditing && !!(this.editIcon || this.leadingIcon);
114-
}
115-
116111
override _hasTrailingIcon() {
117112
// The trailing icon is hidden while editing.
118113
return !this._isEditing && super._hasTrailingIcon();

src/material/chips/chip.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ $fallbacks: m3-chip.get-tokens(m3-system.$theme-with-system-vars);
179179
}
180180
}
181181

182-
.mdc-evolution-chip__action--trailing {
182+
.mdc-evolution-chip__action--secondary {
183183
position: relative;
184184
overflow: visible;
185185

0 commit comments

Comments
 (0)