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

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

@@ -13,38 +13,98 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-elevated-button';
+@use './v0_172/md-comp-elevated-button';
+@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(),
+$supported-tokens: (
+  // go/keep-sorted start
+  'container-color',
+  'container-elevation',
+  'container-height',
+  'container-shadow-color',
+  'container-shape',
+  'disabled-container-color',
+  'disabled-container-elevation',
+  'disabled-container-opacity',
+  'disabled-label-text-color',
+  'disabled-label-text-opacity',
+  'focus-container-elevation',
+  'focus-label-text-color',
+  'focus-state-layer-color',
+  'focus-state-layer-opacity',
+  'hover-container-elevation',
+  'hover-label-text-color',
+  'hover-state-layer-color',
+  'hover-state-layer-opacity',
+  'label-text-color',
+  'label-text-type',
+  'pressed-container-elevation',
+  'pressed-label-text-color',
+  'pressed-state-layer-color',
+  'pressed-state-layer-opacity',
+  'spacing-leading',
+  'spacing-trailing',
+  'with-icon-disabled-icon-color',
+  'with-icon-disabled-icon-opacity',
+  'with-icon-focus-icon-color',
+  'with-icon-hover-icon-color',
+  'with-icon-icon-color',
+  'with-icon-icon-size',
+  'with-icon-pressed-icon-color',
+  'with-icon-spacing-leading',
+  'with-icon-spacing-trailing',
+  'with-trailing-icon-spacing-leading',
+  'with-trailing-icon-spacing-trailing',
+  // go/keep-sorted end
 );
 
-$_unsupported-tokens: (
+$unsupported-tokens: (
+  // go/keep-sorted start
   'label-text-font',
   'label-text-line-height',
   'label-text-size',
   'label-text-tracking',
-  'label-text-weight'
+  'label-text-weight',
+  // 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(),
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: md-comp-elevated-button.values($deps, $exclude-hardcoded-values);
-  @if not $exclude-hardcoded-values {
-    // TODO(b/198759625): Remove once spacing tokens are formally added
-    $tokens: map.set($tokens, 'spacing-leading', 24px);
-    $tokens: map.set($tokens, 'spacing-trailing', 24px);
-    $tokens: map.set($tokens, 'with-icon-spacing-leading', 16px);
-    $tokens: map.set($tokens, 'with-icon-spacing-trailing', 24px);
-    $tokens: map.set($tokens, 'with-trailing-icon-spacing-leading', 24px);
-    $tokens: map.set($tokens, 'with-trailing-icon-spacing-trailing', 16px);
-  }
+  $tokens: values.validate(
+    md-comp-elevated-button.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens,
+    $new-tokens: (
+      // TODO(b/198759625): Remove once spacing tokens are formally added
+      // go/keep-sorted start
+      'spacing-leading': if($exclude-hardcoded-values, null, 24px),
+      'spacing-trailing': if($exclude-hardcoded-values, null, 24px),
+      'with-icon-spacing-leading': if($exclude-hardcoded-values, null, 16px),
+      'with-icon-spacing-trailing': if($exclude-hardcoded-values, null, 24px),
+      'with-trailing-icon-spacing-leading':
+        if($exclude-hardcoded-values, null, 24px),
+      'with-trailing-icon-spacing-trailing':
+        if($exclude-hardcoded-values, null, 16px),
+      // go/keep-sorted end
+    )
+  );
+
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
+    )
+  );
 
-  $tokens: map.remove($tokens, $_unsupported-tokens...);
   @each $token, $value in $tokens {
     $tokens: map.set(
       $tokens,

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

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-elevated-card';
+@use './v0_172/md-comp-elevated-card';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-elevation.scss

@@ -0,0 +1,28 @@
+//
+// Copyright 2022 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-motion';
+// go/keep-sorted end
+
+$_default: (
+  'md-sys-color': md-sys-color.values-light(),
+  'md-sys-elevation': md-sys-elevation.values(),
+  'md-sys-motion': md-sys-motion.values(),
+);
+
+@function values($deps: $_default, $exclude-hardcoded-values: false) {
+  @return (
+    'duration': if($exclude-hardcoded-values, null, 0s),
+    'easing': map.get($deps, 'md-sys-motion', 'easing-emphasized'),
+    'level': map.get($deps, 'md-sys-elevation', 'level0'),
+    'shadow-color': map.get($deps, 'md-sys-color', 'shadow')
+  );
+}

package/tokens/_md-comp-extended-fab-branded.scss

@@ -12,7 +12,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-extended-fab-branded';
+@use './v0_172/md-comp-extended-fab-branded';
 // go/keep-sorted end
 
 $_default: (
@@ -34,5 +34,12 @@ $_unsupported-tokens: (
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
   @return md-comp-extended-fab-branded.values($deps, $exclude-hardcoded-values);
   $tokens: map.remove($tokens, $_unsupported-tokens...);
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
+    )
+  );
   @return $tokens;
 }

package/tokens/_md-comp-extended-fab-primary.scss

@@ -12,7 +12,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-extended-fab-primary';
+@use './v0_172/md-comp-extended-fab-primary';
 // go/keep-sorted end
 
 $_default: (
@@ -34,5 +34,12 @@ $_unsupported-tokens: (
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
   @return md-comp-extended-fab-primary.values($deps, $exclude-hardcoded-values);
   $tokens: map.remove($tokens, $_unsupported-tokens...);
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
+    )
+  );
   @return $tokens;
 }

package/tokens/_md-comp-extended-fab-secondary.scss

@@ -12,7 +12,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-extended-fab-secondary';
+@use './v0_172/md-comp-extended-fab-secondary';
 // go/keep-sorted end
 
 $_default: (
@@ -37,5 +37,12 @@ $_unsupported-tokens: (
     $exclude-hardcoded-values
   );
   $tokens: map.remove($tokens, $_unsupported-tokens...);
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
+    )
+  );
   @return $tokens;
 }

package/tokens/_md-comp-extended-fab-surface.scss

@@ -12,7 +12,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-extended-fab-surface';
+@use './v0_172/md-comp-extended-fab-surface';
 // go/keep-sorted end
 
 $_default: (
@@ -34,5 +34,12 @@ $_unsupported-tokens: (
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
   @return md-comp-extended-fab-surface.values($deps, $exclude-hardcoded-values);
   $tokens: map.remove($tokens, $_unsupported-tokens...);
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
+    )
+  );
   @return $tokens;
 }

package/tokens/_md-comp-extended-fab-tertiary.scss

@@ -12,7 +12,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-extended-fab-tertiary';
+@use './v0_172/md-comp-extended-fab-tertiary';
 // go/keep-sorted end
 
 $_default: (
@@ -37,5 +37,12 @@ $_unsupported-tokens: (
     $exclude-hardcoded-values
   );
   $tokens: map.remove($tokens, $_unsupported-tokens...);
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
+    )
+  );
   @return $tokens;
 }

package/tokens/_md-comp-fab-branded-large.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-branded-large';
+@use './v0_172/md-comp-fab-branded-large';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-branded.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-branded';
+@use './v0_172/md-comp-fab-branded';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-primary-large.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-primary-large';
+@use './v0_172/md-comp-fab-primary-large';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-primary-small.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-primary-small';
+@use './v0_172/md-comp-fab-primary-small';
 // go/keep-sorted end
 
 $_default: (

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

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-primary';
+@use './v0_172/md-comp-fab-primary';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-secondary-large.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-secondary-large';
+@use './v0_172/md-comp-fab-secondary-large';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-secondary-small.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-secondary-small';
+@use './v0_172/md-comp-fab-secondary-small';
 // go/keep-sorted end
 
 $_default: (

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

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-secondary';
+@use './v0_172/md-comp-fab-secondary';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-surface-large.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-surface-large';
+@use './v0_172/md-comp-fab-surface-large';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-surface-small.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-surface-small';
+@use './v0_172/md-comp-fab-surface-small';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-surface.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-surface';
+@use './v0_172/md-comp-fab-surface';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-tertiary-large.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-tertiary-large';
+@use './v0_172/md-comp-fab-tertiary-large';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-tertiary-small.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-tertiary-small';
+@use './v0_172/md-comp-fab-tertiary-small';
 // go/keep-sorted end
 
 $_default: (

package/tokens/_md-comp-fab-tertiary.scss

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-fab-tertiary';
+@use './v0_172/md-comp-fab-tertiary';
 // go/keep-sorted end
 
 $_default: (

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

@@ -9,7 +9,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-filled-autocomplete';
+@use './v0_172/md-comp-filled-autocomplete';
 // go/keep-sorted end
 
 $_default: (

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

@@ -13,38 +13,98 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-filled-button';
+@use './v0_172/md-comp-filled-button';
+@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(),
+$supported-tokens: (
+  // go/keep-sorted start
+  'container-color',
+  'container-elevation',
+  'container-height',
+  'container-shadow-color',
+  'container-shape',
+  'disabled-container-color',
+  'disabled-container-elevation',
+  'disabled-container-opacity',
+  'disabled-label-text-color',
+  'disabled-label-text-opacity',
+  'focus-container-elevation',
+  'focus-label-text-color',
+  'focus-state-layer-color',
+  'focus-state-layer-opacity',
+  'hover-container-elevation',
+  'hover-label-text-color',
+  'hover-state-layer-color',
+  'hover-state-layer-opacity',
+  'label-text-color',
+  'label-text-type',
+  'pressed-container-elevation',
+  'pressed-label-text-color',
+  'pressed-state-layer-color',
+  'pressed-state-layer-opacity',
+  'spacing-leading',
+  'spacing-trailing',
+  'with-icon-disabled-icon-color',
+  'with-icon-disabled-icon-opacity',
+  'with-icon-focus-icon-color',
+  'with-icon-hover-icon-color',
+  'with-icon-icon-color',
+  'with-icon-icon-size',
+  'with-icon-pressed-icon-color',
+  'with-icon-spacing-leading',
+  'with-icon-spacing-trailing',
+  'with-trailing-icon-spacing-leading',
+  'with-trailing-icon-spacing-trailing',
+  // go/keep-sorted end
 );
 
-$_unsupported-tokens: (
+$unsupported-tokens: (
+  // go/keep-sorted start
   'label-text-font',
   'label-text-line-height',
   'label-text-size',
   'label-text-tracking',
-  'label-text-weight'
+  'label-text-weight',
+  // 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(),
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: md-comp-filled-button.values($deps, $exclude-hardcoded-values);
-  @if not $exclude-hardcoded-values {
-    // TODO(b/198759625): Remove once spacing tokens are formally added
-    $tokens: map.set($tokens, 'spacing-leading', 24px);
-    $tokens: map.set($tokens, 'spacing-trailing', 24px);
-    $tokens: map.set($tokens, 'with-icon-spacing-leading', 16px);
-    $tokens: map.set($tokens, 'with-icon-spacing-trailing', 24px);
-    $tokens: map.set($tokens, 'with-trailing-icon-spacing-leading', 24px);
-    $tokens: map.set($tokens, 'with-trailing-icon-spacing-trailing', 16px);
-  }
+  $tokens: values.validate(
+    md-comp-filled-button.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens,
+    $new-tokens: (
+      // TODO(b/198759625): Remove once spacing tokens are formally added
+      // go/keep-sorted start
+      'spacing-leading': if($exclude-hardcoded-values, null, 24px),
+      'spacing-trailing': if($exclude-hardcoded-values, null, 24px),
+      'with-icon-spacing-leading': if($exclude-hardcoded-values, null, 16px),
+      'with-icon-spacing-trailing': if($exclude-hardcoded-values, null, 24px),
+      'with-trailing-icon-spacing-leading':
+        if($exclude-hardcoded-values, null, 24px),
+      'with-trailing-icon-spacing-trailing':
+        if($exclude-hardcoded-values, null, 16px),
+      // go/keep-sorted end
+    )
+  );
+
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'label-large'),
+    )
+  );
 
-  $tokens: map.remove($tokens, $_unsupported-tokens...);
   @each $token, $value in $tokens {
     $tokens: map.set(
       $tokens,

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

@@ -8,7 +8,7 @@
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-filled-card';
+@use './v0_172/md-comp-filled-card';
 // go/keep-sorted end
 
 $_default: (

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

@@ -7,7 +7,7 @@
 @use './md-sys-color';
 @use './md-sys-shape';
 @use './md-sys-state';
-@use './v0_161/md-comp-filled-icon-button';
+@use './v0_172/md-comp-filled-icon-button';
 // go/keep-sorted end
 
 $_default: (

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

@@ -9,7 +9,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-filled-menu-button';
+@use './v0_172/md-comp-filled-menu-button';
 // go/keep-sorted end
 
 $_default: (

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

@@ -9,7 +9,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-filled-select';
+@use './v0_172/md-comp-filled-select';
 // go/keep-sorted end
 
 $_default: (

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

@@ -11,7 +11,7 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-@use './v0_161/md-comp-filled-text-field';
+@use './v0_172/md-comp-filled-text-field';
 // go/keep-sorted end
 
 $_default: (
@@ -42,5 +42,14 @@ $_unsupported-tokens: (
 @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...);
+  // TODO(b/271876162): remove when tokens compiler emits typescale tokens
+  $tokens: map.merge(
+    $tokens,
+    (
+      'input-text-type': map.get($deps, 'md-sys-typescale', 'body-large'),
+      'label-text-type': map.get($deps, 'md-sys-typescale', 'body-large'),
+      'supporting-text-type': map.get($deps, 'md-sys-typescale', 'body-small'),
+    )
+  );
   @return $tokens;
 }