From 158eaa0a61b3506589690b45f19a4a8b7fb2de2c Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Mon, 6 Dec 2021 19:47:35 +0000
Subject: [PATCH] feat(material-experimental/mdc-core): add missing color,
 density, typography mixins

---
 src/material-experimental/_index.scss         |  3 +-
 .../mdc-core/_core-theme.scss                 | 61 ++++++++++++++-----
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/material-experimental/_index.scss b/src/material-experimental/_index.scss
index 3fe2fc770fed..c7571ca82471 100644
--- a/src/material-experimental/_index.scss
+++ b/src/material-experimental/_index.scss
@@ -16,7 +16,8 @@
   popover-edit-typography, popover-edit-density, popover-edit-theme;
 
 // MDC-related themes
-@forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme;
+@forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
+  mdc-core-density, mdc-core-typography;
 @forward './mdc-helpers/focus-indicators-theme' as mdc-strong-focus-indicators-* show
   mdc-strong-focus-indicators-color, mdc-strong-focus-indicators-theme;
 @forward './mdc-core/option/option-theme' as mdc-option-* show mdc-option-color,
diff --git a/src/material-experimental/mdc-core/_core-theme.scss b/src/material-experimental/mdc-core/_core-theme.scss
index 75e3bca6cdab..03c97a6f4322 100644
--- a/src/material-experimental/mdc-core/_core-theme.scss
+++ b/src/material-experimental/mdc-core/_core-theme.scss
@@ -1,8 +1,46 @@
 @use '../../material/core/theming/theming';
+@use '../../material/core/typography/typography';
 @use './option/option-theme';
 @use './option/optgroup-theme';
 @use './elevation';
 
+
+@mixin color($config-or-theme) {
+  $config: theming.get-color-config($config-or-theme);
+
+  @include option-theme.color($config);
+  @include optgroup-theme.color($config);
+
+  @if $config != null {
+    // Provides external CSS classes for each elevation value. Each CSS class is formatted as
+    // `mat-mdc-elevation-z$zValue` where `$zValue` corresponds to the z-space to which the
+    // element is elevated.
+    @for $zValue from 0 through 24 {
+      $selector: elevation.$prefix + $zValue;
+      // We need the `mat-mdc-elevation-specific`, because some MDC mixins
+      // come with elevation baked in and we don't have a way of removing it.
+      .#{$selector}, .mat-mdc-elevation-specific.#{$selector} {
+        @include elevation.private-theme-elevation($zValue, $config);
+      }
+    }
+  }
+}
+
+@mixin typography($config-or-theme) {
+  $config: typography.private-typography-to-2018-config(
+          theming.get-typography-config($config-or-theme));
+
+  @include option-theme.typography($config-or-theme);
+  @include optgroup-theme.typography($config-or-theme);
+}
+
+@mixin density($config-or-theme) {
+  $density-scale: theming.get-density-config($config-or-theme);
+
+  @include option-theme.density($density-scale);
+  @include optgroup-theme.density($density-scale);
+}
+
 // Mixin that renders all of the core styles that depend on the theme.
 @mixin theme($theme-or-color-config) {
   $theme: theming.private-legacy-get-theme($theme-or-color-config);
@@ -12,22 +50,17 @@
   // the imported themes (such as `mat-ripple-theme`) should not report again.
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-core') {
     $color: theming.get-color-config($theme);
-
-    @include option-theme.theme($theme);
-    @include optgroup-theme.theme($theme);
+    $density: theming.get-density-config($theme);
+    $typography: theming.get-typography-config($theme);
 
     @if $color != null {
-      // Provides external CSS classes for each elevation value. Each CSS class is formatted as
-      // `mat-mdc-elevation-z$zValue` where `$zValue` corresponds to the z-space to which the
-      // element is elevated.
-      @for $zValue from 0 through 24 {
-        $selector: elevation.$prefix + $zValue;
-        // We need the `mat-mdc-elevation-specific`, because some MDC mixins
-        // come with elevation baked in and we don't have a way of removing it.
-        .#{$selector}, .mat-mdc-elevation-specific.#{$selector} {
-          @include elevation.private-theme-elevation($zValue, $color);
-        }
-      }
+      @include color($color);
+    }
+    @if $density != null {
+      @include density($density);
+    }
+    @if $typography != null {
+      @include typography($typography);
     }
   }
 }