@material/web 1.2.0 → 1.2.1-nightly.6ecda49.0

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

@@ -5,8 +5,10 @@
 
 // go/keep-sorted start
 @use 'sass:map';
+@use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/shape';
 @use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
@@ -20,6 +22,10 @@ $supported-tokens: (
   // go/keep-sorted start
   'container-height',
   'container-shape',
+  'container-shape-end-end',
+  'container-shape-end-start',
+  'container-shape-start-end',
+  'container-shape-start-start',
   'disabled-label-text-color',
   'disabled-label-text-opacity',
   'disabled-leading-icon-color',
@@ -85,18 +91,28 @@ $_default: (
   'md-sys-typescale': md-sys-typescale.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: validate.values(
-    md-comp-assist-chip.values($deps, $exclude-hardcoded-values),
-    $supported-tokens: $supported-tokens,
-    $unsupported-tokens: $unsupported-tokens,
-    $new-tokens: (
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
+  $tokens: md-comp-assist-chip.values($deps, $exclude-hardcoded-values);
+  $new-tokens: map.merge(
+    shape.get-new-logical-shape-tokens($tokens, 'container-shape'),
+    (
       'leading-space': if($exclude-hardcoded-values, null, 16px),
       'trailing-space': if($exclude-hardcoded-values, null, 16px),
       'icon-label-space': if($exclude-hardcoded-values, null, 8px),
       'with-leading-icon-leading-space':
         if($exclude-hardcoded-values, null, 8px),
-    ),
+    )
+  );
+
+  $tokens: validate.values(
+    $tokens,
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens,
+    $new-tokens: $new-tokens,
     $renamed-tokens: (
       // Remove "flat-*" prefix (b/275577569)
       'flat-container-elevation': 'container-elevation',
@@ -118,5 +134,22 @@ $_default: (
     )
   );
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      @if string.index($token, 'container-shape-') == 1 {
+        // Add fallback to shorthand for logical shape properties.
+        $value: var(--md-assist-chip-container-shape, #{$value});
+      }
+
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-assist-chip-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-badge.scss

@@ -21,8 +21,21 @@ $_default: (
 
 $_unsupported-tokens: ('large-label-text-tracking', 'large-label-text-type');
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
   $tokens: md-comp-badge.values($deps, $exclude-hardcoded-values);
   $tokens: map.remove($tokens, $_unsupported-tokens...);
+
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      $tokens: map.set($tokens, $token, var(--md-badge-#{$token}, #{$value}));
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-checkbox.scss

@@ -4,6 +4,11 @@
 //
 
 // go/keep-sorted start
+@use 'sass:map';
+@use 'sass:string';
+// go/keep-sorted end
+// go/keep-sorted start
+@use './internal/shape';
 @use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-shape';
@@ -14,6 +19,10 @@
 $supported-tokens: (
   // go/keep-sorted start
   'container-shape',
+  'container-shape-end-end',
+  'container-shape-end-start',
+  'container-shape-start-end',
+  'container-shape-start-start',
   'container-size',
   'disabled-container-opacity',
   'disabled-outline-color',
@@ -89,11 +98,19 @@ $_default: (
   'md-sys-state': md-sys-state.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
+  $tokens: md-comp-checkbox.values($deps, $exclude-hardcoded-values);
+  $new-tokens: shape.get-new-logical-shape-tokens($tokens, 'container-shape');
+
   $tokens: validate.values(
-    md-comp-checkbox.values($deps, $exclude-hardcoded-values),
+    $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
+    $new-tokens: $new-tokens,
     $renamed-tokens: (
       // Remove default "unselected" prefix (b/292244480)
       'unselected-disabled-container-opacity': 'disabled-container-opacity',
@@ -120,5 +137,22 @@ $_default: (
     )
   );
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      @if string.index($token, 'container-shape-') == 1 {
+        // Add fallback to shorthand for logical shape properties.
+        $value: var(--md-checkbox-container-shape, #{$value});
+      }
+
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-checkbox-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-circular-progress.scss

@@ -38,7 +38,11 @@ $_default: (
   'md-sys-shape': md-sys-shape.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
   $tokens: validate.values(
     md-comp-circular-progress-indicator.values(
       $deps,
@@ -61,5 +65,17 @@ $_default: (
     );
   }
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-circular-progress-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-dialog.scss

@@ -5,8 +5,10 @@
 
 // go/keep-sorted start
 @use 'sass:map';
+@use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/shape';
 @use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
@@ -20,6 +22,10 @@ $supported-tokens: (
   // go/keep-sorted start
   'container-color',
   'container-shape',
+  'container-shape-end-end',
+  'container-shape-end-start',
+  'container-shape-start-end',
+  'container-shape-start-start',
   'headline-color',
   'headline-font',
   'headline-line-height',
@@ -72,11 +78,18 @@ $unsupported-tokens: (
   // go/keep-sorted end
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
+  $tokens: md-comp-dialog.values($deps, $exclude-hardcoded-values);
+  $new-tokens: shape.get-new-logical-shape-tokens($tokens, 'container-shape');
   $tokens: validate.values(
-    md-comp-dialog.values($deps, $exclude-hardcoded-values),
+    $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
+    $new-tokens: $new-tokens,
     $renamed-tokens: (
       // Remove "with-*" prefixes (b/273534858)
       'with-icon-icon-color': 'icon-color',
@@ -84,5 +97,18 @@ $unsupported-tokens: (
     )
   );
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      @if string.index($token, 'container-shape-') == 1 {
+        // Add fallback to shorthand for logical shape properties.
+        $value: var(--md-dialog-container-shape, #{$value});
+      }
+
+      $tokens: map.set($tokens, $token, var(--md-dialog-#{$token}, #{$value}));
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-divider.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 './internal/validate';
 @use './md-sys-color';
@@ -20,9 +23,23 @@ $_default: (
   'md-sys-color': md-sys-color.values-light(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
-  @return validate.values(
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
+  $tokens: validate.values(
     md-comp-divider.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens
   );
+
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      $tokens: map.set($tokens, $token, var(--md-divider-#{$token}, #{$value}));
+    }
+  }
+
+  @return $tokens;
 }

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

@@ -5,8 +5,10 @@
 
 // go/keep-sorted start
 @use 'sass:map';
+@use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/shape';
 @use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
@@ -23,6 +25,10 @@ $supported-tokens: (
   'container-height',
   'container-shadow-color',
   'container-shape',
+  'container-shape-end-end',
+  'container-shape-end-start',
+  'container-shape-start-end',
+  'container-shape-start-start',
   'disabled-container-color',
   'disabled-container-elevation',
   'disabled-container-opacity',
@@ -76,12 +82,15 @@ $_default: (
   'md-sys-typescale': md-sys-typescale.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: validate.values(
-    md-comp-elevated-button.values($deps, $exclude-hardcoded-values),
-    $supported-tokens: $supported-tokens,
-    $unsupported-tokens: $unsupported-tokens,
-    $new-tokens: (
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
+  $tokens: md-comp-elevated-button.values($deps, $exclude-hardcoded-values);
+  $new-tokens: map.merge(
+    shape.get-new-logical-shape-tokens($tokens, 'container-shape'),
+    (
       // b/198759625 - Remove once spacing tokens are formally added
       // go/keep-sorted start
       'leading-space': if($exclude-hardcoded-values, null, 24px),
@@ -95,7 +104,14 @@ $_default: (
       'with-trailing-icon-trailing-space':
         if($exclude-hardcoded-values, null, 16px),
       // go/keep-sorted end
-    ),
+    )
+  );
+
+  $tokens: validate.values(
+    $tokens,
+    $supported-tokens: $supported-tokens,
+    $unsupported-tokens: $unsupported-tokens,
+    $new-tokens: $new-tokens,
     $renamed-tokens: (
       // Remove "with-*" prefixes (b/273534858)
       'with-icon-disabled-icon-color': 'disabled-icon-color',
@@ -108,5 +124,22 @@ $_default: (
     )
   );
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      @if string.index($token, 'container-shape-') == 1 {
+        // Add fallback to shorthand for logical shape properties.
+        $value: var(--md-elevated-button-container-shape, #{$value});
+      }
+
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-elevated-button-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-elevated-card.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 './internal/validate';
 @use './md-sys-color';
@@ -52,12 +55,28 @@ $_default: (
   'md-sys-state': md-sys-state.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
   $tokens: validate.values(
     md-comp-elevated-card.values($deps, $exclude-hardcoded-values),
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens
   );
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-elevated-card-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-elevation.scss

@@ -24,10 +24,27 @@ $_default: (
   'md-sys-elevation': md-sys-elevation.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
   $tokens: (
     'level': map.get($deps, 'md-sys-elevation', 'level0'),
     'shadow-color': map.get($deps, 'md-sys-color', 'shadow'),
   );
+
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-elevation-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return validate.values($tokens, $supported-tokens: $supported-tokens);
 }

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

@@ -5,8 +5,10 @@
 
 // go/keep-sorted start
 @use 'sass:map';
+@use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/shape';
 @use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
@@ -25,6 +27,10 @@ $supported-tokens: (
   'container-height',
   'container-shadow-color',
   'container-shape',
+  'container-shape-end-end',
+  'container-shape-end-start',
+  'container-shape-start-end',
+  'container-shape-start-start',
   'container-width',
   'focus-container-elevation',
   'focus-label-text-color',
@@ -40,6 +46,10 @@ $supported-tokens: (
   'label-text-weight',
   'large-container-height',
   'large-container-shape',
+  'large-container-shape-end-end',
+  'large-container-shape-end-start',
+  'large-container-shape-start-end',
+  'large-container-shape-start-start',
   'large-container-width',
   'large-icon-size',
   'lowered-container-color',
@@ -99,13 +109,49 @@ $_default: (
   'md-sys-typescale': md-sys-typescale.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
+  $tokens: md-comp-fab-branded.values($deps, $exclude-hardcoded-values);
+  $new-tokens: _get-new-tokens($deps, $exclude-hardcoded-values);
+  $new-tokens: map.merge(
+    $new-tokens,
+    shape.get-new-logical-shape-tokens($tokens, 'container-shape')
+  );
+
+  $new-tokens: map.merge(
+    $new-tokens,
+    shape.get-new-logical-shape-tokens($new-tokens, 'large-container-shape')
+  );
+
   $tokens: validate.values(
-    md-comp-fab-branded.values($deps, $exclude-hardcoded-values),
+    $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
-    $new-tokens: _get-new-tokens($deps, $exclude-hardcoded-values)
+    $new-tokens: $new-tokens
   );
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      $shape-tokens: ('container-shape', 'large-container-shape');
+      @each $shape-token in $shape-tokens {
+        @if string.index($token, '#{$shape-token}-') == 1 {
+          // Add fallback to shorthand for logical shape properties.
+          $value: var(--md-fab-branded-#{$shape-token}, #{$value});
+        }
+      }
+
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-fab-branded-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-fab.scss

@@ -5,8 +5,10 @@
 
 // go/keep-sorted start
 @use 'sass:map';
+@use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './internal/shape';
 @use './internal/validate';
 @use './md-sys-color';
 @use './md-sys-elevation';
@@ -32,6 +34,10 @@ $supported-tokens: (
   'container-height',
   'container-shadow-color',
   'container-shape',
+  'container-shape-end-end',
+  'container-shape-end-start',
+  'container-shape-start-end',
+  'container-shape-start-start',
   'container-width',
   'focus-container-elevation',
   'focus-icon-color',
@@ -50,6 +56,10 @@ $supported-tokens: (
   'label-text-weight',
   'large-container-height',
   'large-container-shape',
+  'large-container-shape-end-end',
+  'large-container-shape-end-start',
+  'large-container-shape-start-end',
+  'large-container-shape-start-start',
   'large-container-width',
   'large-icon-size',
   'lowered-container-color',
@@ -86,6 +96,10 @@ $supported-tokens: (
   'secondary-pressed-state-layer-color',
   'small-container-height',
   'small-container-shape',
+  'small-container-shape-end-end',
+  'small-container-shape-end-start',
+  'small-container-shape-start-end',
+  'small-container-shape-start-start',
   'small-container-width',
   'small-icon-size',
   'tertiary-container-color',
@@ -231,15 +245,54 @@ $_default: (
   'md-sys-typescale': md-sys-typescale.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
+@function values(
+  $deps: $_default,
+  $exclude-hardcoded-values: false,
+  $exclude-custom-properties: true
+) {
   $tokens: md-comp-fab-surface.values($deps, $exclude-hardcoded-values);
+  $new-tokens: _get-new-tokens($deps, $exclude-hardcoded-values);
+  $new-tokens: map.merge(
+    $new-tokens,
+    shape.get-new-logical-shape-tokens($tokens, 'container-shape')
+  );
+
+  $new-tokens: map.merge(
+    $new-tokens,
+    shape.get-new-logical-shape-tokens(
+      $new-tokens,
+      'large-container-shape',
+      'small-container-shape'
+    )
+  );
 
   $tokens: validate.values(
     $tokens,
     $supported-tokens: $supported-tokens,
     $unsupported-tokens: $unsupported-tokens,
-    $new-tokens: _get-new-tokens($deps, $exclude-hardcoded-values)
+    $new-tokens: $new-tokens
   );
 
+  // Default to `$exclude-custom-properties: false` in the next breaking change.
+  // See b/321816473.
+  @if not $exclude-custom-properties {
+    @each $token, $value in $tokens {
+      $shape-tokens: (
+        'container-shape',
+        'large-container-shape',
+        'small-container-shape'
+      );
+
+      @each $shape-token in $shape-tokens {
+        @if string.index($token, '#{$shape-token}-') == 1 {
+          // Add fallback to shorthand for logical shape properties.
+          $value: var(--md-fab-#{$shape-token}, #{$value});
+        }
+      }
+
+      $tokens: map.set($tokens, $token, var(--md-fab-#{$token}, #{$value}));
+    }
+  }
+
   @return $tokens;
 }