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

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

@@ -3,21 +3,104 @@
 // 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-extended-fab-branded';
 @use './v0_172/md-comp-fab-branded';
+@use './v0_172/md-comp-fab-branded-large';
+@use './values';
 // go/keep-sorted end
 
+$supported-tokens: (
+  // go/keep-sorted start
+  'container-color',
+  'container-elevation',
+  'container-height',
+  'container-shadow-color',
+  'container-shape',
+  'container-width',
+  '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',
+  'icon-size',
+  'label-text-color',
+  'label-text-type',
+  'large-container-height',
+  'large-container-shape',
+  'large-container-width',
+  'large-icon-size',
+  'lowered-container-color',
+  'lowered-container-elevation',
+  'lowered-focus-container-elevation',
+  'lowered-hover-container-elevation',
+  'lowered-pressed-container-elevation',
+  'pressed-container-elevation',
+  'pressed-label-text-color',
+  'pressed-state-layer-color',
+  'pressed-state-layer-opacity',
+  // go/keep-sorted end
+);
+
+@function _get-new-tokens($deps, $exclude-hardcoded-values) {
+  $large-tokens: md-comp-fab-branded-large.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $extended-branded-tokens: md-comp-extended-fab-branded.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+
+  @return (
+    'focus-label-text-color':
+      map.get($extended-branded-tokens, 'focus-label-text-color'),
+    'hover-label-text-color':
+      map.get($extended-branded-tokens, 'hover-label-text-color'),
+    'label-text-color': map.get($extended-branded-tokens, 'label-text-color'),
+    'label-text-type': map.get($extended-branded-tokens, 'label-text-type'),
+    'large-container-height': map.get($large-tokens, 'container-height'),
+    'large-container-shape': map.get($large-tokens, 'container-shape'),
+    'large-container-width': map.get($large-tokens, 'container-width'),
+    'large-icon-size': map.get($large-tokens, 'icon-size'),
+    'pressed-label-text-color':
+      map.get($extended-branded-tokens, 'pressed-label-text-color')
+  );
+}
+
 $_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) {
-  @return md-comp-fab-branded.values($deps, $exclude-hardcoded-values);
+  $tokens: values.validate(
+    md-comp-fab-branded.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens,
+    $new-tokens: _get-new-tokens($deps, $exclude-hardcoded-values)
+  );
+
+  // 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.scss

@@ -0,0 +1,249 @@
+//
+// 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-extended-fab-primary';
+@use './v0_172/md-comp-extended-fab-secondary';
+@use './v0_172/md-comp-extended-fab-surface';
+@use './v0_172/md-comp-extended-fab-tertiary';
+@use './v0_172/md-comp-fab-primary';
+@use './v0_172/md-comp-fab-secondary';
+@use './v0_172/md-comp-fab-surface';
+@use './v0_172/md-comp-fab-surface-large';
+@use './v0_172/md-comp-fab-surface-small';
+@use './v0_172/md-comp-fab-tertiary';
+@use './values';
+// go/keep-sorted end
+
+$supported-tokens: (
+  // go/keep-sorted start
+  'container-color',
+  'container-elevation',
+  'container-height',
+  'container-shadow-color',
+  'container-shape',
+  'container-width',
+  'focus-container-elevation',
+  'focus-icon-color',
+  'focus-label-text-color',
+  'focus-state-layer-color',
+  'focus-state-layer-opacity',
+  'hover-container-elevation',
+  'hover-icon-color',
+  'hover-label-text-color',
+  'hover-state-layer-color',
+  'hover-state-layer-opacity',
+  'icon-color',
+  'icon-size',
+  'label-text-color',
+  'label-text-type',
+  'large-container-height',
+  'large-container-shape',
+  'large-container-width',
+  'large-icon-size',
+  'lowered-container-color',
+  'lowered-container-elevation',
+  'lowered-focus-container-elevation',
+  'lowered-hover-container-elevation',
+  'lowered-pressed-container-elevation',
+  'pressed-container-elevation',
+  'pressed-icon-color',
+  'pressed-label-text-color',
+  'pressed-state-layer-color',
+  'pressed-state-layer-opacity',
+  'primary-container-color',
+  'primary-focus-icon-color',
+  'primary-focus-label-text-color',
+  'primary-focus-state-layer-color',
+  'primary-hover-icon-color',
+  'primary-hover-label-text-color',
+  'primary-hover-state-layer-color',
+  'primary-icon-color',
+  'primary-label-text-color',
+  'primary-pressed-icon-color',
+  'primary-pressed-label-text-color',
+  'primary-pressed-state-layer-color',
+  'secondary-container-color',
+  'secondary-focus-icon-color',
+  'secondary-focus-label-text-color',
+  'secondary-focus-state-layer-color',
+  'secondary-hover-icon-color',
+  'secondary-hover-label-text-color',
+  'secondary-hover-state-layer-color',
+  'secondary-icon-color',
+  'secondary-label-text-color',
+  'secondary-pressed-icon-color',
+  'secondary-pressed-label-text-color',
+  'secondary-pressed-state-layer-color',
+  'small-container-height',
+  'small-container-shape',
+  'small-container-width',
+  'small-icon-size',
+  'tertiary-container-color',
+  'tertiary-focus-icon-color',
+  'tertiary-focus-label-text-color',
+  'tertiary-focus-state-layer-color',
+  'tertiary-hover-icon-color',
+  'tertiary-hover-label-text-color',
+  'tertiary-hover-state-layer-color',
+  'tertiary-icon-color',
+  'tertiary-label-text-color',
+  'tertiary-pressed-icon-color',
+  'tertiary-pressed-label-text-color',
+  'tertiary-pressed-state-layer-color',
+  // go/keep-sorted end
+);
+
+@function _get-new-tokens($deps, $exclude-hardcoded-values) {
+  $large-tokens: md-comp-fab-surface-large.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $small-tokens: md-comp-fab-surface-small.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $primary-tokens: md-comp-fab-primary.values($deps, $exclude-hardcoded-values);
+  $secondary-tokens: md-comp-fab-secondary.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $tertiary-tokens: md-comp-fab-tertiary.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $extended-surface-tokens: md-comp-extended-fab-surface.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $extended-primary-tokens: md-comp-extended-fab-primary.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $extended-secondary-tokens: md-comp-extended-fab-secondary.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+  $extended-tertiary-tokens: md-comp-extended-fab-tertiary.values(
+    $deps,
+    $exclude-hardcoded-values
+  );
+
+  @return (
+    // go/keep-sorted start
+    'focus-label-text-color':
+      map.get($extended-surface-tokens, 'focus-label-text-color'),
+    'hover-label-text-color':
+      map.get($extended-surface-tokens, 'hover-label-text-color'),
+    'label-text-color': map.get($extended-surface-tokens, 'label-text-color'),
+    'label-text-type': map.get($extended-surface-tokens, 'label-text-type'),
+    'large-container-height': map.get($large-tokens, 'container-height'),
+    'large-container-shape': map.get($large-tokens, 'container-shape'),
+    'large-container-width': map.get($large-tokens, 'container-width'),
+    'large-icon-size': map.get($large-tokens, 'icon-size'),
+    'pressed-label-text-color':
+      map.get($extended-surface-tokens, 'pressed-label-text-color'),
+    'primary-container-color': map.get($primary-tokens, 'container-color'),
+    'primary-focus-icon-color': map.get($primary-tokens, 'focus-icon-color'),
+    'primary-focus-label-text-color':
+      map.get($extended-primary-tokens, 'focus-label-text-color'),
+    'primary-focus-state-layer-color':
+      map.get($primary-tokens, 'focus-state-layer-color'),
+    'primary-hover-icon-color': map.get($primary-tokens, 'hover-icon-color'),
+    'primary-hover-label-text-color':
+      map.get($extended-primary-tokens, 'hover-label-text-color'),
+    'primary-hover-state-layer-color':
+      map.get($primary-tokens, 'hover-state-layer-color'),
+    'primary-icon-color': map.get($primary-tokens, 'icon-color'),
+    'primary-label-text-color':
+      map.get($extended-primary-tokens, 'label-text-color'),
+    'primary-pressed-icon-color': map.get($primary-tokens, 'pressed-icon-color'),
+    'primary-pressed-label-text-color':
+      map.get($extended-primary-tokens, 'pressed-label-text-color'),
+    'primary-pressed-state-layer-color':
+      map.get($primary-tokens, 'pressed-state-layer-color'),
+    'secondary-container-color': map.get($secondary-tokens, 'container-color'),
+    'secondary-focus-icon-color': map.get($secondary-tokens, 'focus-icon-color'),
+    'secondary-focus-label-text-color':
+      map.get($extended-secondary-tokens, 'focus-label-text-color'),
+    'secondary-focus-state-layer-color':
+      map.get($secondary-tokens, 'focus-state-layer-color'),
+    'secondary-hover-icon-color': map.get($secondary-tokens, 'hover-icon-color'),
+    'secondary-hover-label-text-color':
+      map.get($extended-secondary-tokens, 'hover-label-text-color'),
+    'secondary-hover-state-layer-color':
+      map.get($secondary-tokens, 'hover-state-layer-color'),
+    'secondary-icon-color': map.get($secondary-tokens, 'icon-color'),
+    'secondary-label-text-color':
+      map.get($extended-secondary-tokens, 'label-text-color'),
+    'secondary-pressed-icon-color':
+      map.get($secondary-tokens, 'pressed-icon-color'),
+    'secondary-pressed-label-text-color':
+      map.get($extended-secondary-tokens, 'pressed-label-text-color'),
+    'secondary-pressed-state-layer-color':
+      map.get($secondary-tokens, 'pressed-state-layer-color'),
+    'small-container-height': map.get($small-tokens, 'container-height'),
+    'small-container-shape': map.get($small-tokens, 'container-shape'),
+    'small-container-width': map.get($small-tokens, 'container-width'),
+    'small-icon-size': map.get($small-tokens, 'icon-size'),
+    'tertiary-container-color': map.get($tertiary-tokens, 'container-color'),
+    'tertiary-focus-icon-color': map.get($tertiary-tokens, 'focus-icon-color'),
+    'tertiary-focus-label-text-color':
+      map.get($extended-tertiary-tokens, 'focus-label-text-color'),
+    'tertiary-focus-state-layer-color':
+      map.get($tertiary-tokens, 'focus-state-layer-color'),
+    'tertiary-hover-icon-color': map.get($tertiary-tokens, 'hover-icon-color'),
+    'tertiary-hover-label-text-color':
+      map.get($extended-tertiary-tokens, 'hover-label-text-color'),
+    'tertiary-hover-state-layer-color':
+      map.get($tertiary-tokens, 'hover-state-layer-color'),
+    'tertiary-icon-color': map.get($tertiary-tokens, 'icon-color'),
+    'tertiary-label-text-color':
+      map.get($extended-tertiary-tokens, 'label-text-color'),
+    'tertiary-pressed-icon-color':
+      map.get($tertiary-tokens, 'pressed-icon-color'),
+    'tertiary-pressed-label-text-color':
+      map.get($extended-tertiary-tokens, 'pressed-label-text-color'),
+    'tertiary-pressed-state-layer-color':
+      map.get($tertiary-tokens, 'pressed-state-layer-color'),
+    // 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-fab-surface.values($deps, $exclude-hardcoded-values);
+
+  $tokens: values.validate(
+    $tokens,
+    $supported-tokens: $supported-tokens,
+    $new-tokens: _get-new-tokens($deps, $exclude-hardcoded-values)
+  );
+
+  // 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-filled-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,14 +104,5 @@ $_default: (
     )
   );
 
-  @each $token, $value in $tokens {
-    $tokens: map.set(
-      $tokens,
-      $token,
-      var(--md-filled-button-#{$token}, #{$value})
-    );
-  }
-
-  $tokens: shape.resolve-tokens($tokens, 'container-shape');
   @return $tokens;
 }

package/{field/lib → tokens}/_md-comp-filled-field.scss

@@ -7,23 +7,103 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
-@use '../../tokens';
+@use './md-sys-color';
+@use './md-sys-shape';
+@use './md-sys-state';
+@use './md-sys-typescale';
+@use './v0_172/md-comp-filled-text-field';
+@use './values';
 // go/keep-sorted end
 
-$_default-deps: (
-  'md-sys-color': tokens.md-sys-color-values-light(),
-  'md-sys-shape': tokens.md-sys-shape-values(),
-  'md-sys-state': tokens.md-sys-state-values(),
-  'md-sys-typescale': tokens.md-sys-typescale-values(),
+$supported-tokens: (
+  // go/keep-sorted start
+  'active-indicator-color',
+  'active-indicator-height',
+  'container-color',
+  'container-padding-horizontal',
+  'container-padding-vertical',
+  'container-shape',
+  'content-color',
+  'content-type',
+  'disabled-active-indicator-color',
+  'disabled-active-indicator-height',
+  'disabled-active-indicator-opacity',
+  'disabled-container-color',
+  'disabled-container-opacity',
+  'disabled-content-color',
+  'disabled-content-opacity',
+  'disabled-label-text-color',
+  'disabled-label-text-opacity',
+  'disabled-leading-content-color',
+  'disabled-leading-content-opacity',
+  'disabled-supporting-text-color',
+  'disabled-supporting-text-opacity',
+  'disabled-trailing-content-color',
+  'disabled-trailing-content-opacity',
+  'error-active-indicator-color',
+  'error-content-color',
+  'error-focus-active-indicator-color',
+  'error-focus-content-color',
+  'error-focus-label-text-color',
+  'error-focus-leading-content-color',
+  'error-focus-supporting-text-color',
+  'error-focus-trailing-content-color',
+  'error-hover-active-indicator-color',
+  'error-hover-content-color',
+  'error-hover-label-text-color',
+  'error-hover-leading-content-color',
+  'error-hover-state-layer-color',
+  'error-hover-state-layer-opacity',
+  'error-hover-supporting-text-color',
+  'error-hover-trailing-content-color',
+  'error-label-text-color',
+  'error-leading-content-color',
+  'error-supporting-text-color',
+  'error-trailing-content-color',
+  'focus-active-indicator-color',
+  'focus-active-indicator-height',
+  'focus-content-color',
+  'focus-label-text-color',
+  'focus-leading-content-color',
+  'focus-supporting-text-color',
+  'focus-trailing-content-color',
+  'hover-active-indicator-color',
+  'hover-active-indicator-height',
+  'hover-content-color',
+  'hover-label-text-color',
+  'hover-leading-content-color',
+  'hover-state-layer-color',
+  'hover-state-layer-opacity',
+  'hover-supporting-text-color',
+  'hover-trailing-content-color',
+  'label-text-color',
+  'label-text-populated-line-height',
+  'label-text-populated-size',
+  'label-text-type',
+  'leading-content-color',
+  'supporting-text-color',
+  'supporting-text-padding',
+  'supporting-text-padding-top',
+  'supporting-text-type',
+  'trailing-content-color',
+  'with-label-container-padding-vertical',
+  // go/keep-sorted end
 );
 
-@function values($deps: $_default-deps, $exclude-hardcoded-values: false) {
-  $text-field: tokens.md-comp-filled-text-field-values(
+$_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) {
+  $text-field: md-comp-filled-text-field.values(
     $deps,
     $exclude-hardcoded-values
   );
 
-  @return (
+  $tokens: (
     // go/keep-sorted start
     'active-indicator-color': map.get($text-field, 'active-indicator-color'),
     'active-indicator-height': map.get($text-field, 'active-indicator-height'),
@@ -142,4 +222,6 @@ $_default-deps: (
       if($exclude-hardcoded-values, null, 8px),
     // go/keep-sorted end
   );
+
+  @return values.validate($tokens, $supported-tokens: $supported-tokens);
 }

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

@@ -8,8 +8,48 @@
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './v0_172/md-comp-filled-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,5 +57,10 @@ $_default: (
 );
 
 @function values($deps: $_default, $exclude-hardcoded-values: false) {
-  @return md-comp-filled-icon-button.values($deps, $exclude-hardcoded-values);
+  $tokens: values.validate(
+    md-comp-filled-icon-button.values($deps, $exclude-hardcoded-values),
+    $supported-tokens: $supported-tokens
+  );
+
+  @return $tokens;
 }