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

package/tokens/_md-comp-switch.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';
@@ -32,6 +37,10 @@ $supported-tokens: (
   'handle-color',
   'handle-height',
   'handle-shape',
+  'handle-shape-end-end',
+  'handle-shape-end-start',
+  'handle-shape-start-end',
+  'handle-shape-start-start',
   'handle-width',
   'hover-handle-color',
   'hover-icon-color',
@@ -75,6 +84,10 @@ $supported-tokens: (
   'track-outline-color',
   'track-outline-width',
   'track-shape',
+  'track-shape-end-end',
+  'track-shape-end-start',
+  'track-shape-start-end',
+  'track-shape-start-start',
   'track-width',
   'with-icon-handle-height',
   'with-icon-handle-width',
@@ -96,11 +109,23 @@ $_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-switch.values($deps, $exclude-hardcoded-values);
+  $new-tokens: shape.get-new-logical-shape-tokens(
+    $tokens,
+    'handle-shape',
+    'track-shape'
+  );
+
   $tokens: validate.values(
-    md-comp-switch.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)
       'disabled-unselected-handle-color': 'disabled-handle-color',
@@ -137,5 +162,21 @@ $_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 {
+      $shape-tokens: ('handle-shape', 'track-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-switch-#{$shape-token}, #{$value});
+        }
+      }
+
+      $tokens: map.set($tokens, $token, var(--md-switch-#{$token}, #{$value}));
+    }
+  }
+
   @return $tokens;
 }

package/tokens/_md-comp-text-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-shape';
@@ -19,6 +21,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-icon-color',
   'disabled-icon-opacity',
   'disabled-label-text-color',
@@ -65,12 +71,15 @@ $_default: (
   'md-sys-typescale': md-sys-typescale.values(),
 );
 
-@function values($deps: $_default, $exclude-hardcoded-values: false) {
-  $tokens: validate.values(
-    md-comp-text-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-text-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, 12px),
@@ -84,7 +93,14 @@ $_default: (
       'with-trailing-icon-trailing-space':
         if($exclude-hardcoded-values, null, 12px),
       // 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',
@@ -97,5 +113,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-text-button-container-shape, #{$value});
+      }
+
+      $tokens: map.set(
+        $tokens,
+        $token,
+        var(--md-text-button-#{$token}, #{$value})
+      );
+    }
+  }
+
   @return $tokens;
 }

package/tokens/internal/_shape.scss

@@ -0,0 +1,93 @@
+//
+// Copyright 2024 Google LLC
+// SPDX-License-Identifier: Apache-2.0
+//
+
+// go/keep-sorted start
+@use 'sass:list';
+@use 'sass:map';
+@use 'sass:meta';
+// go/keep-sorted end
+
+/// Returns a map of 4 logical tokens (start-start, start-end, end-end,
+/// and end-start) for each of the given shape tokens in the provided token
+/// map.
+///
+/// @example scss
+///   $tokens: ('container-shape': 16px 16px 0px 0px);
+///   $new-tokens: shape.get-new-logical-shape-tokens(
+///     $tokens,
+///     'container-shape'
+///   );
+///   // (
+///   //   'container-shape-start-start': 16px,
+///   //   'container-shape-start-end': 16px,
+///   //   'container-shape-end-end': 0px,
+///   //   'container-shape-end-start': 0px,
+///   // )
+///
+/// @param $tokens A Map of tokens.
+/// @param $shape-tokens One or more shape tokens in the provided map. Each
+///     shape token will add 4 logical shape tokens to the returned map.
+/// @return A map with 4 logical tokens for each provided shape token.
+@function get-new-logical-shape-tokens($tokens, $shape-tokens...) {
+  $new-logical-tokens: ();
+  $logical-suffixes: (
+    // top-left
+    'start-start',
+    // top-right
+    'start-end',
+    // bottom-right
+    'end-end',
+    // bottom-left
+    'end-start'
+  );
+
+  @each $shape-token in $shape-tokens {
+    $shorthand-value: _expand-shorthand-to-list(map.get($tokens, $shape-token));
+
+    @each $logical-suffix in $logical-suffixes {
+      $logical-token: '#{$shape-token}-#{$logical-suffix}';
+      $logical-index: list.index($logical-suffixes, $logical-suffix);
+
+      $new-logical-tokens: map.set(
+        $new-logical-tokens,
+        $logical-token,
+        list.nth($shorthand-value, $logical-index)
+      );
+    }
+  }
+
+  @return $new-logical-tokens;
+}
+
+@function _expand-shorthand-to-list($shorthand) {
+  @if meta.type-of($shorthand) != 'list' or list.length($shorthand) == 1 {
+    @return ($shorthand, $shorthand, $shorthand, $shorthand);
+  }
+
+  @if list.length($shorthand) == 2 {
+    $top-left-and-bottom-right: list.nth($shorthand, 1);
+    $top-right-and-bottom-left: list.nth($shorthand, 2);
+    @return (
+      $top-left-and-bottom-right,
+      $top-right-and-bottom-left,
+      $top-left-and-bottom-right,
+      $top-right-and-bottom-left
+    );
+  }
+
+  @if list.length($shorthand) == 3 {
+    $top-left: list.nth($shorthand, 1);
+    $top-right-and-bottom-left: list.nth($shorthand, 2);
+    $bottom-right: list.nth($shorthand, 3);
+    @return (
+      $top-left,
+      $top-right-and-bottom-left,
+      $bottom-right,
+      $top-right-and-bottom-left
+    );
+  }
+
+  @return $shorthand;
+}

package/tokens/internal/_validate.scss

@@ -95,7 +95,7 @@
 
   @each $token in map.keys($values) {
     @if list.index($supported-tokens, $token) == null {
-      @error 'validate.values($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?';
     }
   }