fixup! refactor(material/theming): normalize config in all typography mixins for mdc components

mmalerba · mmalerba · commit 38c910486da2 · 2021-04-06T11:12:38.000-07:00
diff --git a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss
@@ -13,7 +13,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-menu-surface.core-styles(mdc-helpers.$mat-typography-styles-query);
 
diff --git a/src/material-experimental/mdc-button/_button-theme.scss b/src/material-experimental/mdc-button/_button-theme.scss
@@ -190,7 +190,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-button.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
   }
@@ -282,7 +283,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';
 }
 
 @mixin fab-typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-fab.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
   }
@@ -351,7 +353,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';
 }
 
 @mixin icon-button-typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-icon-button.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-card/_card-theme.scss b/src/material-experimental/mdc-card/_card-theme.scss
@@ -35,7 +35,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-card.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
 
diff --git a/src/material-experimental/mdc-checkbox/_checkbox-theme.scss b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss
@@ -109,7 +109,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-checkbox.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
     @include mdc-form-field.core-styles($query: mdc-helpers.$mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-chips/_chips-theme.scss b/src/material-experimental/mdc-chips/_chips-theme.scss
@@ -76,7 +76,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-chips.set-core-styles($query: mdc-helpers.$mat-typography-styles-query);
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-chips.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-core/option/_optgroup-theme.scss b/src/material-experimental/mdc-core/option/_optgroup-theme.scss
@@ -19,7 +19,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
 }
 
 @mixin density($config-or-theme) {
diff --git a/src/material-experimental/mdc-core/option/_option-theme.scss b/src/material-experimental/mdc-core/option/_option-theme.scss
@@ -55,7 +55,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
 
   @include mdc-helpers.mat-using-mdc-typography($config) {
     // MDC uses the `subtitle1` level for list items, but the spec shows `body1` as the correct
diff --git a/src/material-experimental/mdc-dialog/_dialog-theme.scss b/src/material-experimental/mdc-dialog/_dialog-theme.scss
@@ -11,7 +11,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-dialog.core-styles($query: mdc-helpers.$mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-form-field/_form-field-theme.scss b/src/material-experimental/mdc-form-field/_form-field-theme.scss
@@ -64,7 +64,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-textfield.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
     @include mdc-floating-label.core-styles($query: mdc-helpers.$mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-input/_input-theme.scss b/src/material-experimental/mdc-input/_input-theme.scss
@@ -8,7 +8,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {}
 }
 
diff --git a/src/material-experimental/mdc-list/_list-theme.scss b/src/material-experimental/mdc-list/_list-theme.scss
@@ -53,7 +53,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-list.deprecated-without-ripple($query: mdc-helpers.$mat-typography-styles-query);
     @include list-option-theme.private-list-option-typography-styles();
diff --git a/src/material-experimental/mdc-menu/_menu-theme.scss b/src/material-experimental/mdc-menu/_menu-theme.scss
@@ -45,7 +45,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-menu-surface.core-styles(mdc-helpers.$mat-typography-styles-query);
 
diff --git a/src/material-experimental/mdc-paginator/_paginator-theme.scss b/src/material-experimental/mdc-paginator/_paginator-theme.scss
@@ -49,7 +49,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
 
   @include mdc-helpers.mat-using-mdc-typography($config) {
     .mat-mdc-paginator {
diff --git a/src/material-experimental/mdc-radio/_radio-theme.scss b/src/material-experimental/mdc-radio/_radio-theme.scss
@@ -45,7 +45,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-radio.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
     @include mdc-form-field.core-styles($query: mdc-helpers.$mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-select/_select-theme.scss b/src/material-experimental/mdc-select/_select-theme.scss
@@ -83,7 +83,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-menu-surface.core-styles(mdc-helpers.$mat-typography-styles-query);
 
diff --git a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss
@@ -81,7 +81,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-switch.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
     @include mdc-form-field.core-styles($query: mdc-helpers.$mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-slider/_slider-theme.scss b/src/material-experimental/mdc-slider/_slider-theme.scss
@@ -25,7 +25,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     // TODO: disabled until we implement the new MDC slider.
     // @include mdc-slider-core-styles($query: $mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss b/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss
@@ -49,7 +49,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-snackbar.core-styles($query: mdc-helpers.$mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-table/_table-theme.scss b/src/material-experimental/mdc-table/_table-theme.scss
@@ -44,7 +44,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-data-table.core-styles($query: mdc-helpers.$mat-typography-styles-query);
   }
diff --git a/src/material-experimental/mdc-tabs/_tabs-theme.scss b/src/material-experimental/mdc-tabs/_tabs-theme.scss
@@ -103,7 +103,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-tab.without-ripple($query: mdc-helpers.$mat-typography-styles-query);
     @include mdc-tab-indicator.core-styles($query: mdc-helpers.$mat-typography-styles-query);
diff --git a/src/material-experimental/mdc-tooltip/_tooltip-theme.scss b/src/material-experimental/mdc-tooltip/_tooltip-theme.scss
@@ -11,7 +11,8 @@
 }
 
 @mixin typography($config-or-theme) {
-  $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));
+  $config: typography.private-typography-to-2018-config(
+      theming.get-typography-config($config-or-theme));
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include tooltip.core-styles($query: mdc-helpers.$mat-typography-styles-query);
   }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@mixin typography($config-or-theme) {`
`16`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`16`	`+ $config: typography.private-typography-to-2018-config(`
	`17`	`+ theming.get-typography-config($config-or-theme));`
`17`	`18`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`18`	`19`	`@include mdc-menu-surface.core-styles(mdc-helpers.$mat-typography-styles-query);`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`@mixin typography($config-or-theme) {`
`193`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`193`	`+ $config: typography.private-typography-to-2018-config(`
	`194`	`+ theming.get-typography-config($config-or-theme));`
`194`	`195`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`195`	`196`	`@include mdc-button.without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`196`	`197`	`}`
`@@ -282,7 +283,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';`
`282`	`283`	`}`
`283`	`284`
`284`	`285`	`@mixin fab-typography($config-or-theme) {`
`285`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`286`	`+ $config: typography.private-typography-to-2018-config(`
	`287`	`+ theming.get-typography-config($config-or-theme));`
`286`	`288`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`287`	`289`	`@include mdc-fab.without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`288`	`290`	`}`
`@@ -351,7 +353,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';`
`351`	`353`	`}`
`352`	`354`
`353`	`355`	`@mixin icon-button-typography($config-or-theme) {`
`354`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`356`	`+ $config: typography.private-typography-to-2018-config(`
	`357`	`+ theming.get-typography-config($config-or-theme));`
`355`	`358`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`356`	`359`	`@include mdc-icon-button.without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`357`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@mixin typography($config-or-theme) {`
`38`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`38`	`+ $config: typography.private-typography-to-2018-config(`
	`39`	`+ theming.get-typography-config($config-or-theme));`
`39`	`40`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`40`	`41`	`@include mdc-card.without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@mixin typography($config-or-theme) {`
`112`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`112`	`+ $config: typography.private-typography-to-2018-config(`
	`113`	`+ theming.get-typography-config($config-or-theme));`
`113`	`114`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`114`	`115`	`@include mdc-checkbox.without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`115`	`116`	`@include mdc-form-field.core-styles($query: mdc-helpers.$mat-typography-styles-query);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@mixin typography($config-or-theme) {`
`79`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`79`	`+ $config: typography.private-typography-to-2018-config(`
	`80`	`+ theming.get-typography-config($config-or-theme));`
`80`	`81`	`@include mdc-chips.set-core-styles($query: mdc-helpers.$mat-typography-styles-query);`
`81`	`82`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`82`	`83`	`@include mdc-chips.without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@mixin typography($config-or-theme) {`
`22`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`22`	`+ $config: typography.private-typography-to-2018-config(`
	`23`	`+ theming.get-typography-config($config-or-theme));`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`@mixin density($config-or-theme) {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@mixin typography($config-or-theme) {`
`58`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`58`	`+ $config: typography.private-typography-to-2018-config(`
	`59`	`+ theming.get-typography-config($config-or-theme));`
`59`	`60`
`60`	`61`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`61`	`62`	// MDC uses the `subtitle1` level for list items, but the spec shows `body1` as the correct
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`@mixin typography($config-or-theme) {`
`14`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`14`	`+ $config: typography.private-typography-to-2018-config(`
	`15`	`+ theming.get-typography-config($config-or-theme));`
`15`	`16`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`16`	`17`	`@include mdc-dialog.core-styles($query: mdc-helpers.$mat-typography-styles-query);`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@mixin typography($config-or-theme) {`
`67`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`67`	`+ $config: typography.private-typography-to-2018-config(`
	`68`	`+ theming.get-typography-config($config-or-theme));`
`68`	`69`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`69`	`70`	`@include mdc-textfield.without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`70`	`71`	`@include mdc-floating-label.core-styles($query: mdc-helpers.$mat-typography-styles-query);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`@mixin typography($config-or-theme) {`
`11`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`11`	`+ $config: typography.private-typography-to-2018-config(`
	`12`	`+ theming.get-typography-config($config-or-theme));`
`12`	`13`	`@include mdc-helpers.mat-using-mdc-typography($config) {}`
`13`	`14`	`}`
`14`	`15`