Skip to content

Commit

Permalink
fix(material-experimental/mdc-chips): set correct ripple opacity for … (
Browse files Browse the repository at this point in the history
#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)
  • Loading branch information
annieyw authored and andrewseguin committed Jan 25, 2021
1 parent 4dfb650 commit cf30c44
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions src/material-experimental/mdc-chips/_chips-theme.scss
Expand Up @@ -2,6 +2,17 @@
@import '../mdc-helpers/mdc-helpers';
@import '@material/theme/functions.import';

@mixin _selected-color($color) {
@include mdc-chip-fill-color($color, $query: $mat-theme-styles-query);
@include mdc-chip-ink-color(text-primary-on-dark, $query: $mat-theme-styles-query);
@include mdc-chip-selected-ink-color-without-ripple_(
text-primary-on-dark,
$query: $mat-theme-styles-query
);
@include mdc-chip-leading-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
@include mdc-chip-trailing-icon-color(text-primary-on-dark, $query: $mat-theme-styles-query);
}

@mixin mat-mdc-chips-color($config-or-theme) {
$config: mat-get-color-config($config-or-theme);
$primary: mat-color(map-get($config, primary));
Expand Down Expand Up @@ -29,21 +40,24 @@
@include mdc-chip-fill-color-accessible($unselected-background,
$query: $mat-theme-styles-query);

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

&.mat-accent {
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
@include mdc-chip-fill-color-accessible($accent, $query: $mat-theme-styles-query);
@include _selected-color($accent);
}
}

&.mat-warn {
&.mdc-chip--selected, &.mat-mdc-chip-highlighted {
@include mdc-chip-fill-color-accessible($warn, $query: $mat-theme-styles-query);
@include _selected-color($warn);
}
}
}
Expand Down

0 comments on commit cf30c44

Please sign in to comment.