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

package/tokens/_md-comp-focus-ring.scss

@@ -5,42 +5,41 @@
 
 // go/keep-sorted start
 @use 'sass:map';
+@use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
 @use './md-sys-color';
 @use './md-sys-motion';
 @use './md-sys-shape';
+@use './values';
 // go/keep-sorted end
 
+$supported-tokens: (
+  // go/keep-sorted start
+  'active-width',
+  'color',
+  'duration',
+  'offset',
+  'shape',
+  'width',
+  // go/keep-sorted end
+);
+
 $_default: (
   'md-sys-color': md-sys-color.values-light(),
-  'md-sys-shape': md-sys-shape.values(),
   'md-sys-motion': md-sys-motion.values(),
+  'md-sys-shape': md-sys-shape.values(),
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  @return (
-    shape:
-      if(
-        $exclude-hardcoded-values,
-        null,
-        map.get($deps, 'md-sys-shape', 'corner-full')
-      ),
-    offset: if($exclude-hardcoded-values, null, 2px),
-    width: if($exclude-hardcoded-values, null, 3px),
-    animation-width: if($exclude-hardcoded-values, null, 8px),
-    animation-duration:
-      if(
-        $exclude-hardcoded-values,
-        null,
-        map.get($deps, 'md-sys-motion', 'duration-long4')
-      ),
-    easing:
-      if(
-        $exclude-hardcoded-values,
-        null,
-        map.get($deps, 'md-sys-motion', 'easing-emphasized')
-      ),
-    color: map.get($deps, 'md-sys-color', 'secondary')
+  $tokens: (
+    'active-width': if($exclude-hardcoded-values, null, 8px),
+    'color': map.get($deps, 'md-sys-color', 'secondary'),
+    'duration': map.get($deps, 'md-sys-motion', 'duration-long4'),
+    'offset': if($exclude-hardcoded-values, null, 2px),
+    'shape': map.get($deps, 'md-sys-shape', 'corner-full'),
+    'width': if($exclude-hardcoded-values, null, 3px),
   );
+
+  @return values.validate($tokens, $supported-tokens: $supported-tokens);
 }

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

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

package/tokens/_md-comp-input-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';
@@ -48,7 +47,6 @@ $supported-tokens: (
   'hover-trailing-icon-color',
   'icon-size',
   'label-text-color',
-  'label-text-font',
   'label-text-type',
   'leading-icon-color',
   'outline-color',
@@ -66,6 +64,8 @@ $supported-tokens: (
   'selected-focus-trailing-icon-color',
   'selected-hover-label-text-color',
   'selected-hover-leading-icon-color',
+  'selected-hover-state-layer-color',
+  'selected-hover-state-layer-opacity',
   'selected-hover-trailing-icon-color',
   'selected-label-text-color',
   'selected-leading-icon-color',
@@ -88,6 +88,7 @@ $unsupported-tokens: (
   'dragged-state-layer-color',
   'dragged-state-layer-opacity',
   'dragged-trailing-icon-color',
+  'label-text-font',
   'label-text-line-height',
   'label-text-size',
   'label-text-tracking',
@@ -101,89 +102,6 @@ $unsupported-tokens: (
   // go/keep-sorted end
 );
 
-$renamed-tokens: (
-  // Remove "unselected-*" prefix (b/275577569)
-  'unselected-dragged-label-text-color': 'dragged-label-text-color',
-  'unselected-dragged-leading-icon-color': 'dragged-leading-icon-color',
-  'unselected-dragged-state-layer-color': 'dragged-state-layer-color',
-  'unselected-dragged-state-layer-opacity': 'dragged-state-layer-opacity',
-  'unselected-dragged-trailing-icon-color': 'dragged-trailing-icon-color',
-  'unselected-focus-label-text-color': 'focus-label-text-color',
-  'unselected-focus-leading-icon-color': 'focus-leading-icon-color',
-  'unselected-focus-outline-color': 'focus-outline-color',
-  'unselected-focus-state-layer-color': 'focus-state-layer-color',
-  'unselected-focus-state-layer-opacity': 'focus-state-layer-opacity',
-  'unselected-focus-trailing-icon-color': 'focus-trailing-icon-color',
-  'unselected-hover-label-text-color': 'hover-label-text-color',
-  'unselected-hover-leading-icon-color': 'hover-leading-icon-color',
-  'unselected-hover-state-layer-color': 'hover-state-layer-color',
-  'unselected-hover-state-layer-opacity': 'hover-state-layer-opacity',
-  'unselected-hover-trailing-icon-color': 'hover-trailing-icon-color',
-  'unselected-label-text-color': 'label-text-color',
-  'unselected-leading-icon-color': 'leading-icon-color',
-  'unselected-outline-color': 'outline-color',
-  'unselected-outline-width': 'outline-width',
-  'unselected-pressed-label-text-color': 'pressed-label-text-color',
-  'unselected-pressed-leading-icon-color': 'pressed-leading-icon-color',
-  'unselected-pressed-state-layer-color': 'pressed-state-layer-color',
-  'unselected-pressed-state-layer-opacity': 'pressed-state-layer-opacity',
-  'unselected-pressed-trailing-icon-color': 'pressed-trailing-icon-color',
-  // Remove "with-avatar-*" prefix (b/273534858)
-  'with-avatar-avatar-shape': 'avatar-shape',
-  'with-avatar-avatar-size': 'avatar-size',
-  'with-avatar-disabled-avatar-opacity': 'disabled-avatar-opacity',
-  // Remove "with-leading-icon-*" prefix (b/273534858) and rename to icon-size
-  // to match assist, suggestion, and filter chips
-  'with-leading-icon-leading-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-trailing-icon-size': 'trailing-icon-size',
-  '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(),
@@ -197,7 +115,80 @@ $_default: (
     md-comp-input-chip.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
-    $renamed-tokens: $renamed-tokens
+    $renamed-tokens: (
+      // Remove "unselected-*" prefix (b/275577569)
+      'disabled-unselected-outline-color': 'disabled-outline-color',
+      'disabled-unselected-outline-opacity': 'disabled-outline-opacity',
+      '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-outline-color': 'focus-outline-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-outline-color': 'outline-color',
+      'unselected-outline-width': 'outline-width',
+      '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-*" prefixes (b/273534858)
+      'with-avatar-avatar-shape': 'avatar-shape',
+      'with-avatar-avatar-size': 'avatar-size',
+      'with-avatar-disabled-avatar-opacity': 'disabled-avatar-opacity',
+      'with-leading-icon-disabled-leading-icon-color':
+        'disabled-leading-icon-color',
+      'with-leading-icon-disabled-leading-icon-opacity':
+        'disabled-leading-icon-opacity',
+      // Rename "leading-icon-size" to "icon-size" (b/275577569)
+      'with-leading-icon-leading-icon-size': 'icon-size',
+      '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-trailing-icon-size': 'trailing-icon-size',
+      '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
@@ -208,14 +199,5 @@ $_default: (
     )
   );
 
-  @each $token, $value in $tokens {
-    $tokens: map.set(
-      $tokens,
-      $token,
-      var(--md-input-chip-#{$token}, #{$value})
-    );
-  }
-
-  $tokens: shape.resolve-tokens($tokens, 'container-shape');
   @return $tokens;
 }

package/tokens/_md-comp-linear-progress-indicator.scss

@@ -3,10 +3,14 @@
 // 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-shape';
 @use './v0_172/md-comp-linear-progress-indicator';
+@use './values';
 // go/keep-sorted end
 
 $_default: (
@@ -14,9 +18,33 @@ $_default: (
   'md-sys-shape': md-sys-shape.values(),
 );
 
+$supported-tokens: (
+  // go/keep-sorted start
+  'active-indicator-color',
+  'active-indicator-height',
+  'four-color-active-indicator-four-color',
+  'four-color-active-indicator-one-color',
+  'four-color-active-indicator-three-color',
+  'four-color-active-indicator-two-color',
+  'track-color',
+  'track-height',
+  'track-shape',
+  // go/keep-sorted end
+);
+
+$unsupported-tokens: (
+  // go/keep-sorted start
+  // can only control track since scaling is used on buffer/progress
+  'active-indicator-shape',
+  // go/keep-sorted end
+);
+
+// TODO(b/275045611) may need to update based on resolution of design
+// for buffer and background animation.
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  @return md-comp-linear-progress-indicator.values(
-    $deps,
-    $exclude-hardcoded-values
+  @return values.validate(
+    md-comp-linear-progress-indicator.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens
   );
 }

package/tokens/_md-comp-list-item.scss

@@ -0,0 +1,174 @@
+//
+// Copyright 2023 Google LLC
+// 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';
+@use './md-sys-shape';
+@use './md-sys-state';
+@use './md-sys-typescale';
+@use './v0_172/md-comp-list';
+@use './values';
+// go/keep-sorted end
+
+$_default: (
+  'md-sys-color': md-sys-color.values-light(),
+  'md-sys-elevation': md-sys-elevation.values(),
+  'md-sys-shape': md-sys-shape.values(),
+  'md-sys-state': md-sys-state.values(),
+  'md-sys-typescale': md-sys-typescale.values(),
+);
+
+$unsupported-tokens: (
+  // go/keep-sorted start
+  'list-item-container-elevation',
+  'list-item-disabled-state-layer-color',
+  'list-item-disabled-state-layer-opacity',
+  'list-item-dragged-container-elevation',
+  'list-item-dragged-label-text-color',
+  'list-item-dragged-leading-icon-icon-color',
+  'list-item-dragged-state-layer-color',
+  'list-item-dragged-state-layer-opacity',
+  'list-item-dragged-trailing-icon-icon-color',
+  'list-item-label-text-font',
+  'list-item-label-text-size',
+  'list-item-label-text-tracking',
+  'list-item-label-text-weight',
+  'list-item-leading-avatar-label-font',
+  'list-item-leading-avatar-label-line-height',
+  'list-item-leading-avatar-label-size',
+  'list-item-leading-avatar-label-tracking',
+  'list-item-leading-avatar-label-weight',
+  'list-item-overline-color',
+  'list-item-overline-font',
+  'list-item-overline-line-height',
+  'list-item-overline-size',
+  'list-item-overline-tracking',
+  'list-item-overline-type',
+  'list-item-overline-weight',
+  'list-item-selected-trailing-icon-color',
+  'list-item-supporting-text-font',
+  'list-item-supporting-text-line-height',
+  'list-item-supporting-text-size',
+  'list-item-supporting-text-tracking',
+  'list-item-supporting-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',
+  // go/keep-sorted end
+);
+
+$supported-tokens: (
+  // go/keep-sorted start
+  'list-item-container-color',
+  'list-item-container-shape',
+  'list-item-disabled-label-text-color',
+  'list-item-disabled-label-text-opacity',
+  'list-item-disabled-leading-icon-color',
+  'list-item-disabled-leading-icon-opacity',
+  'list-item-disabled-trailing-icon-color',
+  'list-item-disabled-trailing-icon-opacity',
+  'list-item-focus-label-text-color',
+  'list-item-focus-leading-icon-icon-color',
+  'list-item-focus-state-layer-color',
+  'list-item-focus-state-layer-opacity',
+  'list-item-focus-trailing-icon-icon-color',
+  'list-item-hover-label-text-color',
+  'list-item-hover-leading-icon-icon-color',
+  'list-item-hover-state-layer-color',
+  'list-item-hover-state-layer-opacity',
+  'list-item-hover-trailing-icon-icon-color',
+  'list-item-label-text-color',
+  'list-item-label-text-line-height',
+  'list-item-label-text-type',
+  'list-item-large-leading-video-height',
+  'list-item-leading-avatar-color',
+  'list-item-leading-avatar-label-color',
+  'list-item-leading-avatar-label-type',
+  'list-item-leading-avatar-shape',
+  'list-item-leading-avatar-size',
+  'list-item-leading-icon-color',
+  'list-item-leading-icon-size',
+  'list-item-leading-image-height',
+  'list-item-leading-image-shape',
+  'list-item-leading-image-width',
+  'list-item-leading-video-shape',
+  'list-item-leading-video-width',
+  'list-item-one-line-container-height',
+  'list-item-pressed-label-text-color',
+  'list-item-pressed-leading-icon-icon-color',
+  'list-item-pressed-state-layer-color',
+  'list-item-pressed-state-layer-opacity',
+  'list-item-pressed-trailing-icon-icon-color',
+  'list-item-small-leading-video-height',
+  'list-item-supporting-text-color',
+  'list-item-supporting-text-type',
+  'list-item-three-line-container-height',
+  'list-item-trailing-icon-color',
+  'list-item-trailing-icon-size',
+  'list-item-trailing-supporting-text-color',
+  'list-item-trailing-supporting-text-line-height',
+  'list-item-trailing-supporting-text-type',
+  'list-item-two-line-container-height',
+  // go/keep-sorted end
+);
+
+@function get-new-tokens($deps, $exclude-hardcoded-values) {
+  // Values pulled from b/198759625 spreadsheet
+  @return (
+    // go/keep-sorted start
+    'list-item-leading-element-leading-space':
+      if($exclude-hardcoded-values, null, 16px),
+    'list-item-leading-space': if($exclude-hardcoded-values, null, 16px),
+    'list-item-leading-video-leading-space':
+      if($exclude-hardcoded-values, null, 0px),
+    // Commented out until the comments in the spreadsheet linked above are
+    // resolved regarding vertical alignment.
+    // 'list-item-leading-item-top-space': if($exclude-hardcoded-values, null, 8px),
+    // 'list-item-leading-video-top-space': if($exclude-hardcoded-values, null, 0px),
+    // 'list-item-leading-item-bottom-space': if($exclude-hardcoded-values, null, 8px),
+    // 'list-item-leading-video-bottom-space': if($exclude-hardcoded-values, null, 0px),
+    'list-item-trailing-element-headline-trailing-element-space': 16px,
+    'list-item-trailing-space': if($exclude-hardcoded-values, null, 16px),
+    // go/keep-sorted end
+  );
+}
+
+@function get-override-tokens($deps) {
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  @return (
+    // go/keep-sorted start
+    'list-item-label-text-type':
+      map.get($deps, 'md-sys-typescale', 'body-large'),
+    'list-item-leading-avatar-label-type':
+      map.get($deps, 'md-sys-typescale', 'title-medium'),
+    // unsupported token
+    // 'list-item-overline-type': map.get($deps, 'md-sys-typescale', 'label-small'),
+    'list-item-supporting-text-type':
+      map.get($deps, 'md-sys-typescale', 'body-medium'),
+    'list-item-trailing-supporting-text-type':
+      map.get($deps, 'md-sys-typescale', 'label-small'),
+    // go/keep-sorted end
+  );
+}
+
+@function 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(
+    $original-tokens,
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens,
+    $new-tokens: get-new-tokens($deps, $exclude-hardcoded-values)
+  );
+
+  @return $tokens;
+}