chore(sass): remove typography resolvers

PiperOrigin-RevId: 518054505
material-components · Mar 20, 2023 · 789d23b · 789d23b
1 parent 715c592
commit 789d23b
Show file tree

Hide file tree

Showing 40 changed files with 350 additions and 201 deletions.
diff --git a/badge/lib/_badge.scss b/badge/lib/_badge.scss
@@ -8,24 +8,20 @@
 
 // go/keep-sorted start
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 // go/keep-sorted end
 
 $_custom-property-prefix: 'badge';
 
 @mixin theme($tokens) {
-  $tokens: theme.validate-theme(
-    _resolve-tokens(tokens.md-comp-badge-values()),
-    _resolve-tokens($tokens)
-  );
+  $tokens: theme.validate-theme(tokens.md-comp-badge-values(), $tokens);
   $tokens: theme.create-theme-vars($tokens, $_custom-property-prefix);
 
   @include theme.emit-theme-vars($tokens);
 }
 
 @mixin styles() {
-  $tokens: _resolve-tokens(tokens.md-comp-badge-values());
+  $tokens: tokens.md-comp-badge-values();
   $tokens: theme.create-theme-vars($tokens, $_custom-property-prefix);
 
   :host {
@@ -71,7 +67,3 @@ $_custom-property-prefix: 'badge';
     font: var(--_large-label-text-type);
   }
 }
-
-@function _resolve-tokens($tokens) {
-  @return typography.resolve-tokens($tokens, 'large-label-text');
-}
diff --git a/button/lib/_elevated-button.scss b/button/lib/_elevated-button.scss
@@ -9,7 +9,6 @@
 // go/keep-sorted start
 @use '../../sass/shape';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 @use './shared';
 // go/keep-sorted end
@@ -52,6 +51,5 @@ $_custom-property-prefix: 'elevated-button';
 @function _resolve-tokens($tokens) {
   $tokens: shared.flatten-disabled-colors($tokens);
   $tokens: shared.remove-unsupported-tokens($tokens);
-  $tokens: typography.resolve-tokens($tokens, 'label-text');
   @return $tokens;
 }
diff --git a/button/lib/_filled-button.scss b/button/lib/_filled-button.scss
@@ -9,7 +9,6 @@
 // go/keep-sorted start
 @use '../../sass/shape';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 @use './shared';
 // go/keep-sorted end
@@ -51,6 +50,5 @@ $_custom-property-prefix: 'filled-button';
 @function _resolve-tokens($tokens) {
   $tokens: shared.flatten-disabled-colors($tokens);
   $tokens: shared.remove-unsupported-tokens($tokens);
-  $tokens: typography.resolve-tokens($tokens, 'label-text');
   @return $tokens;
 }
diff --git a/button/lib/_outlined-button.scss b/button/lib/_outlined-button.scss
@@ -9,7 +9,6 @@
 // go/keep-sorted start
 @use '../../sass/shape';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 @use './shared';
 // go/keep-sorted end
@@ -86,6 +85,5 @@ $_custom-property-prefix: 'outlined-button';
 @function _resolve-tokens($tokens) {
   $tokens: shared.flatten-disabled-colors($tokens);
   $tokens: shared.remove-unsupported-tokens($tokens);
-  $tokens: typography.resolve-tokens($tokens, 'label-text');
   @return $tokens;
 }
diff --git a/button/lib/_text-button.scss b/button/lib/_text-button.scss
@@ -9,7 +9,6 @@
 // go/keep-sorted start
 @use '../../sass/shape';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 @use './shared';
 // go/keep-sorted end
@@ -59,6 +58,5 @@ $_custom-property-prefix: 'text-button';
   );
   $tokens: shared.flatten-disabled-colors($tokens);
   $tokens: shared.remove-unsupported-tokens($tokens);
-  $tokens: typography.resolve-tokens($tokens, 'label-text');
   @return $tokens;
 }
diff --git a/button/lib/_tonal-button.scss b/button/lib/_tonal-button.scss
@@ -9,7 +9,6 @@
 // go/keep-sorted start
 @use '../../sass/shape';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 @use './shared';
 // go/keep-sorted end
@@ -51,6 +50,5 @@ $_custom-property-prefix: 'tonal-button';
 @function _resolve-tokens($tokens) {
   $tokens: shared.flatten-disabled-colors($tokens);
   $tokens: shared.remove-unsupported-tokens($tokens);
-  $tokens: typography.resolve-tokens($tokens, 'label-text');
   @return $tokens;
 }
diff --git a/chips/lib/_shared.scss b/chips/lib/_shared.scss
@@ -11,7 +11,6 @@
 @use '../../focus/focus-ring';
 @use '../../ripple/ripple';
 @use '../../sass/shape';
-@use '../../sass/typography';
 // go/keep-sorted end
 
 @mixin styles() {
@@ -107,6 +106,5 @@
     'dragged-state-layer-color',
     'dragged-state-layer-opacity'
   );
-  $tokens: typography.resolve-tokens($tokens, 'label-text');
   @return $tokens;
 }
diff --git a/dialog/lib/_tokens.scss b/dialog/lib/_tokens.scss
@@ -12,7 +12,6 @@
 @use '../../sass/shape';
 @use '../../sass/string-ext';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../sass/var';
 @use '../../tokens';
 // go/keep-sorted end
@@ -75,7 +74,7 @@ $_fullscreen-tokens: (
   $remove-prefix: 'action-';
   $tokens: _map-without-keys-with-prefix($tokens, $remove-prefix);
 
-  @return typography.resolve-tokens($tokens, 'headline', 'supporting-text');
+  @return $tokens;
 }
 
 /**

diff --git a/fab/lib/_fab-extended.scss b/fab/lib/_fab-extended.scss
@@ -12,15 +12,14 @@
 // go/keep-sorted start
 @use '../../sass/shape';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 @use './shared';
 // go/keep-sorted end
 
 @mixin theme($tokens) {
   $tokens: theme.validate-theme(
-    _resolve-typography(tokens.md-comp-extended-fab-surface-values()),
-    _resolve-typography($tokens)
+    tokens.md-comp-extended-fab-surface-values(),
+    $tokens
   );
   $tokens: theme.create-theme-vars($tokens, 'fab-extended');
   $tokens: shape.resolve-tokens($tokens, 'container-shape');
@@ -29,7 +28,7 @@
 }
 
 @mixin styles() {
-  $tokens: _resolve-typography(tokens.md-comp-extended-fab-surface-values());
+  $tokens: tokens.md-comp-extended-fab-surface-values();
   $tokens: theme.create-theme-vars($tokens, 'fab-extended');
   $tokens: shape.resolve-tokens($tokens, 'container-shape');
 
@@ -72,7 +71,3 @@
     }
   }
 }
-
-@function _resolve-typography($tokens) {
-  @return typography.resolve-tokens($tokens, 'label-text');
-}
diff --git a/list/lib/listitem/_list-item.scss b/list/lib/listitem/_list-item.scss
@@ -13,7 +13,6 @@
 @use '../../../ripple/ripple';
 @use '../../../sass/map-ext';
 @use '../../../sass/theme';
-@use '../../../sass/typography';
 @use '../../../tokens';
 // go/keep-sorted end
 
@@ -453,16 +452,6 @@
     }
   }
 
-  // Do not include list-item-trailing-supporting-text or list-item-label-text
-  // because we actually need the line-height tokens separately from the
-  // *-type tokens.
-  $list-item-tokens: typography.resolve-tokens(
-    $list-item-tokens,
-    'list-item-supporting-text',
-    'list-item-leading-avatar-label',
-    'list-item-overline'
-  );
-
   $list-item-tokens: _remove-unused-tokens($list-item-tokens);
 
   @return $list-item-tokens;
@@ -484,15 +473,7 @@
     'list-item-overline-type',
     'list-item-selected-trailing-icon',
     'list-item-selected-trailing-icon-color',
-    'list-item-unselected-trailing-icon-color',
-    'list-item-label-text-font',
-    'list-item-label-text-size',
-    'list-item-label-text-tracking',
-    'list-item-label-text-weight',
-    'list-item-trailing-supporting-text-font',
-    'list-item-trailing-supporting-text-size',
-    'list-item-trailing-supporting-text-tracking',
-    'list-item-trailing-supporting-text-weight'
+    'list-item-unselected-trailing-icon-color'
   );
 
   @each $token in $unused-tokens {

diff --git a/navigationtab/lib/_navigation-tab.scss b/navigationtab/lib/_navigation-tab.scss
@@ -15,7 +15,6 @@
 @use '../../motion/animation';
 @use '../../ripple/ripple';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../tokens';
 // go/keep-sorted end
 
@@ -24,8 +23,8 @@ $_custom-property-prefix: 'navigation-bar';
 
 @mixin theme($tokens) {
   $tokens: theme.validate-theme(
-    _resolve-tokens(tokens.md-comp-navigation-bar-values()),
-    _resolve-tokens($tokens)
+    tokens.md-comp-navigation-bar-values(),
+    $tokens
   );
 
   $tokens: theme.create-theme-vars($tokens, $_custom-property-prefix);
@@ -34,7 +33,7 @@ $_custom-property-prefix: 'navigation-bar';
 }
 
 @mixin styles() {
-  $tokens: _resolve-tokens(tokens.md-comp-navigation-bar-values());
+  $tokens: tokens.md-comp-navigation-bar-values();
   $tokens: theme.create-theme-vars($tokens, $_custom-property-prefix);
 
   :host {
@@ -260,7 +259,3 @@ $_custom-property-prefix: 'navigation-bar';
     );
   }
 }
-
-@function _resolve-tokens($tokens) {
-  @return typography.resolve-tokens($tokens, 'label-text');
-}
diff --git a/sass/_typography.scss b/sass/_typography.scss
diff --git a/sass/test/_typography.test.scss b/sass/test/_typography.test.scss
diff --git a/sass/test/test.scss b/sass/test/test.scss
@@ -9,5 +9,4 @@
 @use './map-ext.test';
 @use './shape.test';
 @use './string-ext.test';
-@use './typography.test';
 // go/keep-sorted end
diff --git a/segmentedbutton/lib/_shared.scss b/segmentedbutton/lib/_shared.scss
@@ -14,7 +14,6 @@
 @use '../../ripple/ripple';
 @use '../../sass/color';
 @use '../../sass/touch-target';
-@use '../../sass/typography';
 // go/keep-sorted end
 
 @mixin styles() {
@@ -357,7 +356,6 @@
 }
 
 @function resolve-tokens($tokens) {
-  $tokens: typography.resolve-tokens($tokens, 'label-text');
   $tokens: _flatten-disabled-colors($tokens);
   @return $tokens;
 }

diff --git a/slider/lib/_slider.scss b/slider/lib/_slider.scss
@@ -15,14 +15,12 @@
 @use '../../sass/color';
 @use '../../sass/shape';
 @use '../../sass/theme';
-@use '../../sass/typography';
 @use '../../sass/var';
 @use './tokens';
 // go/keep-sorted end
 
 @mixin theme($tokens) {
   $tokens: tokens.remove-unsupported-tokens($tokens);
-  $tokens: typography.resolve-tokens($tokens, 'label-label-text');
   $tokens: theme.validate-theme(tokens.md-comp-slider-values(), $tokens);
   $tokens: theme.create-theme-vars($tokens, 'slider');