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

package/select/_m2-select.scss

@@ -5,14 +5,11 @@
 @use '../core/style/elevation';
 @use '../core/style/sass-utils';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, select);
-
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
 @function get-unthemable-tokens() {
   @return (
-    container-elevation-shadow: elevation.get-box-shadow(8),
+    select-container-elevation-shadow: elevation.get-box-shadow(8),
   );
 }
 
@@ -31,16 +28,16 @@ $prefix: (mat, select);
     inspection.get-theme-color($theme, foreground, divider, 1));
 
   @return (
-    panel-background-color: inspection.get-theme-color($theme, background, card),
-    enabled-trigger-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.87),
-    disabled-trigger-text-color:
+    select-panel-background-color: inspection.get-theme-color($theme, background, card),
+    select-enabled-trigger-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.87),
+    select-disabled-trigger-text-color:
       sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
-    placeholder-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
-    enabled-arrow-color: sass-utils.safe-color-change($icon-color-base, $alpha: 0.54),
-    disabled-arrow-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.38),
-    focused-arrow-color: sass-utils.safe-color-change(
+    select-placeholder-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    select-enabled-arrow-color: sass-utils.safe-color-change($icon-color-base, $alpha: 0.54),
+    select-disabled-arrow-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.38),
+    select-focused-arrow-color: sass-utils.safe-color-change(
       inspection.get-theme-color($theme, $palette-name, default), $alpha: 0.87),
-    invalid-arrow-color: sass-utils.safe-color-change(
+    select-invalid-arrow-color: sass-utils.safe-color-change(
       inspection.get-theme-color($theme, warn, default), $alpha: 0.87),
   );
 }
@@ -48,11 +45,11 @@ $prefix: (mat, select);
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    trigger-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    trigger-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    trigger-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    trigger-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    trigger-text-weight: inspection.get-theme-typography($theme, body-1, font-weight)
+    select-trigger-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    select-trigger-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
+    select-trigger-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    select-trigger-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
+    select-trigger-text-weight: inspection.get-theme-typography($theme, body-1, font-weight)
   );
 }
 
@@ -61,7 +58,7 @@ $prefix: (mat, select);
   $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
 
   @return (
-    arrow-transform: map.get((
+    select-arrow-transform: map.get((
       0: translateY(-8px),
       -1: translateY(-8px),
       -2: none,

package/select/_m3-select.scss

@@ -1,61 +1,55 @@
 @use 'sass:map';
 @use 'sass:list';
-@use '../core/style/sass-utils';
 @use '../core/style/elevation';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
+@use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, select);
 
 /// Generates custom tokens for the mat-select.
-/// @param {Map} $systems The MDC system tokens
-/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
-/// @param {Map} $token-slots Possible token slots
-/// @return {Map} A set of custom tokens for the mat-select
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: sass-utils.merge-all(
-    m3-utils.generate-typography-tokens($systems, trigger-text, body-large),
-    (
-      panel-background-color: map.get($systems, md-sys-color, surface-container),
-      enabled-trigger-text-color: map.get($systems, md-sys-color, on-surface),
-      disabled-trigger-text-color: sass-utils.safe-color-change(
-          map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      placeholder-text-color: map.get($systems, md-sys-color, on-surface-variant),
-      enabled-arrow-color: map.get($systems, md-sys-color, on-surface-variant),
-      disabled-arrow-color: sass-utils.safe-color-change(
-          map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      focused-arrow-color: map.get($systems, md-sys-color, primary),
-      invalid-arrow-color: map.get($systems, md-sys-color, error),
-      container-elevation-shadow:
-        m3-utils.hardcode(elevation.get-box-shadow(2), $exclude-hardcoded),
-    )
-  );
+/// @param {String} $color-variant The color variant to use for the component
+@function get-tokens($theme: m3.$sys-theme, $color-variant: null) {
+  $system: m3-utils.get-system($theme);
+  @if $color-variant {
+    $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
+  }
 
-  $variant-tokens: (
-    // Color variants:
-    primary: (), // Default, no overrides needed
-    secondary: (
-      focused-arrow-color: map.get($systems, md-sys-color, secondary),
+  @return (
+    base: (
+      select-container-elevation-shadow: elevation.get-box-shadow(2),
     ),
-    tertiary: (
-      focused-arrow-color: map.get($systems, md-sys-color, tertiary),
+    color: (
+      select-panel-background-color: map.get($system, surface-container),
+      select-enabled-trigger-text-color: map.get($system, on-surface),
+      select-disabled-trigger-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      select-placeholder-text-color: map.get($system, on-surface-variant),
+      select-enabled-arrow-color: map.get($system, on-surface-variant),
+      select-disabled-arrow-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      select-focused-arrow-color: map.get($system, primary),
+      select-invalid-arrow-color: map.get($system, error),
     ),
-    error: (
-      focused-arrow-color: map.get($systems, md-sys-color, error),
-    )
+    typography: (
+      select-trigger-text-font: map.get($system, body-large-font),
+      select-trigger-text-line-height: map.get($system, body-large-line-height),
+      select-trigger-text-size: map.get($system, body-large-size),
+      select-trigger-text-tracking: map.get($system, body-large-tracking),
+      select-trigger-text-weight: map.get($system, body-large-weight),
+    ),
+    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
   );
-
-  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
+@function get-density-tokens($scale) {
+  $scale: theming.clamp-density($scale, -2);
   $index: ($scale * -1) + 1;
 
   @return (
-    arrow-transform: list.nth((translateY(-8px), translateY(-8px), none), $index),
+    select-arrow-transform: list.nth((translateY(-8px), translateY(-8px), none), $index),
   );
 }

package/select/_select-theme.scss

@@ -1,53 +1,43 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/inspection';
 @use '../core/theming/theming';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-select';
 @use './m3-select';
+@use 'sass:map';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-select.
 /// @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-select.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
       $mat-tokens: m2-select.get-unthemable-tokens();
-      @include token-utils.create-token-values-mixed(m2-select.$prefix, $mat-tokens);
+      @include token-utils.create-token-values-mixed($mat-tokens);
     }
   }
 }
 
 /// Outputs color theme styles for the mat-select.
 /// @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 select arrow: 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-select.get-tokens($theme, $color-variant), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-select.$prefix,
-        m2-select.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme));
 
       .mat-mdc-form-field.mat-accent {
-        @include token-utils.create-token-values-mixed(
-          m2-select.$prefix,
-          m2-select.get-color-tokens($theme, accent)
-        );
+        @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme, accent));
       }
 
       .mat-mdc-form-field.mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-select.$prefix,
-          m2-select.get-color-tokens($theme, warn)
-        );
+        @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme, warn));
       }
     }
   }
@@ -57,13 +47,10 @@
 /// @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-select.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-select.$prefix,
-        m2-select.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-select.get-typography-tokens($theme));
     }
   }
 }
@@ -72,14 +59,10 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        m3-select.$prefix, m3-select.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-select.$prefix,
-        m2-select.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-select.get-density-tokens($theme));
     }
   }
 }
@@ -88,8 +71,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-select.$prefix,
-      tokens: m2-select.get-token-slots(),
+      namespace: select,
+      tokens: token-utils.get-overrides(m3-select.get-tokens(), select)
     ),
   );
 }
@@ -97,21 +80,19 @@
 /// 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-icon.
 /// @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 select arrow: 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-select') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
+      @include base($theme);
+      @include color($theme, $color-variant);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -126,11 +107,3 @@
     }
   }
 }
-
-@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-select-tokens: token-utils.get-tokens-for($tokens, m2-select.$prefix, $options...);
-  @include token-utils.create-token-values(m2-select.$prefix, $mat-select-tokens);
-}

package/sidenav/_m2-sidenav.scss

@@ -5,18 +5,15 @@
 @use '../core/style/elevation';
 @use '../core/style/sass-utils';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, sidenav);
-
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
 @function get-unthemable-tokens() {
   @return (
     // Currently zero, but it appears to be relevant for M3.
     // See: https://m3.material.io/components/navigation-drawer/overview
-    container-shape: 0,
-    container-elevation-shadow: elevation.get-box-shadow(16),
-    container-width: auto,
+    sidenav-container-shape: 0,
+    sidenav-container-elevation-shadow: elevation.get-box-shadow(16),
+    sidenav-container-width: auto,
   );
 }
 
@@ -29,17 +26,17 @@ $prefix: (mat, sidenav);
   $fallback-scrim-color: if($is-dark, rgba(#fff, $scrim-opacity), rgba(#000, $scrim-opacity));
 
   @return (
-    container-divider-color: inspection.get-theme-color($theme, foreground, divider),
-    container-background-color: inspection.get-theme-color($theme, background, dialog),
-    container-text-color: inspection.get-theme-color($theme, foreground, text),
-    content-background-color: inspection.get-theme-color($theme, background, background),
-    content-text-color: inspection.get-theme-color($theme, foreground, text),
+    sidenav-container-divider-color: inspection.get-theme-color($theme, foreground, divider),
+    sidenav-container-background-color: inspection.get-theme-color($theme, background, dialog),
+    sidenav-container-text-color: inspection.get-theme-color($theme, foreground, text),
+    sidenav-content-background-color: inspection.get-theme-color($theme, background, background),
+    sidenav-content-text-color: inspection.get-theme-color($theme, foreground, text),
 
     // We use invert() here to have the darken the background color expected to be used.
     // If the background is light, we use a dark backdrop. If the background is dark, we
     // use a light backdrop. If the value isn't a color, Sass will throw an error so we
     // fall back to something generic.
-    scrim-color: if(meta.type-of($scrim-color) == color,
+    sidenav-scrim-color: if(meta.type-of($scrim-color) == color,
       color.invert($scrim-color), $fallback-scrim-color),
   );
 }

package/sidenav/_m3-sidenav.scss

@@ -1,28 +1,26 @@
 @use 'sass:map';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m3-utils';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, sidenav);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-sidenav.
-/// @param {Map} $systems The MDC system tokens
-/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
-/// @param {Map} $token-slots Possible token slots
-/// @return {Map} A set of custom tokens for the mat-sidenav
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    container-elevation-shadow: m3-utils.hardcode(none, $exclude-hardcoded),
-    container-divider-color: m3-utils.hardcode(transparent, $exclude-hardcoded),
-    container-width: m3-utils.hardcode(360px, $exclude-hardcoded),
-    container-shape: map.get($systems, md-sys-shape, corner-large),
-    container-background-color: map.get($systems, md-sys-color, surface),
-    container-text-color: map.get($systems, md-sys-color, on-surface-variant),
-    content-background-color: map.get($systems, md-sys-color, background),
-    content-text-color: map.get($systems, md-sys-color, on-background),
-    scrim-color: sass-utils.safe-color-change(
-        map.get($systems, md-ref-palette, neutral-variant20), $alpha: 0.4),
-  );
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
 
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+  @return (
+    base: (
+      sidenav-container-shape: map.get($system, corner-large),
+      sidenav-container-elevation-shadow: none,
+      sidenav-container-width: 360px,
+      sidenav-container-divider-color: transparent,
+    ),
+    color: (
+      sidenav-container-background-color: map.get($system, surface),
+      sidenav-container-text-color: map.get($system, on-surface-variant),
+      sidenav-content-background-color: map.get($system, background),
+      sidenav-content-text-color: map.get($system, on-background),
+      sidenav-scrim-color: m3-utils.color-with-opacity(map.get($system, neutral-variant20), 40%),
+    ),
+    typography: (),
+    density: (),
+  );
 }

package/sidenav/_sidenav-theme.scss

@@ -2,42 +2,40 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/inspection';
 @use '../core/theming/theming';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use './m2-sidenav';
+@use './m3-sidenav';
 
 @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-sidenav.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-sidenav.$prefix, m2-sidenav.get-unthemable-tokens());
+      @include token-utils.create-token-values-mixed(m2-sidenav.get-unthemable-tokens());
     }
   }
 }
 
 @mixin color($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+    @include token-utils.create-token-values(map.get(m3-sidenav.get-tokens($theme), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-sidenav.$prefix, m2-sidenav.get-color-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-sidenav.get-color-tokens($theme));
     }
   }
 }
 
 @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-sidenav.get-tokens($theme), typography));
   } @else {
   }
 }
 
 @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-sidenav.get-tokens($theme), base));
   } @else {
   }
 }
@@ -46,20 +44,23 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-sidenav.$prefix,
-      tokens: m2-sidenav.get-token-slots(),
+      namespace: sidenav,
+      tokens: token-utils.get-overrides(m3-sidenav.get-tokens(), sidenav)
     ),
   );
 }
 
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-sidenav') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -74,15 +75,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  @if ($tokens != ()) {
-    @include token-utils.create-token-values(
-      m2-sidenav.$prefix,
-      map.get($tokens, m2-sidenav.$prefix)
-    );
-  }
-}