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

package/bottom-sheet/_m3-bottom-sheet.scss

@@ -1,24 +1,25 @@
 @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, bottom-sheet);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-bottom-sheet.
-/// @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-bottom-sheet
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: sass-utils.merge-all(
-    m3-utils.generate-typography-tokens($systems, container-text, body-large),
-    (
-      container-shape: m3-utils.hardcode(28px, $exclude-hardcoded),
-      container-text-color: map.get($systems, md-sys-color, on-surface),
-      container-background-color: map.get($systems, md-sys-color, surface-container-low),
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
+  @return (
+    base: (
+      bottom-sheet-container-shape: 28px,
+    ),
+    color: (
+      bottom-sheet-container-text-color: map.get($system, on-surface),
+      bottom-sheet-container-background-color: map.get($system, surface-container-low),
     ),
+    typography: (
+      bottom-sheet-container-text-font: map.get($system, body-large-font),
+      bottom-sheet-container-text-line-height: map.get($system, body-large-line-height),
+      bottom-sheet-container-text-size: map.get($system, body-large-size),
+      bottom-sheet-container-text-tracking: map.get($system, body-large-tracking),
+      bottom-sheet-container-text-weight: map.get($system, body-large-weight),
+    ),
+    density: (),
   );
-
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/button/_button-theme.scss

@@ -1,29 +1,20 @@
 @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-button';
 @use './m3-button';
+@use 'sass:map';
 
-@mixin _button-variant($theme, $palette) {
+@mixin _m2-button-variant($theme, $palette) {
   $mat-tokens: if(
     $palette,
     m2-button.private-get-color-palette-color-tokens($theme, $palette),
     m2-button.get-color-tokens($theme)
   );
 
-  @include token-utils.create-token-values-mixed(m2-button.$prefix, $mat-tokens);
-}
-
-@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-text-button-tokens: token-utils.get-tokens-for(
-    $tokens, m2-button.$prefix, $options...);
-  @include token-utils.create-token-values(m2-button.$prefix, $mat-text-button-tokens);
+  @include token-utils.create-token-values-mixed($mat-tokens);
 }
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -31,26 +22,26 @@
 /// @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-button.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-button.$prefix, m2-button.get-unthemable-tokens());
+      @include token-utils.create-token-values-mixed(m2-button.get-unthemable-tokens());
     }
   }
 }
 
 /// Outputs color theme styles for the mat-button.
 /// @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 button: 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 badge: primary, secondary, tertiary, or error (If not specified,
+///     default primary color will be used).
+@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-button.get-tokens($theme, $color-variant), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include _button-variant($theme, null);
+      @include _m2-button-variant($theme, null);
     }
 
     .mat-mdc-button,
@@ -59,15 +50,15 @@
     .mat-mdc-outlined-button,
     .mat-tonal-button {
       &.mat-primary {
-        @include _button-variant($theme, primary);
+        @include _m2-button-variant($theme, primary);
       }
 
       &.mat-accent {
-        @include _button-variant($theme, accent);
+        @include _m2-button-variant($theme, accent);
       }
 
       &.mat-warn {
-        @include _button-variant($theme, warn);
+        @include _m2-button-variant($theme, warn);
       }
     }
   }
@@ -77,13 +68,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-button.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-button.$prefix,
-        m2-button.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-button.get-typography-tokens($theme));
     }
   }
 }
@@ -92,14 +80,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-button.$prefix, m3-button.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-button.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-button.$prefix,
-        m2-button.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-button.get-density-tokens($theme));
     }
   }
 }
@@ -108,8 +92,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-button.$prefix,
-      tokens: m2-button.get-token-slots(),
+      namespace: button,
+      tokens: token-utils.get-overrides(m3-button.get-tokens(), button),
     ),
   );
 }
@@ -117,21 +101,20 @@
 /// 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-button.
 /// @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 button: 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 button: primary, secondary,
+//         tertiary, or error (If not specified, default primary color will be used).
+@mixin theme($theme, $color-variant: null) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-button') {
     @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) {

package/button/_fab-theme.scss

@@ -1,24 +1,21 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use './m2-fab';
 @use './m3-fab';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
+@use 'sass:map';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-fab.
 /// @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-fab.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-fab.$prefix,
-        m2-fab.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(m2-fab.get-unthemable-tokens());
     }
   }
 }
@@ -30,17 +27,17 @@
     m2-fab.get-color-tokens($theme)
   );
 
-  @include token-utils.create-token-values-mixed(m2-fab.$prefix, $mat-tokens);
+  @include token-utils.create-token-values-mixed($mat-tokens);
 }
 
 /// Outputs color theme styles for the mat-fab.
 /// @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 fab: primary, secondary, or tertiary
-///     (If not specified, default primary color will be used).
-@mixin color($theme, $options...) {
+/// @param {ArgList} $color-variant: The color variant to use for the fab: primary, secondary,
+//          or tertiary. (If not specified, default primary color will be used).
+@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-fab.get-tokens($theme, $color-variant), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include _fab-variant($theme, null);
@@ -66,13 +63,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-fab.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-fab.$prefix,
-        m2-fab.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-fab.get-typography-tokens($theme));
     }
   }
 }
@@ -81,13 +75,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-fab.$prefix, m3-fab.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-fab.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-fab.$prefix,
-        m2-fab.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-fab.get-density-tokens($theme));
     }
   }
 }
@@ -96,8 +87,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-fab.$prefix,
-      tokens: m2-fab.get-token-slots(),
+      namespace: fab,
+      tokens: token-utils.get-overrides(m3-fab.get-tokens(), fab)
     ),
   );
 }
@@ -105,21 +96,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-checkbox.
 /// @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 fab: primary, secondary, or tertiary
-///     (If not specified, default primary color will be used).
-@mixin theme($theme, $options...) {
+/// @param {String} $color-variant: The color variant to use for the fab
+@mixin theme($theme, $color-variant: null) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-fab') {
     @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) {
@@ -134,11 +123,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-fab-tokens: token-utils.get-tokens-for($tokens, m2-fab.$prefix, $options...);
-  @include token-utils.create-token-values(m2-fab.$prefix, $mat-fab-tokens);
-}

package/button/_icon-button-theme.scss

@@ -6,54 +6,51 @@
 @use '../core/tokens/token-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 
 @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-icon-button.get-tokens($theme), base));
   } @else {
     // Add default values for tokens not related to color, typography, or density.
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-icon-button.$prefix,
-        m2-icon-button.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(m2-icon-button.get-unthemable-tokens());
     }
   }
 }
 
-@mixin _icon-button-variant($theme, $palette) {
+@mixin _m2-icon-button-variant($theme, $palette) {
   $mat-tokens: if(
     $palette,
     m2-icon-button.private-get-color-palette-color-tokens($theme, $palette),
     m2-icon-button.get-color-tokens($theme)
   );
 
-  @include token-utils.create-token-values-mixed(m2-icon-button.$prefix, $mat-tokens);
+  @include token-utils.create-token-values-mixed($mat-tokens);
 }
 
 /// Outputs color theme styles for the mat-icon-button.
 /// @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 button: primary, secondary, tertiary, or error.
-@mixin color($theme, $options...) {
+/// @param {String} $color-variant: The color variant to use for the
+//         button: primary, secondary, tertiary, or error.
+@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-icon-button.get-tokens($theme, $color-variant), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include _icon-button-variant($theme, null);
+      @include _m2-icon-button-variant($theme, null);
 
       .mat-mdc-icon-button {
         &.mat-primary {
-          @include _icon-button-variant($theme, primary);
+          @include _m2-icon-button-variant($theme, primary);
         }
 
         &.mat-accent {
-          @include _icon-button-variant($theme, accent);
+          @include _m2-icon-button-variant($theme, accent);
         }
 
         &.mat-warn {
-          @include _icon-button-variant($theme, warn);
+          @include _m2-icon-button-variant($theme, warn);
         }
       }
     }
@@ -62,12 +59,11 @@
 
 @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-icon-button.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-icon-button.$prefix,
-        m2-icon-button.get-typography-tokens($theme)
+      @include token-utils.create-token-values-mixed(m2-icon-button.get-typography-tokens($theme)
       );
     }
   }
@@ -75,8 +71,7 @@
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        m3-icon-button.$prefix, m3-icon-button.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-icon-button.get-tokens($theme), density));
   } @else {
     $icon-size: 24px;
     $density-scale: inspection.get-theme-density($theme);
@@ -92,9 +87,8 @@
 
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        m2-icon-button.$prefix,
-        m2-icon-button.get-density-tokens(
-            $theme, $exclude: (state-layer-size))
+          m2-icon-button.get-density-tokens(
+              $theme, $exclude: (icon-button-state-layer-size))
       );
     }
 
@@ -121,27 +115,27 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-icon-button.$prefix,
-      tokens: m2-icon-button.get-token-slots(),
+      namespace: icon-button,
+      tokens: token-utils.get-overrides(m3-icon-button.get-tokens(), icon-button)
     ),
   );
 }
 
 @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-button.
 /// @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 button: primary, secondary, tertiary, or error.
-@mixin theme($theme, $options...) {
+/// @param {String} $color-variant: The color variant to use for the button: primary,
+//         secondary, tertiary, or error.
+@mixin theme($theme, $color-variant: null) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-icon-button') {
     @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) {
@@ -156,14 +150,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'
-  );
-  @if ($tokens != ()) {
-    $mat-tokens: token-utils.get-tokens-for($tokens, m2-icon-button.$prefix, $options...);
-
-    @include token-utils.create-token-values(m2-icon-button.$prefix, $mat-tokens);
-  }
-}