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

mmalerba · mmalerba · commit 85d7d2857e8c · 2021-03-03T11:41:17.000-08: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
@@ -175,7 +175,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);
   }
@@ -262,7 +263,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);
   }
@@ -335,7 +337,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
@@ -36,7 +36,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
@@ -111,7 +111,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-chip-set-core-styles($query: mdc-helpers.$mat-typography-styles-query);
   @include mdc-helpers.mat-using-mdc-typography($config) {
     @include mdc-chip-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
@@ -22,7 +22,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
@@ -47,7 +47,8 @@
 }
 
 @mixin option-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-text-field-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
@@ -54,7 +54,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
@@ -46,7 +46,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
@@ -50,7 +50,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
@@ -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-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
@@ -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-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
@@ -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-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
@@ -104,7 +104,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
`@@ -175,7 +175,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`@mixin typography($config-or-theme) {`
`178`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`178`	`+ $config: typography.private-typography-to-2018-config(`
	`179`	`+ theming.get-typography-config($config-or-theme));`
`179`	`180`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`180`	`181`	`@include mdc-button-without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`181`	`182`	`}`
`@@ -262,7 +263,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';`
`262`	`263`	`}`
`263`	`264`
`264`	`265`	`@mixin fab-typography($config-or-theme) {`
`265`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`266`	`+ $config: typography.private-typography-to-2018-config(`
	`267`	`+ theming.get-typography-config($config-or-theme));`
`266`	`268`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`267`	`269`	`@include mdc-fab-without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`268`	`270`	`}`
`@@ -335,7 +337,8 @@ $mat-fab-state-target: '.mdc-fab__ripple';`
`335`	`337`	`}`
`336`	`338`
`337`	`339`	`@mixin icon-button-typography($config-or-theme) {`
`338`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`340`	`+ $config: typography.private-typography-to-2018-config(`
	`341`	`+ theming.get-typography-config($config-or-theme));`
`339`	`342`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`340`	`343`	`@include mdc-icon-button-without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`341`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@mixin typography($config-or-theme) {`
`39`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`39`	`+ $config: typography.private-typography-to-2018-config(`
	`40`	`+ theming.get-typography-config($config-or-theme));`
`40`	`41`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`41`	`42`	`@include mdc-card-without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`@mixin typography($config-or-theme) {`
`114`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`114`	`+ $config: typography.private-typography-to-2018-config(`
	`115`	`+ theming.get-typography-config($config-or-theme));`
`115`	`116`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`116`	`117`	`@include mdc-checkbox-without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
`117`	`118`	`@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-chip-set-core-styles($query: mdc-helpers.$mat-typography-styles-query);`
`81`	`82`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`82`	`83`	`@include mdc-chip-without-ripple($query: mdc-helpers.$mat-typography-styles-query);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@mixin typography($config-or-theme) {`
`25`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`25`	`+ $config: typography.private-typography-to-2018-config(`
	`26`	`+ theming.get-typography-config($config-or-theme));`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`@mixin density($config-or-theme) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@mixin option-typography($config-or-theme) {`
`50`		`- $config: typography.typography-to-2018-config(theming.get-typography-config($config-or-theme));`
	`50`	`+ $config: typography.private-typography-to-2018-config(`
	`51`	`+ theming.get-typography-config($config-or-theme));`
`51`	`52`
`52`	`53`	`@include mdc-helpers.mat-using-mdc-typography($config) {`
`53`	`54`	// 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-text-field-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`