Skip to content

Commit 6ec4a81

Browse files
committed
fix(material-experimental/mdc-chips): extract styles into mixin
1 parent 262dc2a commit 6ec4a81

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

src/material-experimental/mdc-chips/_chips-theme.scss

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
@import '../mdc-helpers/mdc-helpers';
33
@import '@material/theme/functions.import';
44

5+
@mixin _selected-color($color) {
6+
@include mdc-chip-fill-color($color, $query: $mat-theme-styles-query);
7+
@include mdc-chip-ink-color(text-primary-on-dark, $query: $mat-theme-styles-query);
8+
@include mdc-chip-selected-ink-color-without-ripple_(text-primary-on-dark, $query: $mat-theme-styles-query);
9+
@include mdc-chip-leading-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
10+
@include mdc-chip-trailing-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
11+
}
12+
513
@mixin mat-mdc-chips-color($config-or-theme) {
614
$config: mat-get-color-config($config-or-theme);
715
$primary: mat-color(map-get($config, primary));
@@ -34,31 +42,19 @@
3442
// Include the same mixins but use mdc-chip-selected-ink-color-without-ripple
3543
&.mat-primary {
3644
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
37-
@include mdc-chip-fill-color($primary, $query: $mat-theme-styles-query);
38-
@include mdc-chip-ink-color(text-primary-on-dark, $query: $mat-theme-styles-query);
39-
@include mdc-chip-selected-ink-color-without-ripple_(text-primary-on-dark, $query: $mat-theme-styles-query);
40-
@include mdc-chip-leading-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
41-
@include mdc-chip-trailing-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
45+
@include _selected-color($primary);
4246
}
4347
}
4448

4549
&.mat-accent {
4650
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
47-
@include mdc-chip-fill-color($accent, $query: $mat-theme-styles-query);
48-
@include mdc-chip-ink-color(text-primary-on-dark, $query: $mat-theme-styles-query);
49-
@include mdc-chip-selected-ink-color-without-ripple_(text-primary-on-dark, $query: $mat-theme-styles-query);
50-
@include mdc-chip-leading-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
51-
@include mdc-chip-trailing-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
51+
@include _selected-color($accent);
5252
}
5353
}
5454

5555
&.mat-warn {
5656
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
57-
@include mdc-chip-fill-color($warn, $query: $mat-theme-styles-query);
58-
@include mdc-chip-ink-color(text-primary-on-dark, $query: $mat-theme-styles-query);
59-
@include mdc-chip-selected-ink-color-without-ripple_(text-primary-on-dark, $query: $mat-theme-styles-query);
60-
@include mdc-chip-leading-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
61-
@include mdc-chip-trailing-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
57+
@include _selected-color($warn);
6258
}
6359
}
6460
}

0 commit comments

Comments
 (0)