Skip to content

Commit cf30c44

Browse files
annieywandrewseguin
authored andcommitted
fix(material-experimental/mdc-chips): set correct ripple opacity for … (#21624)
* fix(material-experimental/mdc-chips): set correct ripple opacity for focus states * fix(material-experimental/mdc-chips): extract styles into mixin (cherry picked from commit 277ad5b)
1 parent 4dfb650 commit cf30c44

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

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

Lines changed: 17 additions & 3 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,21 +40,24 @@
2940
@include mdc-chip-fill-color-accessible($unselected-background,
3041
$query: $mat-theme-styles-query);
3142

43+
// mdc-chip-fill-color-accessible includes mdc-chip-selected-ink-color which overrides the
44+
// opacity so selected chips always show a ripple.
45+
// Include the same mixins but use mdc-chip-selected-ink-color-without-ripple
3246
&.mat-primary {
3347
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
34-
@include mdc-chip-fill-color-accessible($primary, $query: $mat-theme-styles-query);
48+
@include _selected-color($primary);
3549
}
3650
}
3751

3852
&.mat-accent {
3953
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
40-
@include mdc-chip-fill-color-accessible($accent, $query: $mat-theme-styles-query);
54+
@include _selected-color($accent);
4155
}
4256
}
4357

4458
&.mat-warn {
4559
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
46-
@include mdc-chip-fill-color-accessible($warn, $query: $mat-theme-styles-query);
60+
@include _selected-color($warn);
4761
}
4862
}
4963
}

0 commit comments

Comments
 (0)