fixup! fixup! fix(material/core): allow mixins to handle 2018 typography configs

Author: mmalerba

src/material-experimental/mdc-checkbox/_checkbox-theme.scss

@@ -83,7 +83,7 @@
 }
 
 @mixin mat-mdc-checkbox-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   @include mat-using-mdc-typography($config) {
     @include mdc-checkbox-without-ripple($query: $mat-typography-styles-query);
     @include mdc-form-field-core-styles($query: $mat-typography-styles-query);

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

@@ -56,7 +56,7 @@
 }
 
 @mixin mat-mdc-chips-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   @include mdc-chip-set-core-styles($query: $mat-typography-styles-query);
   @include mat-using-mdc-typography($config) {
     @include mdc-chip-without-ripple($query: $mat-typography-styles-query);

src/material-experimental/mdc-core/option/_optgroup-theme.scss

@@ -19,7 +19,9 @@
   }
 }
 
-@mixin mat-mdc-optgroup-typography($config-or-theme) {}
+@mixin mat-mdc-optgroup-typography($config-or-theme) {
+  $config: mat-get-typography-config($config-or-theme);
+}
 
 @mixin mat-mdc-optgroup-density($config-or-theme) {
   $density-scale: mat-get-density-config($config-or-theme);

src/material-experimental/mdc-dialog/_dialog-theme.scss

@@ -9,7 +9,7 @@
 }
 
 @mixin mat-mdc-dialog-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   @include mat-using-mdc-typography($config) {
     @include mdc-dialog-core-styles($query: $mat-typography-styles-query);
   }

src/material-experimental/mdc-input/_input-theme.scss

@@ -5,7 +5,10 @@
   @include mat-using-mdc-theme($config) {}
 }
 
-@mixin mat-mdc-input-typography($config-or-theme) {}
+@mixin mat-mdc-input-typography($config-or-theme) {
+  $config: mat-get-typography-config($config-or-theme);
+  @include mat-using-mdc-typography($config) {}
+}
 
 @mixin mat-mdc-input-density($config-or-theme) {}
 

src/material-experimental/mdc-radio/_radio-theme.scss

@@ -41,7 +41,7 @@
 }
 
 @mixin mat-mdc-radio-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   @include mat-using-mdc-typography($config) {
     @include mdc-radio-without-ripple($query: $mat-typography-styles-query);
     @include mdc-form-field-core-styles($query: $mat-typography-styles-query);

src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss

@@ -79,7 +79,7 @@
 }
 
 @mixin mat-mdc-slide-toggle-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   @include mat-using-mdc-typography($config) {
     @include mdc-switch-without-ripple($query: $mat-typography-styles-query);
     @include mdc-form-field-core-styles($query: $mat-typography-styles-query);

src/material-experimental/mdc-slider/_slider-theme.scss

@@ -22,7 +22,13 @@
   }
 }
 
-@mixin mat-mdc-slider-typography($config-or-theme) {}
+@mixin mat-mdc-slider-typography($config-or-theme) {
+  $config: mat-get-typography-config($config-or-theme);
+  @include mat-using-mdc-typography($config) {
+    // TODO: disabled until we implement the new MDC slider.
+    // @include mdc-slider-core-styles($query: $mat-typography-styles-query);
+  }
+}
 
 @mixin mat-mdc-slider-density($config-or-theme) {}
 

src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss

@@ -34,7 +34,7 @@
 }
 
 @mixin mat-mdc-snack-bar-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   @include mat-using-mdc-typography($config) {
     @include mdc-snackbar-core-styles($query: $mat-typography-styles-query);
   }

src/material-experimental/mdc-table/_table-theme.scss

@@ -43,7 +43,7 @@
 }
 
 @mixin mat-mdc-table-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   @include mat-using-mdc-typography($config) {
     @include mdc-data-table-core-styles($query: $mat-typography-styles-query);
   }

src/material-experimental/mdc-typography/_all-typography.scss

@@ -2,8 +2,7 @@
 
 @mixin angular-material-mdc-typography($config-or-theme: null) {
   $config: if(mat-private-is-theme-object($config-or-theme),
-      mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme)),
-      $config-or-theme);
+      mat-get-typography-config($config-or-theme), $config-or-theme);
 
   // If no actual color configuration has been specified, create a default one.
   @if $config == null {

src/material/checkbox/_checkbox-theme.scss

@@ -1,5 +1,4 @@
 @import '../core/theming/theming';
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 
 
@@ -97,7 +96,7 @@
 }
 
 @mixin mat-checkbox-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-checkbox {
     font-family: mat-font-family($config);
   }

src/material/chips/_chips-theme.scss

@@ -1,7 +1,6 @@
 @import '../core/style/private';
 @import '../core/theming/palette';
 @import '../core/theming/theming';
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 
 $mat-chip-remove-font-size: 18px;
@@ -88,7 +87,7 @@ $mat-chip-remove-font-size: 18px;
 }
 
 @mixin mat-chips-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-chip {
     font-size: mat-font-size($config, body-2);
     font-weight: mat-font-weight($config, body-2);

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

@@ -40,8 +40,7 @@
 // Includes all of the typographic styles.
 @mixin angular-material-typography($config-or-theme: null) {
   $config: if(mat-private-is-theme-object($config-or-theme),
-      mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme)),
-      $config-or-theme);
+      mat-get-typography-config($config-or-theme), $config-or-theme);
 
   // If no actual color configuration has been specified, create a default one.
   @if not $config {

src/material/core/typography/_typography.scss

@@ -103,8 +103,6 @@
 // Adds the base typography styles, based on a config.
 /* stylelint-disable-next-line material/theme-mixin-api */
 @mixin mat-base-typography($config, $selector: '.mat-typography') {
-  $config: mat-private-typography-normalized-config($config);
-
   .mat-h1, .mat-headline, #{$selector} h1 {
     @include mat-typography-level-to-styles($config, headline);
     margin: 0 0 16px;

src/material/dialog/_dialog-theme.scss

@@ -1,7 +1,6 @@
 @import '../core/style/private';
 @import '../core/theming/palette';
 @import '../core/theming/theming';
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 
 
@@ -18,7 +17,7 @@
 }
 
 @mixin mat-dialog-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-dialog-title {
     @include mat-typography-level-to-styles($config, title);
   }

src/material/expansion/_expansion-theme.scss

@@ -2,7 +2,6 @@
 @import '../core/theming/palette';
 @import '../core/theming/theming';
 @import '../core/style/private';
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 @import './expansion-variables';
 
@@ -60,7 +59,7 @@
 }
 
 @mixin mat-expansion-panel-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-expansion-panel-header {
     font: {
       family: mat-font-family($config, subheading-1);

src/material/radio/_radio-theme.scss

@@ -1,6 +1,5 @@
 @import '../core/theming/palette';
 @import '../core/theming/theming';
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 
 @mixin _mat-radio-color($palette) {
@@ -69,7 +68,7 @@
 }
 
 @mixin mat-radio-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-radio-button {
     font-family: mat-font-family($config);
   }

src/material/slide-toggle/_slide-toggle-theme.scss

@@ -1,7 +1,6 @@
 @import '../core/style/private';
 @import '../core/theming/palette';
 @import '../core/theming/theming';
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 
 @mixin _mat-slide-toggle-checked($palette, $thumb-checked-hue) {
@@ -74,7 +73,7 @@
 }
 
 @mixin mat-slide-toggle-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-slide-toggle-content {
     font-family: mat-font-family($config);
   }

src/material/snack-bar/_snack-bar-theme.scss

@@ -1,4 +1,3 @@
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 @import '../core/theming/theming';
 @import '../core/theming/palette';
@@ -24,7 +23,7 @@
 }
 
 @mixin mat-snack-bar-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-simple-snackbar {
     font: {
       family: mat-font-family($config, body-1);

src/material/table/_table-theme.scss

@@ -1,6 +1,5 @@
 @import '../core/theming/palette';
 @import '../core/theming/theming';
-@import '../core/typography/typography';
 @import '../core/typography/typography-utils';
 
 @mixin mat-table-color($config-or-theme) {
@@ -34,7 +33,7 @@
 }
 
 @mixin mat-table-typography($config-or-theme) {
-  $config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
+  $config: mat-get-typography-config($config-or-theme);
   .mat-table {
     font-family: mat-font-family($config);
   }