From 4c7bf31b367e68865c3e479f12f4d0da3db69636 Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Sun, 5 Apr 2020 18:42:25 +0200
Subject: [PATCH] fix(material-experimental/mdc-chips): align theming setup
 with other MDC components

Fixes the MDC-based chips not wrapping its styles in `mat-using-mdc-theme` and not overriding the MDC theme variables with our context.
---
 .../mdc-chips/_chips-theme.scss               | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/material-experimental/mdc-chips/_chips-theme.scss b/src/material-experimental/mdc-chips/_chips-theme.scss
index ddb5a5ed7bd6..d2b9da66fa4f 100644
--- a/src/material-experimental/mdc-chips/_chips-theme.scss
+++ b/src/material-experimental/mdc-chips/_chips-theme.scss
@@ -3,37 +3,55 @@
 @import '@material/theme/functions.import';
 
 @mixin mat-mdc-chips-theme($theme) {
-  @include mdc-chip-set-core-styles($query: $mat-theme-styles-query);
-  @include mdc-chip-without-ripple($query: $mat-theme-styles-query);
-
   $primary: mat-color(map-get($theme, primary));
   $accent: mat-color(map-get($theme, accent));
   $warn: mat-color(map-get($theme, warn));
   $background: map-get($theme, background);
   $unselected-background: mat-color($background, unselected-chip);
 
-  .mat-mdc-chip {
-    @include mdc-chip-fill-color-accessible($unselected-background,
-      $query: $mat-theme-styles-query);
+  // Save original values of MDC global variables. We need to save these so we can restore the
+  // variables to their original values and prevent unintended side effects from using this mixin.
+  $orig-mdc-chips-fill-color-default: $mdc-chips-fill-color-default;
+  $orig-mdc-chips-ink-color-default: $mdc-chips-ink-color-default;
+  $orig-mdc-chips-icon-color: $mdc-chips-icon-color;
+
+  @include mat-using-mdc-theme($theme) {
+    $mdc-chips-fill-color-default:
+        mix(mdc-theme-prop-value(on-surface), mdc-theme-prop-value(surface), 12%) !global;
+    $mdc-chips-ink-color-default: rgba(mdc-theme-prop-value(on-surface), 0.87) !global;
+    $mdc-chips-icon-color: mdc-theme-prop-value(on-surface) !global;
+
+    @include mdc-chip-set-core-styles($query: $mat-theme-styles-query);
+    @include mdc-chip-without-ripple($query: $mat-theme-styles-query);
+
+    .mat-mdc-chip {
+      @include mdc-chip-fill-color-accessible($unselected-background,
+        $query: $mat-theme-styles-query);
 
-    &.mat-primary {
-      &.mdc-chip--selected, &.mat-mdc-chip-highlighted {
-        @include mdc-chip-fill-color-accessible($primary, $query: $mat-theme-styles-query);
+      &.mat-primary {
+        &.mdc-chip--selected, &.mat-mdc-chip-highlighted {
+          @include mdc-chip-fill-color-accessible($primary, $query: $mat-theme-styles-query);
+        }
       }
-    }
 
-    &.mat-accent {
-      &.mdc-chip--selected, &.mat-mdc-chip-highlighted {
-        @include mdc-chip-fill-color-accessible($accent, $query: $mat-theme-styles-query);
+      &.mat-accent {
+        &.mdc-chip--selected, &.mat-mdc-chip-highlighted {
+          @include mdc-chip-fill-color-accessible($accent, $query: $mat-theme-styles-query);
+        }
       }
-    }
 
-    &.mat-warn {
-      &.mdc-chip--selected, &.mat-mdc-chip-highlighted {
-        @include mdc-chip-fill-color-accessible($warn, $query: $mat-theme-styles-query);
+      &.mat-warn {
+        &.mdc-chip--selected, &.mat-mdc-chip-highlighted {
+          @include mdc-chip-fill-color-accessible($warn, $query: $mat-theme-styles-query);
+        }
       }
     }
   }
+
+  // Restore original values of MDC global variables.
+  $mdc-chips-fill-color-default: $orig-mdc-chips-fill-color-default !global;
+  $mdc-chips-ink-color-default: $orig-mdc-chips-ink-color-default !global;
+  $mdc-chips-icon-color: $orig-mdc-chips-icon-color !global;
 }
 
 @mixin mat-mdc-chips-typography($config) {