@material/web 1.0.0-pre.6 → 1.0.0-pre.8

package/tokens/_md-comp-filled-select.scss

@@ -3,6 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
+// go/keep-sorted start
+@use 'sass:map';
+// go/keep-sorted end
 // go/keep-sorted start
 @use './md-sys-color';
 @use './md-sys-elevation';
@@ -10,8 +13,122 @@
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_172/md-comp-filled-select';
+@use './values';
 // go/keep-sorted end
 
+$supported-tokens: (
+  // go/keep-sorted start
+  'text-field-active-indicator-color',
+  'text-field-active-indicator-height',
+  'text-field-container-color',
+  'text-field-container-shape',
+  'text-field-disabled-active-indicator-color',
+  'text-field-disabled-active-indicator-height',
+  'text-field-disabled-active-indicator-opacity',
+  'text-field-disabled-container-color',
+  'text-field-disabled-container-opacity',
+  'text-field-disabled-input-text-color',
+  'text-field-disabled-input-text-opacity',
+  'text-field-disabled-label-text-color',
+  'text-field-disabled-label-text-opacity',
+  'text-field-disabled-leading-icon-color',
+  'text-field-disabled-leading-icon-opacity',
+  'text-field-disabled-supporting-text-color',
+  'text-field-disabled-supporting-text-opacity',
+  'text-field-disabled-trailing-icon-color',
+  'text-field-disabled-trailing-icon-opacity',
+  'text-field-error-active-indicator-color',
+  'text-field-error-focus-active-indicator-color',
+  'text-field-error-focus-input-text-color',
+  'text-field-error-focus-label-text-color',
+  'text-field-error-focus-leading-icon-color',
+  'text-field-error-focus-supporting-text-color',
+  'text-field-error-focus-trailing-icon-color',
+  'text-field-error-hover-active-indicator-color',
+  'text-field-error-hover-input-text-color',
+  'text-field-error-hover-label-text-color',
+  'text-field-error-hover-leading-icon-color',
+  'text-field-error-hover-state-layer-color',
+  'text-field-error-hover-state-layer-opacity',
+  'text-field-error-hover-supporting-text-color',
+  'text-field-error-hover-trailing-icon-color',
+  'text-field-error-input-text-color',
+  'text-field-error-label-text-color',
+  'text-field-error-leading-icon-color',
+  'text-field-error-supporting-text-color',
+  'text-field-error-trailing-icon-color',
+  'text-field-focus-active-indicator-color',
+  'text-field-focus-active-indicator-height',
+  'text-field-focus-input-text-color',
+  'text-field-focus-label-text-color',
+  'text-field-focus-leading-icon-color',
+  'text-field-focus-supporting-text-color',
+  'text-field-focus-trailing-icon-color',
+  'text-field-hover-active-indicator-color',
+  'text-field-hover-active-indicator-height',
+  'text-field-hover-input-text-color',
+  'text-field-hover-label-text-color',
+  'text-field-hover-leading-icon-color',
+  'text-field-hover-state-layer-color',
+  'text-field-hover-state-layer-opacity',
+  'text-field-hover-supporting-text-color',
+  'text-field-hover-trailing-icon-color',
+  'text-field-input-text-color',
+  'text-field-input-text-type',
+  'text-field-label-text-color',
+  'text-field-label-text-populated-line-height',
+  'text-field-label-text-populated-size',
+  'text-field-label-text-type',
+  'text-field-leading-icon-color',
+  'text-field-leading-icon-size',
+  'text-field-supporting-text-color',
+  'text-field-supporting-text-type',
+  'text-field-trailing-icon-color',
+  'text-field-trailing-icon-size',
+  // go/keep-sorted end
+);
+
+$unsupported-tokens: (
+  // go/keep-sorted start
+  'menu-cascading-menu-indicator-icon-color',
+  'menu-cascading-menu-indicator-icon-size',
+  'menu-container-color',
+  'menu-container-elevation',
+  'menu-container-shadow-color',
+  'menu-container-shape',
+  'menu-divider-color',
+  'menu-divider-height',
+  'menu-list-item-container-height',
+  'menu-list-item-label-text-color',
+  'menu-list-item-label-text-font',
+  'menu-list-item-label-text-line-height',
+  'menu-list-item-label-text-size',
+  'menu-list-item-label-text-tracking',
+  'menu-list-item-label-text-type',
+  'menu-list-item-label-text-weight',
+  'menu-list-item-selected-container-color',
+  'menu-list-item-with-leading-icon-leading-icon-color',
+  'menu-list-item-with-leading-icon-leading-icon-size',
+  'menu-list-item-with-trailing-icon-trailing-icon-color',
+  'menu-list-item-with-trailing-icon-trailing-icon-size',
+  'text-field-input-text-font',
+  'text-field-input-text-line-height',
+  'text-field-input-text-size',
+  'text-field-input-text-tracking',
+  'text-field-input-text-weight',
+  'text-field-label-text-font',
+  'text-field-label-text-line-height',
+  'text-field-label-text-size',
+  'text-field-label-text-tracking',
+  'text-field-label-text-weight',
+  'text-field-supporting-text-font',
+  'text-field-supporting-text-line-height',
+  'text-field-supporting-text-size',
+  'text-field-supporting-text-tracking',
+  'text-field-supporting-text-weight',
+  // go/keep-sorted end
+);
+
 $_default: (
   'md-sys-color': md-sys-color.values-light(),
   'md-sys-elevation': md-sys-elevation.values(),
@@ -21,5 +138,11 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  @return md-comp-filled-select.values($deps, $exclude-hardcoded-values);
+  $tokens: values.validate(
+    md-comp-filled-select.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens
+  );
+
+  @return $tokens;
 }

package/tokens/_md-comp-filled-text-field.scss

@@ -12,16 +12,87 @@
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_172/md-comp-filled-text-field';
+@use './values';
 // go/keep-sorted end
 
-$_default: (
-  'md-sys-color': md-sys-color.values-light(),
-  'md-sys-shape': md-sys-shape.values(),
-  'md-sys-state': md-sys-state.values(),
-  'md-sys-typescale': md-sys-typescale.values(),
+$supported-tokens: (
+  // go/keep-sorted start
+  'active-indicator-color',
+  'active-indicator-height',
+  'caret-color',
+  'container-color',
+  'container-shape',
+  'disabled-active-indicator-color',
+  'disabled-active-indicator-height',
+  'disabled-active-indicator-opacity',
+  'disabled-container-color',
+  'disabled-container-opacity',
+  'disabled-input-text-color',
+  'disabled-input-text-opacity',
+  'disabled-label-text-color',
+  'disabled-label-text-opacity',
+  'disabled-leading-icon-color',
+  'disabled-leading-icon-opacity',
+  'disabled-supporting-text-color',
+  'disabled-supporting-text-opacity',
+  'disabled-trailing-icon-color',
+  'disabled-trailing-icon-opacity',
+  'error-active-indicator-color',
+  'error-focus-active-indicator-color',
+  'error-focus-caret-color',
+  'error-focus-input-text-color',
+  'error-focus-label-text-color',
+  'error-focus-leading-icon-color',
+  'error-focus-supporting-text-color',
+  'error-focus-trailing-icon-color',
+  'error-hover-active-indicator-color',
+  'error-hover-input-text-color',
+  'error-hover-label-text-color',
+  'error-hover-leading-icon-color',
+  'error-hover-state-layer-color',
+  'error-hover-state-layer-opacity',
+  'error-hover-supporting-text-color',
+  'error-hover-trailing-icon-color',
+  'error-input-text-color',
+  'error-label-text-color',
+  'error-leading-icon-color',
+  'error-supporting-text-color',
+  'error-trailing-icon-color',
+  'focus-active-indicator-color',
+  'focus-active-indicator-height',
+  'focus-input-text-color',
+  'focus-label-text-color',
+  'focus-leading-icon-color',
+  'focus-supporting-text-color',
+  'focus-trailing-icon-color',
+  'hover-active-indicator-color',
+  'hover-active-indicator-height',
+  'hover-input-text-color',
+  'hover-label-text-color',
+  'hover-leading-icon-color',
+  'hover-state-layer-color',
+  'hover-state-layer-opacity',
+  'hover-supporting-text-color',
+  'hover-trailing-icon-color',
+  'input-text-color',
+  'input-text-placeholder-color',
+  'input-text-prefix-color',
+  'input-text-suffix-color',
+  'input-text-type',
+  'label-text-color',
+  'label-text-populated-line-height',
+  'label-text-populated-size',
+  'label-text-type',
+  'leading-icon-color',
+  'leading-icon-size',
+  'supporting-text-color',
+  'supporting-text-type',
+  'trailing-icon-color',
+  'trailing-icon-size' // go/keep-sorted end
 );
 
-$_unsupported-tokens: (
+$unsupported-tokens: (
+  // go/keep-sorted start
   'input-text-font',
   'input-text-line-height',
   'input-text-size',
@@ -36,12 +107,24 @@ $_unsupported-tokens: (
   'supporting-text-line-height',
   'supporting-text-size',
   'supporting-text-tracking',
-  'supporting-text-weight'
+  'supporting-text-weight',
+  // go/keep-sorted end
+);
+
+$_default: (
+  'md-sys-color': md-sys-color.values-light(),
+  'md-sys-shape': md-sys-shape.values(),
+  'md-sys-state': md-sys-state.values(),
+  'md-sys-typescale': md-sys-typescale.values(),
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: md-comp-filled-text-field.values($deps, $exclude-hardcoded-values);
-  $tokens: map.remove($tokens, $_unsupported-tokens...);
+  $tokens: values.validate(
+    md-comp-filled-text-field.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens
+  );
+
   // TODO(b/271876162): remove when tokens compiler emits typescale tokens
   $tokens: map.merge(
     $tokens,
@@ -51,5 +134,6 @@ $_unsupported-tokens: (
       'supporting-text-type': map.get($deps, 'md-sys-typescale', 'body-small'),
     )
   );
+
   @return $tokens;
 }

package/tokens/_md-comp-filled-tonal-button.scss

@@ -7,7 +7,6 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
-@use '../sass/shape';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
@@ -105,15 +104,5 @@ $_default: (
     )
   );
 
-  @each $token, $value in $tokens {
-    // TODO: change to filled-tonal-button
-    $tokens: map.set(
-      $tokens,
-      $token,
-      var(--md-tonal-button-#{$token}, #{$value})
-    );
-  }
-
-  $tokens: shape.resolve-tokens($tokens, 'container-shape');
   @return $tokens;
 }

package/tokens/_md-comp-filled-tonal-icon-button.scss

@@ -8,8 +8,48 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './v0_172/md-comp-filled-tonal-icon-button';
+@use './values';
 // go/keep-sorted end
 
+$supported-tokens: (
+  // go/keep-sorted start
+  'container-color',
+  'container-shape',
+  'container-size',
+  'disabled-container-color',
+  'disabled-container-opacity',
+  'disabled-icon-color',
+  'disabled-icon-opacity',
+  'focus-icon-color',
+  'focus-state-layer-color',
+  'focus-state-layer-opacity',
+  'hover-icon-color',
+  'hover-state-layer-color',
+  'hover-state-layer-opacity',
+  'icon-color',
+  'icon-size',
+  'pressed-icon-color',
+  'pressed-state-layer-color',
+  'pressed-state-layer-opacity',
+  'selected-container-color',
+  'toggle-selected-focus-icon-color',
+  'toggle-selected-focus-state-layer-color',
+  'toggle-selected-hover-icon-color',
+  'toggle-selected-hover-state-layer-color',
+  'toggle-selected-icon-color',
+  'toggle-selected-pressed-icon-color',
+  'toggle-selected-pressed-state-layer-color',
+  'toggle-unselected-focus-icon-color',
+  'toggle-unselected-focus-state-layer-color',
+  'toggle-unselected-hover-icon-color',
+  'toggle-unselected-hover-state-layer-color',
+  'toggle-unselected-icon-color',
+  'toggle-unselected-pressed-icon-color',
+  'toggle-unselected-pressed-state-layer-color',
+  'unselected-container-color',
+  // go/keep-sorted end
+);
+
 $_default: (
   'md-sys-color': md-sys-color.values-light(),
   'md-sys-shape': md-sys-shape.values(),
@@ -17,8 +57,10 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  @return md-comp-filled-tonal-icon-button.values(
-    $deps,
-    $exclude-hardcoded-values
+  $tokens: values.validate(
+    md-comp-filled-tonal-icon-button.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens
   );
+
+  @return $tokens;
 }

package/tokens/_md-comp-filter-chip.scss

@@ -7,7 +7,6 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
-@use '../sass/shape';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
@@ -21,11 +20,14 @@ $supported-tokens: (
   // go/keep-sorted start
   'container-height',
   'container-shape',
-  'container-surface-tint-layer-color',
   'disabled-label-text-color',
   'disabled-label-text-opacity',
   'disabled-leading-icon-color',
   'disabled-leading-icon-opacity',
+  'disabled-outline-color',
+  'disabled-outline-opacity',
+  'disabled-selected-container-color',
+  'disabled-selected-container-opacity',
   'disabled-trailing-icon-color',
   'disabled-trailing-icon-opacity',
   'elevated-container-color',
@@ -38,17 +40,9 @@ $supported-tokens: (
   'elevated-hover-container-elevation',
   'elevated-pressed-container-elevation',
   'elevated-selected-container-color',
-  'flat-disabled-outline-color',
-  'flat-disabled-outline-opacity',
-  'flat-disabled-selected-container-color',
-  'flat-disabled-selected-container-opacity',
-  'flat-focus-outline-color',
-  'flat-outline-color',
-  'flat-outline-width',
-  'flat-selected-container-color',
-  'flat-selected-outline-width',
   'focus-label-text-color',
   'focus-leading-icon-color',
+  'focus-outline-color',
   'focus-state-layer-color',
   'focus-state-layer-opacity',
   'focus-trailing-icon-color',
@@ -61,11 +55,14 @@ $supported-tokens: (
   'label-text-color',
   'label-text-type',
   'leading-icon-color',
+  'outline-color',
+  'outline-width',
   'pressed-label-text-color',
   'pressed-leading-icon-color',
   'pressed-state-layer-color',
   'pressed-state-layer-opacity',
   'pressed-trailing-icon-color',
+  'selected-container-color',
   'selected-focus-label-text-color',
   'selected-focus-leading-icon-color',
   'selected-focus-state-layer-color',
@@ -78,6 +75,7 @@ $supported-tokens: (
   'selected-hover-trailing-icon-color',
   'selected-label-text-color',
   'selected-leading-icon-color',
+  'selected-outline-width',
   'selected-pressed-label-text-color',
   'selected-pressed-leading-icon-color',
   'selected-pressed-state-layer-color',
@@ -90,107 +88,32 @@ $supported-tokens: (
 
 $unsupported-tokens: (
   // go/keep-sorted start
+  'container-elevation',
   'dragged-container-elevation',
   'dragged-label-text-color',
   'dragged-leading-icon-color',
   'dragged-state-layer-color',
   'dragged-state-layer-opacity',
   'dragged-trailing-icon-color',
-  'flat-container-elevation',
-  'flat-focus-container-elevation',
-  'flat-hover-container-elevation',
-  'flat-pressed-container-elevation',
-  'flat-selected-focus-container-elevation',
-  'flat-selected-hover-container-elevation',
-  'flat-selected-pressed-container-elevation',
+  'focus-container-elevation',
+  'hover-container-elevation',
   'label-text-font',
   'label-text-line-height',
   'label-text-size',
   'label-text-tracking',
   'label-text-weight',
+  'pressed-container-elevation',
   'selected-dragged-label-text-color',
   'selected-dragged-leading-icon-color',
   'selected-dragged-state-layer-color',
   'selected-dragged-state-layer-opacity',
   'selected-dragged-trailing-icon-color',
+  'selected-focus-container-elevation',
+  'selected-hover-container-elevation',
+  'selected-pressed-container-elevation',
   // go/keep-sorted end
 );
 
-$renamed-tokens: (
-  // Remove "unselected-*" prefix (b/275577569)
-  'elevated-unselected-container-color': 'elevated-container-color',
-  'flat-disabled-unselected-outline-color': 'flat-disabled-outline-color',
-  'flat-disabled-unselected-outline-opacity': 'flat-disabled-outline-opacity',
-  'flat-unselected-focus-container-elevation': 'flat-focus-container-elevation',
-  'flat-unselected-focus-outline-color': 'flat-focus-outline-color',
-  'flat-unselected-hover-container-elevation': 'flat-hover-container-elevation',
-  'flat-unselected-outline-color': 'flat-outline-color',
-  'flat-unselected-outline-width': 'flat-outline-width',
-  'flat-unselected-pressed-container-elevation':
-    'flat-pressed-container-elevation',
-  'unselected-dragged-label-text-color': 'dragged-label-text-color',
-  'unselected-dragged-state-layer-color': 'dragged-state-layer-color',
-  'unselected-dragged-state-layer-opacity': 'dragged-state-layer-opacity',
-  'unselected-focus-label-text-color': 'focus-label-text-color',
-  'unselected-focus-state-layer-color': 'focus-state-layer-color',
-  'unselected-focus-state-layer-opacity': 'focus-state-layer-opacity',
-  'unselected-hover-label-text-color': 'hover-label-text-color',
-  'unselected-hover-state-layer-color': 'hover-state-layer-color',
-  'unselected-hover-state-layer-opacity': 'hover-state-layer-opacity',
-  'unselected-label-text-color': 'label-text-color',
-  'unselected-pressed-label-text-color': 'pressed-label-text-color',
-  'unselected-pressed-state-layer-color': 'pressed-state-layer-color',
-  'unselected-pressed-state-layer-opacity': 'pressed-state-layer-opacity',
-  // Remove "with-icon-*" prefix (b/273534858)
-  'with-icon-icon-size': 'icon-size',
-  // Remove "with-leading-icon-*" prefix (b/273534858)
-  'with-leading-icon-disabled-leading-icon-color': 'disabled-leading-icon-color',
-  'with-leading-icon-disabled-leading-icon-opacity':
-    'disabled-leading-icon-opacity',
-  'with-leading-icon-selected-dragged-leading-icon-color':
-    'selected-dragged-leading-icon-color',
-  'with-leading-icon-selected-focus-leading-icon-color':
-    'selected-focus-leading-icon-color',
-  'with-leading-icon-selected-hover-leading-icon-color':
-    'selected-hover-leading-icon-color',
-  'with-leading-icon-selected-leading-icon-color': 'selected-leading-icon-color',
-  'with-leading-icon-selected-pressed-leading-icon-color':
-    'selected-pressed-leading-icon-color',
-  'with-leading-icon-unselected-dragged-leading-icon-color':
-    'dragged-leading-icon-color',
-  'with-leading-icon-unselected-focus-leading-icon-color':
-    'focus-leading-icon-color',
-  'with-leading-icon-unselected-hover-leading-icon-color':
-    'hover-leading-icon-color',
-  'with-leading-icon-unselected-leading-icon-color': 'leading-icon-color',
-  'with-leading-icon-unselected-pressed-leading-icon-color':
-    'pressed-leading-icon-color',
-  // Remove "with-trailing-icon-*" prefix (b/273534858)
-  'with-trailing-icon-disabled-trailing-icon-color':
-    'disabled-trailing-icon-color',
-  'with-trailing-icon-disabled-trailing-icon-opacity':
-    'disabled-trailing-icon-opacity',
-  'with-trailing-icon-selected-dragged-trailing-icon-color':
-    'selected-dragged-trailing-icon-color',
-  'with-trailing-icon-selected-focus-trailing-icon-color':
-    'selected-focus-trailing-icon-color',
-  'with-trailing-icon-selected-hover-trailing-icon-color':
-    'selected-hover-trailing-icon-color',
-  'with-trailing-icon-selected-pressed-trailing-icon-color':
-    'selected-pressed-trailing-icon-color',
-  'with-trailing-icon-selected-trailing-icon-color':
-    'selected-trailing-icon-color',
-  'with-trailing-icon-unselected-dragged-trailing-icon-color':
-    'dragged-trailing-icon-color',
-  'with-trailing-icon-unselected-focus-trailing-icon-color':
-    'focus-trailing-icon-color',
-  'with-trailing-icon-unselected-hover-trailing-icon-color':
-    'hover-trailing-icon-color',
-  'with-trailing-icon-unselected-pressed-trailing-icon-color':
-    'pressed-trailing-icon-color',
-  'with-trailing-icon-unselected-trailing-icon-color': 'trailing-icon-color'
-);
-
 $_default: (
   'md-sys-color': md-sys-color.values-light(),
   'md-sys-elevation': md-sys-elevation.values(),
@@ -204,7 +127,93 @@ $_default: (
     md-comp-filter-chip.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
-    $renamed-tokens: $renamed-tokens
+    $renamed-tokens: (
+      // Remove "unselected-*" and "flat-*" prefix (b/275577569)
+      'elevated-unselected-container-color': 'elevated-container-color',
+      'flat-container-elevation': 'container-elevation',
+      'flat-disabled-unselected-outline-color': 'disabled-outline-color',
+      'flat-disabled-unselected-outline-opacity': 'disabled-outline-opacity',
+      'flat-disabled-selected-container-color':
+        'disabled-selected-container-color',
+      'flat-disabled-selected-container-opacity':
+        'disabled-selected-container-opacity',
+      'flat-unselected-focus-container-elevation': 'focus-container-elevation',
+      'flat-unselected-focus-outline-color': 'focus-outline-color',
+      'flat-unselected-hover-container-elevation': 'hover-container-elevation',
+      'flat-unselected-outline-color': 'outline-color',
+      'flat-unselected-outline-width': 'outline-width',
+      'flat-unselected-pressed-container-elevation':
+        'pressed-container-elevation',
+      'flat-selected-container-color': 'selected-container-color',
+      'flat-selected-focus-container-elevation':
+        'selected-focus-container-elevation',
+      'flat-selected-hover-container-elevation':
+        'selected-hover-container-elevation',
+      'flat-selected-outline-width': 'selected-outline-width',
+      'flat-selected-pressed-container-elevation':
+        'selected-pressed-container-elevation',
+      'unselected-dragged-label-text-color': 'dragged-label-text-color',
+      'unselected-dragged-state-layer-color': 'dragged-state-layer-color',
+      'unselected-dragged-state-layer-opacity': 'dragged-state-layer-opacity',
+      'unselected-focus-label-text-color': 'focus-label-text-color',
+      'unselected-focus-state-layer-color': 'focus-state-layer-color',
+      'unselected-focus-state-layer-opacity': 'focus-state-layer-opacity',
+      'unselected-hover-label-text-color': 'hover-label-text-color',
+      'unselected-hover-state-layer-color': 'hover-state-layer-color',
+      'unselected-hover-state-layer-opacity': 'hover-state-layer-opacity',
+      'unselected-label-text-color': 'label-text-color',
+      'unselected-pressed-label-text-color': 'pressed-label-text-color',
+      'unselected-pressed-state-layer-color': 'pressed-state-layer-color',
+      'unselected-pressed-state-layer-opacity': 'pressed-state-layer-opacity',
+      // Remove "with-*" prefixex (b/273534858)
+      'with-icon-icon-size': 'icon-size',
+      'with-leading-icon-disabled-leading-icon-color':
+        'disabled-leading-icon-color',
+      'with-leading-icon-disabled-leading-icon-opacity':
+        'disabled-leading-icon-opacity',
+      'with-leading-icon-selected-dragged-leading-icon-color':
+        'selected-dragged-leading-icon-color',
+      'with-leading-icon-selected-focus-leading-icon-color':
+        'selected-focus-leading-icon-color',
+      'with-leading-icon-selected-hover-leading-icon-color':
+        'selected-hover-leading-icon-color',
+      'with-leading-icon-selected-leading-icon-color':
+        'selected-leading-icon-color',
+      'with-leading-icon-selected-pressed-leading-icon-color':
+        'selected-pressed-leading-icon-color',
+      'with-leading-icon-unselected-dragged-leading-icon-color':
+        'dragged-leading-icon-color',
+      'with-leading-icon-unselected-focus-leading-icon-color':
+        'focus-leading-icon-color',
+      'with-leading-icon-unselected-hover-leading-icon-color':
+        'hover-leading-icon-color',
+      'with-leading-icon-unselected-leading-icon-color': 'leading-icon-color',
+      'with-leading-icon-unselected-pressed-leading-icon-color':
+        'pressed-leading-icon-color',
+      'with-trailing-icon-disabled-trailing-icon-color':
+        'disabled-trailing-icon-color',
+      'with-trailing-icon-disabled-trailing-icon-opacity':
+        'disabled-trailing-icon-opacity',
+      'with-trailing-icon-selected-dragged-trailing-icon-color':
+        'selected-dragged-trailing-icon-color',
+      'with-trailing-icon-selected-focus-trailing-icon-color':
+        'selected-focus-trailing-icon-color',
+      'with-trailing-icon-selected-hover-trailing-icon-color':
+        'selected-hover-trailing-icon-color',
+      'with-trailing-icon-selected-pressed-trailing-icon-color':
+        'selected-pressed-trailing-icon-color',
+      'with-trailing-icon-selected-trailing-icon-color':
+        'selected-trailing-icon-color',
+      'with-trailing-icon-unselected-dragged-trailing-icon-color':
+        'dragged-trailing-icon-color',
+      'with-trailing-icon-unselected-focus-trailing-icon-color':
+        'focus-trailing-icon-color',
+      'with-trailing-icon-unselected-hover-trailing-icon-color':
+        'hover-trailing-icon-color',
+      'with-trailing-icon-unselected-pressed-trailing-icon-color':
+        'pressed-trailing-icon-color',
+      'with-trailing-icon-unselected-trailing-icon-color': 'trailing-icon-color'
+    )
   );
 
   // TODO(b/271876162): remove when tokens compiler emits typescale tokens
@@ -215,14 +224,5 @@ $_default: (
     )
   );
 
-  @each $token, $value in $tokens {
-    $tokens: map.set(
-      $tokens,
-      $token,
-      var(--md-filter-chip-#{$token}, #{$value})
-    );
-  }
-
-  $tokens: shape.resolve-tokens($tokens, 'container-shape');
   @return $tokens;
 }