@material/web 1.1.2-nightly.cef1b74.0 → 1.2.0

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

@@ -9,18 +9,49 @@
 @use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
+@use './md-comp-list-item';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
+@use './md-sys-state';
+@use './md-sys-typescale';
 @use './v0_192/md-comp-menu';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
   // go/keep-sorted start
+  'bottom-space',
   'container-color',
+  'disabled-opacity',
+  'hover-state-layer-color',
+  'hover-state-layer-opacity',
+  'label-text-color',
+  'label-text-font',
+  'label-text-line-height',
+  'label-text-size',
+  'label-text-weight',
+  'leading-icon-color',
+  'leading-space',
+  'one-line-container-height',
+  'pressed-state-layer-color',
+  'pressed-state-layer-opacity',
   'selected-container-color',
   'selected-label-text-color',
+  'supporting-text-color',
+  'supporting-text-font',
+  'supporting-text-line-height',
+  'supporting-text-size',
+  'supporting-text-weight',
+  'top-space',
+  'trailing-icon-color',
+  'trailing-space',
+  'trailing-supporting-text-color',
+  'trailing-supporting-text-font',
+  'trailing-supporting-text-line-height',
+  'trailing-supporting-text-size',
+  'trailing-supporting-text-weight',
+  'two-line-container-height',
   // go/keep-sorted end
 );
 
@@ -29,8 +60,8 @@ $unsupported-tokens: (
   'container-elevation',
   'container-shadow-color',
   'container-shape',
-  'list-item-selected-with-leading-icon-trailing-icon-color',
-  'menu-list-item-with-leading-icon-icon-color',
+  'selected-with-leading-icon-trailing-icon-color',
+  'with-leading-icon-icon-color',
   // go/keep-sorted end
 );
 
@@ -38,18 +69,43 @@ $_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(),
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
-    md-comp-menu.values($deps),
+  $tokens: md-comp-menu.values($deps);
+
+  // Like list items, menu items use their parent menu for their container
+  // color. However, menu items can have a selected background color, so we
+  // change its default unselected background color to transparent to inherit
+  // from its parent menu.
+  $tokens: map.set($tokens, 'container-color', transparent);
+
+  $tokens: validate.values(
+    $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
-    $renamed-tokens: (
-      'list-item-selected-container-color': 'selected-container-color',
-      'list-item-selected-label-text-color': 'selected-label-text-color',
-    )
+    $new-tokens: md-comp-list-item.values($deps),
+    $renamed-tokens: _get-renamed-tokens($tokens)
   );
 
   @return $tokens;
 }
+
+// remove list-item prefix from tokens
+@function _get-renamed-tokens($tokens) {
+  $keys: map.keys($tokens);
+  $renamed-tokens: ();
+
+  @each $key in $keys {
+    @each $prefix in ('list-item-', 'menu-list-item-') {
+      @if string.index($key, $prefix) == 1 {
+        $renamed-key: string.slice($key, string.length($prefix) + 1);
+        $renamed-tokens: map.set($renamed-tokens, $key, $renamed-key);
+      }
+    }
+  }
+
+  @return $renamed-tokens;
+}

package/tokens/_md-comp-menu.scss

@@ -9,11 +9,11 @@
 @use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './v0_192/md-comp-menu';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -41,7 +41,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-menu.values($deps),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens

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

@@ -7,12 +7,12 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-outlined-button';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -73,7 +73,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-outlined-button.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

package/tokens/_md-comp-outlined-card.scss

@@ -4,12 +4,12 @@
 //
 
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './v0_192/md-comp-outlined-card';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -59,7 +59,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-outlined-card.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens

package/tokens/_md-comp-outlined-field.scss

@@ -7,12 +7,12 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-outlined-text-field';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -224,5 +224,5 @@ $_default: (
     // go/keep-sorted end
   );
 
-  @return values.validate($tokens, $supported-tokens: $supported-tokens);
+  @return validate.values($tokens, $supported-tokens: $supported-tokens);
 }

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

@@ -4,11 +4,11 @@
 //
 
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './v0_192/md-comp-outlined-icon-button';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -58,7 +58,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-outlined-icon-button.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

package/tokens/_md-comp-outlined-segmented-button.scss

@@ -6,12 +6,12 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-outlined-segmented-button';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -75,7 +75,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-outlined-segmented-button.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

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

@@ -8,13 +8,13 @@
 @use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-outlined-select';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -137,7 +137,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-outlined-select.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens

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

@@ -7,11 +7,11 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-outlined-text-field';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -111,7 +111,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-outlined-text-field.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens

package/tokens/_md-comp-primary-tab.scss

@@ -7,13 +7,13 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-primary-navigation-tab';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -83,7 +83,7 @@ $_default: (
     $exclude-hardcoded-values: $exclude-hardcoded-values
   );
 
-  @return values.validate(
+  @return validate.values(
     $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

package/tokens/_md-comp-radio.scss

@@ -4,10 +4,10 @@
 //
 
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-state';
 @use './v0_192/md-comp-radio-button';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -52,7 +52,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-radio-button.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

package/tokens/_md-comp-ripple.scss

@@ -7,10 +7,10 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -36,5 +36,5 @@ $_default: (
       map.get($deps, 'md-sys-state', 'pressed-state-layer-opacity'),
   );
 
-  @return values.validate($tokens, $supported-tokens: $supported-tokens);
+  @return validate.values($tokens, $supported-tokens: $supported-tokens);
 }

package/tokens/_md-comp-secondary-tab.scss

@@ -7,13 +7,13 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-secondary-navigation-tab';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -83,7 +83,7 @@ $_default: (
 
   $tokens: _add-missing-secondary-tokens($tokens);
 
-  $tokens: values.validate(
+  $tokens: validate.values(
     $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

package/tokens/_md-comp-slider.scss

@@ -7,13 +7,13 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-slider';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -88,7 +88,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-slider.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

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

@@ -7,13 +7,13 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-suggestion-chip';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -86,7 +86,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-suggestion-chip.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

package/tokens/_md-comp-switch.scss

@@ -4,11 +4,11 @@
 //
 
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './v0_192/md-comp-switch';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -97,7 +97,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-switch.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

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

@@ -7,12 +7,12 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
 @use './v0_192/md-comp-text-button';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -66,7 +66,7 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: values.validate(
+  $tokens: validate.values(
     md-comp-text-button.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,

package/tokens/_md-ref-palette.scss

@@ -4,8 +4,8 @@
 //
 
 // go/keep-sorted start
+@use './internal/validate';
 @use './v0_192/md-ref-palette';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -105,7 +105,7 @@ $supported-tokens: (
 );
 
 @function values($exclude-hardcoded-values: false) {
-  @return values.validate(
+  @return validate.values(
     md-ref-palette.values($exclude-hardcoded-values),
     $supported-tokens: $supported-tokens
   );

package/tokens/_md-ref-typeface.scss

@@ -7,8 +7,8 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './v0_192/md-ref-typeface';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -42,5 +42,5 @@ $supported-tokens: (
     }
   }
 
-  @return values.validate($tokens, $supported-tokens: $supported-tokens);
+  @return validate.values($tokens, $supported-tokens: $supported-tokens);
 }

package/tokens/_md-sys-color.scss

@@ -7,9 +7,9 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-ref-palette';
 @use './v0_192/md-sys-color';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -89,7 +89,7 @@ $_default-dark: (
     }
   }
 
-  @return values.validate($tokens, $supported-tokens: $supported-tokens);
+  @return validate.values($tokens, $supported-tokens: $supported-tokens);
 }
 
 $_default-light: (
@@ -115,5 +115,5 @@ $_default-light: (
     }
   }
 
-  @return values.validate($tokens, $supported-tokens: $supported-tokens);
+  @return validate.values($tokens, $supported-tokens: $supported-tokens);
 }

package/tokens/_md-sys-typescale.scss

@@ -7,9 +7,9 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/validate';
 @use './md-ref-typeface';
 @use './v0_192/md-sys-typescale';
-@use './values';
 // go/keep-sorted end
 
 $supported-tokens: (
@@ -141,7 +141,7 @@ $_default: (
     }
   }
 
-  @return values.validate(
+  @return validate.values(
     $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens

package/tokens/{_values.scss → internal/_validate.scss}

@@ -14,7 +14,7 @@
 /// Validation requires a `$values` Map and at least the `$supported-tokens`
 /// keyword argument.
 /// @example - scss
-///   $tokens: values.validate(
+///   $tokens: validate.values(
 ///     md-comp-foo.values($deps, $exclude-hardcoded-values),
 ///     $supported-tokens: (),
 ///       'foo-color',
@@ -39,18 +39,18 @@
 ///     `$supported-tokens` list.
 /// @return {Map} The `tokens.md-comp-*-values()` Map with any unsupported
 ///     tokens removed, renamed tokens updated, and new tokens added.
-@function validate($values, $tokens...) {
+@function values($values, $tokens...) {
   $tokens: meta.keywords($tokens);
 
   $renamed-tokens: map.get($tokens, 'renamed-tokens');
   @if $renamed-tokens {
     @if meta.type-of($renamed-tokens) != 'map' {
-      @error 'values.validate($renamed-tokens) must be a map.';
+      @error 'validate.values($renamed-tokens) must be a map.';
     }
 
     @each $old-token, $new-token in $renamed-tokens {
       @if not map.has-key($values, $old-token) {
-        @error 'values.validate($renamed-tokens: (\'#{$old-token}\': \'#{$new-token}\')) old-token in not the provided values.';
+        @error 'validate.values($renamed-tokens: (\'#{$old-token}\': \'#{$new-token}\')) old-token in not the provided values.';
       }
 
       $values: map.set($values, $new-token, map.get($values, $old-token));
@@ -61,12 +61,12 @@
   $unsupported-tokens: map.get($tokens, 'unsupported-tokens');
   @if $unsupported-tokens {
     @if meta.type-of($unsupported-tokens) != 'list' {
-      @error 'values.validate($unsupported-tokens) must be a list.';
+      @error 'validate.values($unsupported-tokens) must be a list.';
     }
 
     @each $unsupported-token in $unsupported-tokens {
       @if not map.has-key($values, $unsupported-token) {
-        @error 'values.validate($unsupported-tokens: (\'#{$unsupported-token}\')) token is not in the provided values.';
+        @error 'validate.values($unsupported-tokens: (\'#{$unsupported-token}\')) token is not in the provided values.';
       }
 
       $values: map.remove($values, $unsupported-token);
@@ -76,12 +76,12 @@
   $new-tokens: map.get($tokens, 'new-tokens');
   @if $new-tokens {
     @if meta.type-of($new-tokens) != 'map' {
-      @error 'values.validate($new-tokens) must be a map.';
+      @error 'validate.values($new-tokens) must be a map.';
     }
 
     @each $new-token, $new-value in $new-tokens {
       @if map.has-key($values, $new-token) {
-        @warn 'values.validate($new-tokens: (\'#{$new-token}\': \'#{$new-value}\')) already exists. Has it been added to tokens? If so, remove this new token.';
+        @warn 'validate.values($new-tokens: (\'#{$new-token}\': \'#{$new-value}\')) already exists. Has it been added to tokens? If so, remove this new token.';
       }
 
       $values: map.set($values, $new-token, $new-value);
@@ -90,12 +90,12 @@
 
   $supported-tokens: map.get($tokens, 'supported-tokens');
   @if not $supported-tokens or meta.type-of($supported-tokens) != 'list' {
-    @error 'values.validate() must include a $supported-tokens list.';
+    @error 'validate.values() must include a $supported-tokens list.';
   }
 
   @each $token in map.keys($values) {
     @if list.index($supported-tokens, $token) == null {
-      @error 'values.validate($supported-tokens)) is missing the \'#{$token}\' token. Does it need adding to $unsupported-tokens?';
+      @error 'validate.values($supported-tokens)) is missing the \'#{$token}\' token. Does it need adding to $unsupported-tokens?';
     }
   }