undo rearranging core theme mixins, since it broke some things

Author: mmalerba

src/material-experimental/mdc-core/_core-theme.scss

@@ -5,14 +5,40 @@
 }
 
 @mixin typography($config-or-theme) {
-  @include mat.core-typography($config-or-theme);
+  $config: mat.private-typography-to-2018-config(
+          mat.get-typography-config($config-or-theme));
+
+  @include mat.option-typography($config-or-theme);
+  @include mat.optgroup-typography($config-or-theme);
 }
 
 @mixin density($config-or-theme) {
-  @include mat.core-density($config-or-theme);
+  $density-scale: mat.get-density-config($config-or-theme);
+
+  @include mat.private-option-density($density-scale);
+  @include mat.private-optgroup-density($density-scale);
 }
 
 // Mixin that renders all of the core styles that depend on the theme.
 @mixin theme($theme-or-color-config) {
-  @include mat.core-theme($theme-or-color-config);
+  $theme: mat.private-legacy-get-theme($theme-or-color-config);
+
+  // Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that
+  // there won't be multiple warnings. e.g. if `mat-mdc-core-theme` reports a warning, then
+  // the imported themes (such as `mat-ripple-theme`) should not report again.
+  @include mat.private-check-duplicate-theme-styles($theme, 'mat-mdc-core') {
+    $color: mat.get-color-config($theme);
+    $density: mat.get-density-config($theme);
+    $typography: mat.get-typography-config($theme);
+
+    @if $color != null {
+      @include color($color);
+    }
+    @if $density != null {
+      @include density($density);
+    }
+    @if $typography != null {
+      @include typography($typography);
+    }
+  }
 }

src/material/_index.scss

@@ -59,7 +59,7 @@
 @forward './legacy-core/typography/all-typography' show all-legacy-component-typographies;
 
 // Component themes
-@forward './core/core-theme' as core-* show core-color, core-theme, core-typography, core-density;
+@forward './core/core-theme' as core-* show core-color, core-theme;
 @forward './legacy-core/core-theme' as legacy-core-* show legacy-core-color, legacy-core-theme;
 @forward './core/ripple/ripple-theme' as ripple-* show ripple-color, ripple-theme;
 @forward './legacy-core/option/option-theme' as legacy-option-* show legacy-option-color,

src/material/core/_core-theme.scss

@@ -6,16 +6,10 @@
 @use './option/optgroup-theme';
 @use './selection/pseudo-checkbox/pseudo-checkbox-theme';
 @use './style/elevation';
-@use './typography/typography';
 
 @mixin color($config-or-theme) {
   $config: theming.get-color-config($config-or-theme);
 
-  @include ripple-theme.color($config);
-  @include option-theme.color($config);
-  @include optgroup-theme.color($config);
-  @include pseudo-checkbox-theme.color($config);
-
   // Wrapper element that provides the theme background when the user's content isn't
   // inside of a `mat-sidenav-container`. Note that we need to exclude the ampersand
   // selector in case the mixin is included at the top level.
@@ -47,46 +41,22 @@
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-          theming.get-typography-config($config-or-theme));
-
-  @include option-theme.typography($config);
-  @include optgroup-theme.typography($config);
-  @include pseudo-checkbox-theme.typography($config);
-  // TODO(mmalerba): add typography mixin for this.
-  // @include ripple-theme.typography($config);
-}
-
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-color-config($config-or-theme);
-
-  @include option-theme.density($density-scale);
-  @include optgroup-theme.density($density-scale);
-  // TODO(mmalerba): add density mixins for these.
-  // @include ripple-theme.density($density-scale);
-  // @include pseudo-checkbox-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);
   // Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that
   // there won't be multiple warnings. e.g. if `mat-core-theme` reports a warning, then
   // the imported themes (such as `mat-ripple-theme`) should not report again.
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-core') {
+    @include ripple-theme.theme($theme);
+    @include option-theme.theme($theme);
+    @include optgroup-theme.theme($theme);
+    @include pseudo-checkbox-theme.theme($theme);
+
     $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
 
     @if $color != null {
       @include color($color);
     }
-    @if $density != null {
-      @include density($density);
-    }
-    @if $typography != null {
-      @include typography($typography);
-    }
   }
 }

src/material/core/density/private/_all-density.scss

@@ -15,7 +15,8 @@
 @use '../../../input/input-theme';
 @use '../../../autocomplete/autocomplete-theme';
 @use '../../../checkbox/checkbox-theme';
-@use '../../../core/core-theme';
+@use '../../../core/option/option-theme';
+@use '../../../core/option/optgroup-theme';
 @use '../../../select/select-theme';
 @use '../../../dialog/dialog-theme';
 @use '../../../chips/chips-theme';
@@ -57,7 +58,8 @@
   @include progress-bar-theme.density($config);
   @include tooltip-theme.density($config);
   @include input-theme.density($config);
-  @include core-theme.density($config);
+  @include option-theme.density($config);
+  @include optgroup-theme.density($config);
   @include select-theme.density($config);
   @include checkbox-theme.density($config);
   @include autocomplete-theme.density($config);

src/material/core/theming/_all-theme.scss

@@ -1,5 +1,7 @@
 // Import all the theming functionality.
 @use '../core-theme';
+@use '../option/optgroup-theme';
+@use '../option/option-theme';
 @use '../../autocomplete/autocomplete-theme';
 @use '../../badge/badge-theme';
 @use '../../bottom-sheet/bottom-sheet-theme';
@@ -76,6 +78,8 @@
     @include list-theme.theme($theme-or-color-config);
     @include paginator-theme.theme($theme-or-color-config);
     @include tabs-theme.theme($theme-or-color-config);
+    @include optgroup-theme.theme($theme-or-color-config);
+    @include option-theme.theme($theme-or-color-config);
     @include checkbox-theme.theme($theme-or-color-config);
     @include button-theme.theme($theme-or-color-config);
     @include icon-button-theme.theme($theme-or-color-config);

src/material/core/typography/_all-typography.scss

@@ -33,10 +33,11 @@
 @use '../../toolbar/toolbar-theme';
 @use '../../tooltip/tooltip-theme';
 @use '../../snack-bar/snack-bar-theme';
+@use '../option/option-theme';
+@use '../option/optgroup-theme';
 @use '../../form-field/form-field-theme';
 @use '../../tree/tree-theme';
 @use '../theming/theming';
-@use '../core-theme';
 
 @mixin private-all-unmigrated-component-typographies($config) {
   @include badge-theme.typography($config);
@@ -73,9 +74,10 @@
   // mixin that is transitively loaded by the `all-theme` file, imports `all-typography` which
   // would then load `all-theme` again. This ultimately results a circular dependency.
   @include private-all-unmigrated-component-typographies($config);
-  @include core-theme.typography($config);
   @include card-theme.typography($config);
   @include progress-bar-theme.typography($config);
+  @include option-theme.typography($config);
+  @include optgroup-theme.typography($config);
   @include tooltip-theme.typography($config);
   @include form-field-theme.typography($config);
   @include input-theme.typography($config);

src/material/legacy-core/_core-theme.scss

@@ -1,42 +1,13 @@
-@use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/core-theme';
 @use '../core/ripple/ripple-theme';
 @use '../core/selection/pseudo-checkbox/pseudo-checkbox-theme';
 @use './option/option-theme';
 @use './option/optgroup-theme';
-@use '../core/style/elevation';
-@use '../core/style/private';
 
 @mixin color($config-or-theme) {
   $config: theming.get-color-config($config-or-theme);
-
-  // Wrapper element that provides the theme background when the user's content isn't
-  // inside of a `mat-sidenav-container`. Note that we need to exclude the ampersand
-  // selector in case the mixin is included at the top level.
-  .mat-app-background#{if(&, ', &.mat-app-background', '')} {
-    $background: map.get($config, background);
-    $foreground: map.get($config, foreground);
-
-    background-color: theming.get-color-from-palette($background, background);
-    color: theming.get-color-from-palette($foreground, text);
-  }
-
-  // Provides external CSS classes for each elevation value. Each CSS class is formatted as
-  // `mat-elevation-z$zValue` where `$zValue` corresponds to the z-space to which the element is
-  // elevated.
-  @for $zValue from 0 through 24 {
-    .#{elevation.$prefix}#{$zValue} {
-      @include private.private-theme-elevation($zValue, $config);
-    }
-  }
-
-  // Marker that is used to determine whether the user has added a theme to their page.
-  @at-root {
-    .mat-theme-loaded-marker {
-      display: none;
-    }
-  }
+  @include core-theme.color($config-or-theme);
 }
 
 // Mixin that renders all of the core styles that depend on the theme.