Skip to content

Commit f2460a6

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

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
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_(
9+
text-primary-on-dark,
10+
$query: $mat-theme-styles-query
11+
);
12+
@include mdc-chip-leading-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
13+
@include mdc-chip-trailing-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
14+
}
15+
516
@mixin mat-mdc-chips-color($config-or-theme) {
617
$config: mat-get-color-config($config-or-theme);
718
$primary: mat-color(map-get($config, primary));
@@ -29,36 +40,24 @@
2940
@include mdc-chip-fill-color-accessible($unselected-background,
3041
$query: $mat-theme-styles-query);
3142

32-
// mdc-chip-fill-color-accessible includes mdc-chip-selected-ink-color which overrides the opacity
33-
// so selected chips always show a ripple.
43+
// mdc-chip-fill-color-accessible includes mdc-chip-selected-ink-color which overrides the
44+
// opacity so selected chips always show a ripple.
3445
// Include the same mixins but use mdc-chip-selected-ink-color-without-ripple
3546
&.mat-primary {
3647
&.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);
48+
@include _selected-color($primary);
4249
}
4350
}
4451

4552
&.mat-accent {
4653
&.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);
54+
@include _selected-color($accent);
5255
}
5356
}
5457

5558
&.mat-warn {
5659
&.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);
60+
@include _selected-color($warn);
6261
}
6362
}
6463
}

0 commit comments

Comments
 (0)