From beb5f816eaa5fe364d7563596f9bd82006d7c1d1 Mon Sep 17 00:00:00 2001
From: Elizabeth Mitchell <lizmitchell@google.com>
Date: Tue, 2 May 2023 13:18:37 -0700
Subject: [PATCH] fix(tokens): bugs with component values() functions

PiperOrigin-RevId: 528870337
---
 list/lib/_list.scss               |  6 ++++--
 list/lib/listitem/_list-item.scss |  6 ++++--
 menu/lib/_menu.scss               |  6 ++++--
 menu/lib/menuitem/_menu-item.scss |  6 ++++--
 tokens/_md-comp-list-item.scss    | 27 --------------------------
 tokens/_md-comp-list.scss         | 32 +++----------------------------
 tokens/_md-comp-menu-item.scss    | 32 +++----------------------------
 tokens/_md-comp-menu.scss         | 23 ----------------------
 8 files changed, 22 insertions(+), 116 deletions(-)

diff --git a/list/lib/_list.scss b/list/lib/_list.scss
index 679e3e8388..e74c88d251 100644
--- a/list/lib/_list.scss
+++ b/list/lib/_list.scss
@@ -21,7 +21,9 @@
   $tokens: theme.validate-theme(tokens.md-comp-list-values(), $tokens);
 
   @each $token, $value in $tokens {
-    --md-list-#{$token}: #{$value};
+    @if $value {
+      --md-list-#{$token}: #{$value};
+    }
   }
 }
 
@@ -30,7 +32,7 @@
 
   :host {
     @each $token, $value in $tokens {
-      --_#{$token}: #{$value};
+      --_#{$token}: var(--md-list-#{$token}, #{$value});
     }
 
     color: unset;
diff --git a/list/lib/listitem/_list-item.scss b/list/lib/listitem/_list-item.scss
index e139134496..f6718b3488 100644
--- a/list/lib/listitem/_list-item.scss
+++ b/list/lib/listitem/_list-item.scss
@@ -20,7 +20,9 @@
   $tokens: theme.validate-theme(tokens.md-comp-list-item-values(), $tokens);
 
   @each $token, $value in $tokens {
-    --md-list-item-#{$token}: #{$value};
+    @if $value {
+      --md-list-item-#{$token}: #{$value};
+    }
   }
 }
 
@@ -29,7 +31,7 @@
 
   :host {
     @each $token, $value in $tokens {
-      --_#{$token}: #{$value};
+      --_#{$token}: var(--md-list-item-#{$token}, #{$value});
     }
   }
 
diff --git a/menu/lib/_menu.scss b/menu/lib/_menu.scss
index e3d4ed628d..0b72804c79 100644
--- a/menu/lib/_menu.scss
+++ b/menu/lib/_menu.scss
@@ -21,7 +21,9 @@
   $tokens: theme.validate-theme(tokens.md-comp-menu-values(), $tokens);
 
   @each $token, $value in $tokens {
-    --md-menu-#{$token}: #{$value};
+    @if $value {
+      --md-menu-#{$token}: #{$value};
+    }
   }
 }
 
@@ -30,7 +32,7 @@
 
   :host {
     @each $token, $value in $tokens {
-      --_#{$token}: #{$value};
+      --_#{$token}: var(--md-menu-#{$token}, #{$value});
     }
 
     @include md-list.theme(
diff --git a/menu/lib/menuitem/_menu-item.scss b/menu/lib/menuitem/_menu-item.scss
index 5f185d05bd..08cc6cb9fb 100644
--- a/menu/lib/menuitem/_menu-item.scss
+++ b/menu/lib/menuitem/_menu-item.scss
@@ -19,7 +19,9 @@
   $tokens: theme.validate-theme(tokens.md-comp-menu-item-values(), $tokens);
 
   @each $token, $value in $tokens {
-    --md-menu-item-#{$token}: #{$value};
+    @if $value {
+      --md-menu-item-#{$token}: #{$value};
+    }
   }
 }
 
@@ -28,7 +30,7 @@
 
   :host {
     @each $token, $value in $tokens {
-      --_#{$token}: #{$value};
+      --_#{$token}: var(--md-menu-item-#{$token}, #{$value});
     }
 
     @include list-item.theme(
diff --git a/tokens/_md-comp-list-item.scss b/tokens/_md-comp-list-item.scss
index ce98d31294..2aee9cbf89 100644
--- a/tokens/_md-comp-list-item.scss
+++ b/tokens/_md-comp-list-item.scss
@@ -170,32 +170,5 @@ $supported-tokens: (
     $new-tokens: get-new-tokens($deps, $exclude-hardcoded-values)
   );
 
-  @each $token, $value in $tokens {
-    $tokens: map.set($tokens, $token, var(--md-list-item-#{$token}, #{$value}));
-  }
-
-  @return $tokens;
-}
-
-// TODO(b/276957188): Remove this when we resolve issues with values fn.
-@function theme-values($deps: $_default, $exclude-hardcoded-values: false) {
-  $original-tokens: md-comp-list.values($deps, $exclude-hardcoded-values);
-  $original-tokens: map.merge($original-tokens, get-override-tokens($deps));
-
-  $tokens: values.validate(
-    md-comp-list.values($deps, $exclude-hardcoded-values),
-    $supported-tokens: $supported-tokens,
-    $unsupported-tokens: $unsupported-tokens,
-    $new-tokens: get-new-tokens($deps, $exclude-hardcoded-values)
-  );
-
-  @each $token, $value in $tokens {
-    @if $value {
-      $tokens: map.set($tokens, $token, #{$value});
-    } @else {
-      $tokens: map.remove($tokens, $token);
-    }
-  }
-
   @return $tokens;
 }
diff --git a/tokens/_md-comp-list.scss b/tokens/_md-comp-list.scss
index 0ab74c8a93..3e2c3f1f1a 100644
--- a/tokens/_md-comp-list.scss
+++ b/tokens/_md-comp-list.scss
@@ -116,41 +116,15 @@ $unsupported-tokens: (
   // go/keep-sorted end
 );
 
-$renamed-tokens: (
-  'list-item-container-color': 'container-color',
-);
-
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
   $tokens: values.validate(
     md-comp-list.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
-    $renamed-tokens: $renamed-tokens
+    $renamed-tokens: (
+      'list-item-container-color': 'container-color',
+    )
   );
 
-  @each $token, $value in $tokens {
-    $tokens: map.set($tokens, $token, var(--md-list-#{$token}, #{$value}));
-  }
-
-  @return $tokens;
-}
-
-// TODO(b/276957188): Remove this when we resolve issues with values fn.
-@function theme-values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
-    md-comp-list.values($deps, $exclude-hardcoded-values),
-    $supported-tokens: $supported-tokens,
-    $unsupported-tokens: $unsupported-tokens,
-    $renamed-tokens: $renamed-tokens
-  );
-
-  @each $token, $value in $tokens {
-    @if $value {
-      $tokens: map.set($tokens, $token, #{$value});
-    } @else {
-      $tokens: map.remove($tokens, $token);
-    }
-  }
-
   @return $tokens;
 }
diff --git a/tokens/_md-comp-menu-item.scss b/tokens/_md-comp-menu-item.scss
index a3f392d3e5..7c0bb8cb59 100644
--- a/tokens/_md-comp-menu-item.scss
+++ b/tokens/_md-comp-menu-item.scss
@@ -36,41 +36,15 @@ $supported-tokens: (
   // go/keep-sorted end
 );
 
-$renamed-tokens: (
-  'container-color': 'list-item-container-color',
-);
-
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
   $tokens: values.validate(
     md-comp-menu.values($deps),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
-    $renamed-tokens: $renamed-tokens
+    $renamed-tokens: (
+      'container-color': 'list-item-container-color',
+    )
   );
 
-  @each $token, $value in $tokens {
-    $tokens: map.set($tokens, $token, var(--md-menu-item-#{$token}, #{$value}));
-  }
-
-  @return $tokens;
-}
-
-// TODO(b/276957188): Remove this when we resolve issues with values fn.
-@function theme-values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
-    md-comp-menu.values($deps),
-    $supported-tokens: $supported-tokens,
-    $unsupported-tokens: $unsupported-tokens,
-    $renamed-tokens: $renamed-tokens
-  );
-
-  @each $token, $value in $tokens {
-    @if $value {
-      $tokens: map.set($tokens, $token, #{$value});
-    } @else {
-      $tokens: map.remove($tokens, $token);
-    }
-  }
-
   @return $tokens;
 }
diff --git a/tokens/_md-comp-menu.scss b/tokens/_md-comp-menu.scss
index 6811b66504..659c2b8903 100644
--- a/tokens/_md-comp-menu.scss
+++ b/tokens/_md-comp-menu.scss
@@ -44,28 +44,5 @@ $supported-tokens: (
     $unsupported-tokens: $unsupported-tokens
   );
 
-  @each $token, $value in $tokens {
-    $tokens: map.set($tokens, $token, var(--md-menu-#{$token}, #{$value}));
-  }
-
-  @return $tokens;
-}
-
-// TODO(b/276957188): Remove this when we resolve issues with values fn.
-@function theme-values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
-    md-comp-menu.values($deps),
-    $supported-tokens: $supported-tokens,
-    $unsupported-tokens: $unsupported-tokens
-  );
-
-  @each $token, $value in $tokens {
-    @if $value {
-      $tokens: map.set($tokens, $token, #{$value});
-    } @else {
-      $tokens: map.remove($tokens, $token);
-    }
-  }
-
   @return $tokens;
 }