@angular/material 20.0.0-rc.1 → 20.0.0-rc.2

package/core/tokens/_token-utils.scss

@@ -1,55 +1,8 @@
-@use '../style/elevation';
 @use '../style/sass-utils';
-@use './m3-system';
 @use 'sass:list';
-@use 'sass:meta';
 @use 'sass:map';
 @use 'sass:string';
 
-$_tokens: null;
-$_component-prefix: null;
-$_system-fallbacks: m3-system.create-system-fallbacks();
-$_direct-system-fallbacks: ();
-
-// Sets the token prefix and map to use when creating token slots.
-@mixin use-tokens($prefix, $tokens, $direct-system-fallbacks: null) {
-  $_component-prefix: $prefix !global;
-  $_tokens: $tokens !global;
-
-  // Direct system fallbacks are a map of base, color, typography, and density tokens. To simplify
-  // lookup, flatten these token groups into a single map.
-  @if $direct-system-fallbacks {
-    $_direct-system-fallbacks: () !global;
-    @each $tokens in map.values($direct-system-fallbacks) {
-      @each $token, $value in $tokens {
-        $_direct-system-fallbacks: map.set($_direct-system-fallbacks, $token, $value) !global;
-      }
-    }
-  }
-
-  @content;
-
-  $_component-prefix: null !global;
-  $_tokens: null !global;
-  $_direct-system-fallbacks: () !global;
-}
-
-// Combines a prefix and a string to generate a CSS variable name for a token.
-@function _create-var-name($prefix, $token) {
-  @if $prefix == null or $token == null {
-    @error 'Must specify both prefix and name when generating token';
-  }
-
-  $string-prefix: '';
-
-  // Prefixes are lists so we need to combine them.
-  @each $part in $prefix {
-    $string-prefix: if($string-prefix == '', $part, '#{$string-prefix}-#{$part}');
-  }
-
-  @return string.unquote('--#{$string-prefix}-#{$token}');
-}
-
 // Creates a CSS variable, including the fallback if provided.
 @function _create-var($name, $fallback: null) {
   @if ($fallback) {
@@ -59,194 +12,98 @@ $_direct-system-fallbacks: ();
   }
 }
 
-// Gets the value of the token given the current global context state.
-@function _get-token-value($token, $fallback) {
-  $var-name: _create-var-name($_component-prefix, $token);
-  $fallback: _get-token-fallback($token, $fallback);
-  @return _create-var($var-name, $fallback);
+// Returns a list of overrides for the given M3 get-tokens mixin and prefix. Each token has its
+// prefix removed since the overrides API expects its absence. The returned map includes "all" for
+// all override tokens, and also the subsets with keys base, color, typography, and density.
+@function get-overrides($tokens, $prefix) {
+  $base: remove-token-prefixes(map.get($tokens, base), $prefix);
+  $color: remove-token-prefixes(map.get($tokens, color), $prefix);
+  $typography: remove-token-prefixes(map.get($tokens, typography), $prefix);
+  $density: remove-token-prefixes(map.get($tokens, density), $prefix);
+  $all: ();
+  @each $map in ($base, $color, $typography, $density) {
+    $all: map.merge($all, $map);
+  }
+
+  @return (
+    all: $all,
+    base: $base,
+    color: $color,
+    typography: $typography,
+    density: $density,
+  );
 }
 
-// Assertion mixin that throws an error if the global state has not been set up by wrapping
-// calls with `use-tokens`.
-@function _assert-use-tokens($token) {
-  @if $_component-prefix == null or $_tokens == null {
-    @error 'Function was not called within a wrapping call of `use-tokens`';
+// Removes a prefix from each component token in the provided map of prefixed tokens.
+@function remove-token-prefixes($prefixed-tokens: (), $prefix) {
+  $tokens: ();
+  @each $prefixed-token, $value in $prefixed-tokens {
+    $token: string.slice($prefixed-token, string.length($prefix) + 2);
+    $tokens: map.set($tokens, $token, $value);
   }
-  @if not map.has-key($_tokens, $token) {
-    @error 'Token #{$token} does not exist. Configured tokens are: #{map.keys($_tokens)}';
-  }
-
-  @return true;
+  @return $tokens;
 }
 
 // Returns the token slot value.
 // Accepts an optional fallback parameter to include in the CSS variable.
 // If $fallback is `true`, then use the tokens map to get the fallback.
-// TODO: Remove the use case where we accept "true" and handle any failing client screenshots
-@function slot($token, $fallback: null) {
-  $_assert: _assert-use-tokens($token);
-  @return _get-token-value($token, $fallback);
-}
-
-// Returns the name of a token including the current prefix. Intended to be used in calculations
-// involving tokens. `create-token-slot` should be used when outputting tokens.
-@function get-token-variable-name($token) {
-  $_assert: _assert-use-tokens($token);
-  @return _create-var-name($_component-prefix, $token);
-}
-
-// Gets the token's fallback value. Prefers adding a system-level fallback if one exists, otherwise
-// use the provided fallback.
-@function _get-token-fallback($token, $fallback: null) {
-  // If the $fallback is `true`, this is the component's signal to use the current token map value
-  @if ($fallback == true) {
-    $fallback: map.get($_tokens, $token);
-  }
-
-  $direct-sys-fallback: map.get($_direct-system-fallbacks, $token);
-  @if ($direct-sys-fallback) {
-    @if (sass-utils.is-css-var-name($direct-sys-fallback)) {
-      @return _create-var($direct-sys-fallback, $fallback);
+@function slot($token, $fallbacks, $fallback: null) {
+  // Fallbacks are a map of base, color, typography, and density tokens. To simplify
+  // lookup, flatten these token groups into a single map.
+  $fallbacks-flattened: ();
+  @each $tokens in map.values($fallbacks) {
+    @each $token, $value in $tokens {
+      $fallbacks-flattened: map.set($fallbacks-flattened, $token, $value);
     }
-    @return $direct-sys-fallback;
   }
-
-  // Check whether there's a system-level fallback. If not, return the optional
-  // provided fallback (otherwise null).
-  $sys-fallback: map.get($_system-fallbacks, $_component-prefix, $token);
-  @if (not $sys-fallback) {
-    @return $fallback;
+  @if not map.has-key($fallbacks-flattened, $token) {
+    @error 'Token #{$token} does not exist. Configured tokens are:' +
+        #{map.keys($fallbacks-flattened)};
   }
 
+  $sys-fallback: map.get($fallbacks-flattened, $token);
   @if (sass-utils.is-css-var-name($sys-fallback)) {
-    @return _create-var($sys-fallback, $fallback);
+    $sys-fallback: _create-var($sys-fallback, $fallback);
   }
 
-  @return $sys-fallback;
+  @return _create-var(--mat-#{$token}, $sys-fallback);
 }
 
-// Outputs a map of tokens under a specific prefix.
-@mixin create-token-values($prefix, $tokens) {
-  @include _create-token-values-internal($prefix, $tokens, false);
+// Outputs a map of tokens.
+@mixin create-token-values($tokens) {
+  @include _create-token-values-internal($tokens, false);
 }
 
 // Outputs a map of tokens under a specific prefix in scenarios where tokens may be mixed with
 // other declarations (e.g. M2 themes). Used to avoid https://sass-lang.com/documentation/breaking-changes/mixed-decls/
-@mixin create-token-values-mixed($prefix, $tokens) {
-  @include _create-token-values-internal($prefix, $tokens, true);
+@mixin create-token-values-mixed($tokens) {
+  @include _create-token-values-internal($tokens, true);
 }
 
-@mixin _create-token-values-internal($prefix, $tokens, $in-place) {
+@mixin _create-token-values-internal($tokens, $in-place) {
   @if ($tokens != null) {
     @if ($in-place) {
       & {
         @each $key, $value in $tokens {
           @if $value != null {
-            @include define-css_var($prefix, $key, $value);
+            --mat-#{$key}: #{$value};
           }
         }
       }
     } @else {
       @each $key, $value in $tokens {
         @if $value != null {
-          @include define-css-var($prefix, $key, $value);
+          --mat-#{$key}: #{$value};
         }
       }
     }
   }
 }
 
-@mixin define-css-var($prefix, $key, $value) {
-  $name: _create-var-name($prefix, $key);
-  #{$name}: #{$value};
-}
-
-// MDC doesn't currently handle elevation tokens properly. As a temporary workaround we can combine
-// the elevation and shadow-color tokens into a full box-shadow and use it as the value for the
-// elevation token.
-@function resolve-elevation($tokens, $elevation-token, $shadow-color-token) {
-  $elevation: map.get($tokens, $elevation-token);
-  $shadow-color: map.get($tokens, $shadow-color-token);
-  @return map.merge(
-    $tokens,
-    (
-      $elevation-token: elevation.get-box-shadow($elevation, $shadow-color),
-      $shadow-color-token: null,
-    )
-  );
-}
-
-/// Checks whether a list starts wih a given prefix
-/// @param {List} $list The list value to check the prefix of.
-/// @param {List} $prefix The prefix to check.
-/// @return {Boolean} Whether the list starts with the prefix.
-@function _is-prefix($list, $prefix) {
-  @for $i from 1 through list.length($prefix) {
-    @if list.nth($list, $i) != list.nth($prefix, $i) {
-      @return false;
-    }
-  }
-  @return true;
-}
-
-/// Gets the supported color variants in the given token set for the given prefix.
-/// @param {Map} $tokens The full token map.
-/// @param {List} $prefix The component prefix to get color variants for.
-/// @return {List} The supported color variants.
-@function _supported-color-variants($tokens, $prefix) {
-  $result: ();
-  @each $namespace in map.keys($tokens) {
-    @if list.length($prefix) == list.length($namespace) - 1 and _is-prefix($namespace, $prefix) {
-      $result: list.append($result, list.nth($namespace, list.length($namespace)), comma);
-    }
-  }
-  @return $result;
-}
-
-/// Gets the token values for the given components prefix with the given options.
-/// @param {Map} $tokens The full token map.
-/// @param {List} $prefix The component prefix to get the token values for.
-/// @param {ArgList} Any additional options
-///   Currently the additional supported options are:
-//     - $color-variant - The color variant to use for the component
-//     - $emit-overrides-only - Whether to emit *only* the overrides for the
-//                              specific color variant, or all color styles. Defaults to false.
-/// @throws If given options are invalid
-/// @return {Map} The token values for the requested component.
-@function get-tokens-for($tokens, $prefix, $options...) {
-  $options: sass-utils.validate-keyword-args($options, (color-variant, emit-overrides-only));
-  @if $tokens == () {
-    @return ();
-  }
-  $values: map.get($tokens, $prefix);
-  @if ($values == null) {
-    @return ();
-  }
-
-  $color-variant: map.get($options, color-variant);
-  $emit-overrides-only: map.get($options, emit-overrides-only);
-  @if $color-variant == null {
-    @return $values;
-  }
-  $overrides: map.get($tokens, list.append($prefix, $color-variant));
-  @if $overrides == null {
-    $variants: _supported-color-variants($tokens, $prefix);
-    $secondary-message: if(
-      $variants == (),
-      'Mixin does not support color variants',
-      'Supported color variants are: #{$variants}'
-    );
-
-    @error 'Invalid color variant: #{$color-variant}. #{$secondary-message}.';
-  }
-
-  @return if($emit-overrides-only, $overrides, map.merge($values, $overrides));
-}
-
 /// Emits new token values for the given token overrides.
 /// Verifies that the overrides passed in are valid tokens.
 /// New token values are emitted under the current selector or root.
-@mixin batch-create-token-values($overrides: (), $namespace-configs...) {
+@mixin batch-create-token-values($overrides: (), $namespace-configs) {
   @include sass-utils.current-selector-or-root() {
     $prefixed-name-data: ();
     $all-names: ();
@@ -254,7 +111,7 @@ $_direct-system-fallbacks: ();
     @each $config in $namespace-configs {
       $namespace: map.get($config, namespace);
       $prefix: if(map.has-key($config, prefix), map.get($config, prefix), '');
-      $tokens: _filter-nulls(map.get($config, tokens));
+      $tokens: map.get(map.get($config, tokens), all);
       @each $name, $value in $tokens {
         $prefixed-name: $prefix + $name;
         $all-names: list.append($all-names, $prefixed-name, $separator: comma);
@@ -267,62 +124,11 @@ $_direct-system-fallbacks: ();
         $data: map.get($prefixed-name-data, $name);
         $namespace: list.nth($data, 1);
         $name: list.nth($data, 2);
-        @include create-token-values(
-          $namespace,
-          (
-            $name: $value,
-          )
-        );
+        $prefixed-name: $namespace + '-' + $name;
+        @include create-token-values(($prefixed-name: $value));
       } @else {
         @error #{'Invalid token name `'}#{$name}#{'`. '}#{'Valid tokens are: '}#{$all-names};
       }
     }
   }
 }
-
-/// Filters keys with a null value out of the map.
-/// @param {Map} $map The map to filter.
-/// @return {Map} The given map with all of the null keys filtered out.
-@function _filter-nulls($map) {
-  $result: ();
-  @each $key, $val in $map {
-    @if $val != null {
-      $result: map.set($result, $key, $val);
-    }
-  }
-  @return $result;
-}
-
-/// Gets the MDC tokens for the given prefix, M3 token values, and supported token slots.
-/// @param {List} $prefix The token prefix for the given tokens.
-/// @param {Map|(Map, Map)} $values A map of M3 token values for the given prefix.
-///  This param may also be a tuple of maps, the first one representing the default M3 token values,
-//   and the second containing overrides for different color variants.
-//   Single map example:
-//     (token1: green, token2: 2px)
-//   Tuple example:
-//     (
-//       (token1: green, token2: 2px),
-//       (
-//         secondary: (token1: blue),
-//         error: (token1: red),
-//       )
-//     )
-/// @param {Map} $slots A map of token slots, with null value indicating the token is not supported.
-/// @param {String|null} $variant The name of the variant the token values are for.
-/// @return {Map} A map of fully qualified token names to values, for only the supported tokens.
-@function namespace-tokens($prefix, $values, $slots, $variant: null) {
-  $result: ();
-  @if $variant == null and meta.type-of($values) == 'list' and list.length($values == 2) {
-    $variants: list.nth($values, 2);
-    $values: list.nth($values, 1);
-    @each $variant, $overrides in $variants {
-
-      $result: map.merge($result, namespace-tokens($prefix, $overrides, $slots, $variant));
-    }
-  }
-  $used-token-names: map.keys(_filter-nulls(map.get($slots, $prefix)));
-  $used-m3-tokens: _pick(_filter-nulls($values), $used-token-names);
-  $prefix: if($variant == null, $prefix, list.append($prefix, $variant));
-  @return map.merge($result, ($prefix: $used-m3-tokens));
-}

package/core/tokens/m3/_index.scss

@@ -4,3 +4,4 @@
 @forward './md-sys-shape';
 @forward './md-sys-state';
 @forward './md-sys-typescale';
+@forward './theme';

package/core/tokens/m3/_theme.scss

@@ -0,0 +1,47 @@
+@use '../../theming/palettes';
+@use './md-sys-color';
+@use './md-sys-elevation';
+@use './md-sys-shape';
+@use './md-sys-state';
+@use './md-sys-typescale';
+@use 'sass:map';
+
+// Return a new map where the values are the same as the provided map's
+// keys, prefixed with "--mat-sys-". For example:
+// (key1: '', key2: '') --> (key1: --mat-sys-key1, key2: --mat-sys-key2)
+@function _create-system-app-vars-map($map) {
+  $new-map: ();
+  @each $key, $value in $map {
+    $new-map: map.set($new-map, $key, --mat-sys-#{$key});
+  }
+  @return $new-map;
+}
+
+/// Map key used to store internals of theme config.
+$internals: _mat-theming-internals-do-not-access;
+
+$placeholder-palettes: md-sys-color.md-sys-color-values-light(palettes.$blue-palette);
+$placeholder-palettes: map.set($placeholder-palettes, primary, palettes.$blue-palette);
+$app-vars: (
+  'md-sys-color': _create-system-app-vars-map(
+      md-sys-color.md-sys-color-values-light($placeholder-palettes)),
+  'md-sys-typescale': _create-system-app-vars-map(md-sys-typescale.md-sys-typescale-values((
+    brand: (Roboto),
+    plain: (Roboto),
+    bold: 700,
+    medium: 500,
+    regular: 400
+  ))),
+  'md-sys-elevation': _create-system-app-vars-map(md-sys-elevation.md-sys-elevation-values()),
+  'md-sys-state': _create-system-app-vars-map(md-sys-state.md-sys-state-values()),
+  'md-sys-shape': _create-system-app-vars-map(md-sys-shape.md-sys-shape-values()),
+  // Add a subset of palette-specific colors used by components instead of system values
+  'md-ref-palette': _create-system-app-vars-map(
+      (
+        neutral10: '', // Form field native select option text color
+        neutral-variant20: '', // Sidenav scrim (container background shadow when opened),
+      )
+  ),
+);
+
+$sys-theme: ($internals: $app-vars);

package/datepicker/_datepicker-theme.scss

@@ -1,9 +1,9 @@
 @use 'sass:color';
 @use 'sass:map';
 @use './m2-datepicker';
+@use './m3-datepicker';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/style/sass-utils';
 @use '../core/typography/typography';
@@ -26,8 +26,7 @@ $calendar-weekday-table-font-size: 11px !default;
     $palette-name
   );
 
-  @include token-utils.create-token-values-mixed(
-    m2-datepicker.$prefix, map.merge($calendar-tokens, $range-tokens));
+  @include token-utils.create-token-values-mixed(map.merge($calendar-tokens, $range-tokens));
 }
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -35,27 +34,24 @@ $calendar-weekday-table-font-size: 11px !default;
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+    @include token-utils.create-token-values(map.get(m3-datepicker.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-datepicker.$prefix, m2-datepicker.get-unthemable-tokens());
+      @include token-utils.create-token-values-mixed(m2-datepicker.get-unthemable-tokens());
     }
   }
 }
 
 /// Outputs color theme styles for the mat-datepicker.
 /// @param {Map} $theme The theme to generate color styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the main selection: primary, secondary, tertiary,
-///      or error (If not specified, default primary color will be used).
-@mixin color($theme, $options...) {
+/// @param {String} $color-variant The color variant to use for the component (M3 only)
+@mixin color($theme, $color-variant: null) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
+    @include token-utils.create-token-values(
+        map.get(m3-datepicker.get-tokens($theme, $color-variant), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-datepicker.$prefix, m2-datepicker.get-color-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-datepicker.get-color-tokens($theme));
     }
 
     .mat-datepicker-content {
@@ -71,12 +67,12 @@ $calendar-weekday-table-font-size: 11px !default;
     .mat-datepicker-toggle-active {
       &.mat-accent {
         $accent-tokens: m2-datepicker.private-get-toggle-color-palette-color-tokens($theme, accent);
-        @include token-utils.create-token-values-mixed(m2-datepicker.$prefix, $accent-tokens);
+        @include token-utils.create-token-values-mixed($accent-tokens);
       }
 
       &.mat-warn {
         $warn-tokens: m2-datepicker.private-get-toggle-color-palette-color-tokens($theme, warn);
-        @include token-utils.create-token-values-mixed(m2-datepicker.$prefix, $warn-tokens);
+        @include token-utils.create-token-values-mixed($warn-tokens);
       }
     }
   }
@@ -86,13 +82,10 @@ $calendar-weekday-table-font-size: 11px !default;
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+    @include token-utils.create-token-values(map.get(m3-datepicker.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-datepicker.$prefix,
-        m2-datepicker.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-datepicker.get-typography-tokens($theme));
     }
   }
 }
@@ -112,7 +105,7 @@ $calendar-weekday-table-font-size: 11px !default;
   );
 
   @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values-mixed(m2-datepicker.$prefix, $tokens);
+    @include token-utils.create-token-values-mixed($tokens);
   }
 }
 
@@ -120,7 +113,7 @@ $calendar-weekday-table-font-size: 11px !default;
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
+    @include token-utils.create-token-values(map.get(m3-datepicker.get-tokens($theme), density));
   } @else {
     // TODO(crisbeto): move this into the structural styles
     // once the icon button density is switched to tokens.
@@ -137,8 +130,8 @@ $calendar-weekday-table-font-size: 11px !default;
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-datepicker.$prefix,
-      tokens: m2-datepicker.get-token-slots(),
+      namespace: datepicker,
+      tokens: token-utils.get-overrides(m3-datepicker.get-tokens(), datepicker)
     ),
   );
 }
@@ -146,18 +139,19 @@ $calendar-weekday-table-font-size: 11px !default;
 /// Outputs the CSS variable values for the given tokens.
 /// @param {Map} $tokens The token values to emit.
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 /// Outputs all (base, color, typography, and density) theme styles for the mat-datepicker.
 /// @param {Map} $theme The theme to generate styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the main selection: primary, secondary, tertiary,
-///      or error (If not specified, default primary color will be used).
-@mixin theme($theme, $options...) {
+/// @param {String} $color-variant The color variant to use for the component (M3 only)
+@mixin theme($theme, $color-variant: null) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-datepicker') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
+      @include base($theme);
+      @include color($theme, $color-variant);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -172,12 +166,3 @@ $calendar-weekday-table-font-size: 11px !default;
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens, $options...) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  $mat-datepicker-tokens: token-utils.get-tokens-for(
-    $tokens, m2-datepicker.$prefix, $options...);
-  @include token-utils.create-token-values(m2-datepicker.$prefix, $mat-datepicker-tokens);
-}