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

package/button/_m3-fab.scss

@@ -1,187 +1,90 @@
 @use 'sass:map';
 @use 'sass:list';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/style/elevation';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, fab);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-fab.
-/// @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-fab
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    container-color: map.get($systems, md-sys-color, primary-container),
-    container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    container-shape: map.get($systems, md-sys-shape, corner-large),
-    disabled-state-container-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface), $alpha: 0.12),
-    disabled-state-foreground-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-    extended-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    extended-container-height: if($exclude-hardcoded, null, 56px),
-    extended-container-shape: map.get($systems, md-sys-shape, corner-large),
-    extended-focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    extended-hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level4),
-    extended-label-text-font: map.get($systems, md-sys-typescale, label-large-font),
-    extended-label-text-size: map.get($systems, md-sys-typescale, label-large-size),
-    extended-label-text-tracking: map.get($systems, md-sys-typescale, label-large-tracking),
-    extended-label-text-weight: map.get($systems, md-sys-typescale, label-large-weight),
-    extended-pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-    foreground-color: map.get($systems, md-sys-color, on-primary-container),
-    hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level4),
-    hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-    pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    pressed-state-layer-opacity: map.get($systems, md-sys-state, pressed-state-layer-opacity),
-    ripple-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-primary-container),
-        $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
-    small-container-color: map.get($systems, md-sys-color, primary-container),
-    small-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    small-container-shape: map.get($systems, md-sys-shape, corner-medium),
-    small-disabled-state-container-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface), $alpha: 0.12),
-    small-disabled-state-foreground-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-    small-focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    small-focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-    small-foreground-color: map.get($systems, md-sys-color, on-primary-container),
-    small-hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level4),
-    small-hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-    small-pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-    small-pressed-state-layer-opacity: map.get($systems, md-sys-state, pressed-state-layer-opacity),
-    small-ripple-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-primary-container),
-        $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
-    small-state-layer-color: map.get($systems, md-sys-color, on-primary-container),
-    state-layer-color: map.get($systems, md-sys-color, on-primary-container),
-  );
-
-  $elevation-tokens: (
-    extended-container-elevation-shadow,
-    extended-focus-container-elevation-shadow,
-    extended-hover-container-elevation-shadow,
-    extended-pressed-container-elevation-shadow,
-    small-container-elevation-shadow,
-    small-focus-container-elevation-shadow,
-    small-hover-container-elevation-shadow,
-    small-pressed-container-elevation-shadow,
-  );
-
-  @each $token in $elevation-tokens {
-    $elevation: map.get($tokens, $token);
-
-    @if ($elevation != null) {
-      $tokens: map.set($tokens, $token, elevation.get-box-shadow($elevation));
-    }
+@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: (
-      container-color: map.get($systems, md-sys-color, secondary-container),
-      container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      container-shape: map.get($systems, md-sys-shape, corner-large),
-      extended-container-height: if($exclude-hardcoded, null, 56px),
-      extended-container-shape: map.get($systems, md-sys-shape, corner-large),
-      extended-label-text-font: map.get($systems, md-sys-typescale, label-large-font),
-      extended-label-text-size: map.get($systems, md-sys-typescale, label-large-size),
-      extended-label-text-tracking: map.get($systems, md-sys-typescale, label-large-tracking),
-      extended-label-text-weight: map.get($systems, md-sys-typescale, label-large-weight),
-      focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-      foreground-color: map.get($systems, md-sys-color, on-secondary-container),
-      hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level4),
-      hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-      pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      ripple-color: sass-utils.safe-color-change(
-          map.get($systems, md-sys-color, on-secondary-container),
-          $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
-      small-container-color: map.get($systems, md-sys-color, secondary-container),
-      small-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      small-container-shape: map.get($systems, md-sys-shape, corner-medium),
-      small-focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      small-focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-      small-foreground-color: map.get($systems, md-sys-color, on-secondary-container),
-      small-hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level4),
-      small-hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-      small-pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      small-pressed-state-layer-opacity:
-          map.get($systems, md-sys-state, pressed-state-layer-opacity),
-      small-ripple-color: sass-utils.safe-color-change(
-          map.get($systems, md-sys-color, on-secondary-container),
-          $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
-      small-state-layer-color: map.get($systems, md-sys-color, on-secondary-container),
-      state-layer-color: map.get($systems, md-sys-color, on-secondary-container),
+  $tokens: (
+    base: (
+      fab-container-shape: map.get($system, corner-large),
+      fab-extended-container-height: 56px,
+      fab-extended-container-shape: map.get($system, corner-large),
+      fab-small-container-shape: map.get($system, corner-medium),
+      fab-touch-target-display: null,
     ),
-    tertiary: (
-      container-color: map.get($systems, md-sys-color, tertiary-container),
-      container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      container-shape: map.get($systems, md-sys-shape, corner-large),
-      extended-container-height: if($exclude-hardcoded, null, 56px),
-      extended-container-shape: map.get($systems, md-sys-shape, corner-large),
-      extended-label-text-font: map.get($systems, md-sys-typescale, label-large-font),
-      extended-label-text-size: map.get($systems, md-sys-typescale, label-large-size),
-      extended-label-text-tracking: map.get($systems, md-sys-typescale, label-large-tracking),
-      extended-label-text-weight: map.get($systems, md-sys-typescale, label-large-weight),
-      focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-      foreground-color: map.get($systems, md-sys-color, on-tertiary-container),
-      hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level4),
-      hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-      pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      ripple-color: sass-utils.safe-color-change(
-          map.get($systems, md-sys-color, on-tertiary-container),
-          $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
-      small-container-color: map.get($systems, md-sys-color, tertiary-container),
-      small-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      small-container-shape: map.get($systems, md-sys-shape, corner-medium),
-      small-focus-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      small-focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-      small-foreground-color: map.get($systems, md-sys-color, on-tertiary-container),
-      small-hover-container-elevation-shadow: map.get($systems, md-sys-elevation, level4),
-      small-hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-      small-pressed-container-elevation-shadow: map.get($systems, md-sys-elevation, level3),
-      small-ripple-color: sass-utils.safe-color-change(
-          map.get($systems, md-sys-color, on-tertiary-container),
-          $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)),
-      small-state-layer-color: map.get($systems, md-sys-color, on-tertiary-container),
-      state-layer-color: map.get($systems, md-sys-color, on-tertiary-container),
-    )
-  );
-
-  $elevation-tokens: (
-    container-elevation-shadow,
-    focus-container-elevation-shadow,
-    hover-container-elevation-shadow,
-    pressed-container-elevation-shadow,
+    color: (
+      fab-container-color: map.get($system, primary-container),
+      fab-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level3)),
+      fab-disabled-state-container-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      fab-disabled-state-foreground-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      fab-extended-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level3)),
+      fab-extended-focus-container-elevation-shadow:
+          elevation.get-box-shadow(map.get($system, level3)),
+      fab-extended-hover-container-elevation-shadow:
+          elevation.get-box-shadow(map.get($system, level4)),
+      fab-extended-pressed-container-elevation-shadow: map.get($system, level3),
+      fab-focus-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level3)),
+      fab-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      fab-foreground-color: map.get($system, on-primary-container),
+      fab-hover-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level4)),
+      fab-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      fab-pressed-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level3)),
+      fab-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+      fab-ripple-color: m3-utils.color-with-opacity(
+          map.get($system, on-primary-container), map.get($system, pressed-state-layer-opacity)),
+      fab-small-container-color: map.get($system, primary-container),
+      fab-small-container-elevation-shadow: elevation.get-box-shadow(map.get($system, level3)),
+      fab-small-disabled-state-container-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      fab-small-disabled-state-foreground-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      fab-small-focus-container-elevation-shadow:
+          elevation.get-box-shadow(map.get($system, level3)),
+      fab-small-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      fab-small-foreground-color: map.get($system, on-primary-container),
+      fab-small-hover-container-elevation-shadow:
+          elevation.get-box-shadow(map.get($system, level4)),
+      fab-small-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      fab-small-pressed-container-elevation-shadow:
+          elevation.get-box-shadow(map.get($system, level3)),
+      fab-small-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+      fab-small-ripple-color: m3-utils.color-with-opacity(
+          map.get($system, on-primary-container), map.get($system, pressed-state-layer-opacity)),
+      fab-small-state-layer-color: map.get($system, on-primary-container),
+      fab-state-layer-color: map.get($system, on-primary-container),
+      fab-disabled-state-layer-color: null,
+      fab-small-disabled-state-layer-color: null,
+    ),
+    typography: (
+      fab-extended-label-text-font: map.get($system, label-large-font),
+      fab-extended-label-text-size: map.get($system, label-large-size),
+      fab-extended-label-text-tracking: map.get($system, label-large-tracking),
+      fab-extended-label-text-weight: map.get($system, label-large-weight),
+    ),
+    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
   );
 
-  @each $token in $elevation-tokens {
-    $elevation: map.get($tokens, $token);
-
-    @if ($elevation != null) {
-      $tokens: map.set($tokens, $token, elevation.get-box-shadow($elevation));
-    }
-  }
-
-  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return $tokens;
 }
 
 // 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), -3);
+@function get-density-tokens($scale) {
+  $scale: theming.clamp-density($scale, -3);
   $index: ($scale * -1) + 1;
 
   @return (
-    touch-target-display: list.nth((block, block, none, none), $index),
+    fab-small-touch-target-display: null,
+    fab-touch-target-display: list.nth((block, block, none, none), $index),
   );
 }

package/button/_m3-icon-button.scss

@@ -1,81 +1,53 @@
 @use 'sass:map';
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
-@use '../core/style/sass-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, icon-button);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-icon-button.
 /// @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-icon-button
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
-    disabled-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
-    ripple-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface-variant),
-      $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)
-    ),
-    hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-    focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-    pressed-state-layer-opacity: map.get($systems, md-sys-state, pressed-state-layer-opacity),
-    disabled-icon-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-    icon-size: if($exclude-hardcoded, null, 24px),
-    icon-color: map.get($systems, md-sys-color, on-surface-variant),
-  );
+@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);
+    $system: map.set($system, on-surface-variant, map.get($system, $color-variant));
+  }
 
-  $variant-tokens: (
-    primary: (
-      state-layer-color: map.get($systems, md-sys-color, primary),
-      ripple-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, primary),
-        $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)
-      ),
-      icon-color: map.get($systems, md-sys-color, primary)
-    ),
-    secondary: (
-      state-layer-color: map.get($systems, md-sys-color, secondary),
-      ripple-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, secondary),
-        $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)
-      ),
-      icon-color: map.get($systems, md-sys-color, secondary)
+  $tokens: (
+    base: (
+      icon-button-icon-size: 24px,
     ),
-    tertiary: (
-      state-layer-color: map.get($systems, md-sys-color, tertiary),
-      ripple-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, tertiary),
-        $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)
-      ),
-      icon-color: map.get($systems, md-sys-color, tertiary)
+    color: (
+      icon-button-disabled-icon-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      icon-button-disabled-state-layer-color: map.get($system, on-surface-variant),
+      icon-button-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      icon-button-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      icon-button-icon-color: map.get($system, on-surface-variant),
+      icon-button-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+      icon-button-ripple-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface-variant), map.get($system, pressed-state-layer-opacity)),
+      icon-button-state-layer-color: map.get($system, on-surface-variant),
     ),
-    error: (
-      state-layer-color: map.get($systems, md-sys-color, error),
-      ripple-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, error),
-        $alpha: map.get($systems, md-sys-state, pressed-state-layer-opacity)
-      ),
-      icon-color: map.get($systems, md-sys-color, error)
-    )
+    typography: (),
+    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
   );
 
-  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return $tokens;
 }
 
 // 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), -5);
+@function get-density-tokens($scale) {
+  $scale: theming.clamp-density($scale, -5);
   $index: ($scale * -1) + 1;
 
   @return (
-    touch-target-display: list.nth((block, block, none, none, none, none), $index),
+    icon-button-touch-target-display: list.nth((block, block, none, none, none, none), $index),
     // The size caps out at 24px, because anything lower will be smaller than the icon.
-    state-layer-size: list.nth((40px, 36px, 32px, 28px, 24px, 24px), $index),
+    icon-button-state-layer-size: list.nth((40px, 36px, 32px, 28px, 24px, 24px), $index),
   );
 }

package/button-toggle/_button-toggle-theme.scss

@@ -1,40 +1,36 @@
 @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-toggle';
 @use './m3-button-toggle';
+@use 'sass:map';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-button-toggle.
 /// @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-toggle.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-button-toggle.$prefix,
-        m2-button-toggle.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(m2-button-toggle.get-unthemable-tokens());
     }
   }
 }
 
 /// Outputs color theme styles for the mat-button-toggle.
 /// @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 toggle: primary, secondary, tertiary,
-///      or error (If not specified, default secondary color will be used).
-@mixin color($theme, $options...) {
+/// @param {String} $color-variant: The color variant to use for the button toggle: primary,
+///        secondary, tertiary, or error (If not specified, default secondary 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-toggle.get-tokens($theme, $color-variant), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        m2-button-toggle.$prefix,
         m2-button-toggle.get-color-tokens($theme)
       );
     }
@@ -45,13 +41,12 @@
 /// @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-toggle.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        m2-button-toggle.$prefix,
-        m2-button-toggle.get-typography-tokens($theme)
-      );
+          m2-button-toggle.get-typography-tokens($theme));
     }
   }
 }
@@ -61,25 +56,20 @@
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
     @include token-utils.create-token-values(
-        m3-button-toggle.$prefix, m3-button-toggle.get-density-tokens($theme));
+        map.get(m3-button-toggle.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-button-toggle.$prefix,
-        m2-button-toggle.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-button-toggle.get-density-tokens($theme));
     }
   }
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
 @function _define-overrides() {
-  $standard-tokens: m2-button-toggle.get-token-slots();
-
   @return (
     (
-      namespace: m2-button-toggle.$prefix,
-      tokens: $standard-tokens,
+      namespace: button-toggle,
+      tokens: token-utils.get-overrides(m3-button-toggle.get-tokens(), button-toggle)
     ),
   );
 }
@@ -87,21 +77,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-toggle.
 /// @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 toggle: primary, secondary, tertiary,
-///      or error (If not specified, default secondary color will be used).
-@mixin theme($theme, $options...) {
+/// @param {String} $color-variant: The color variant to use for the button toggle: primary,
+///   secondary, tertiary, or error (If not specified, default secondary color will be used).
+@mixin theme($theme, $color-variant: null) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-button-toggle') {
     @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) {
@@ -116,18 +105,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-standard-button-toggle-tokens: token-utils.get-tokens-for(
-    $tokens,
-    m2-button-toggle.$prefix,
-    $options...
-  );
-  @include token-utils.create-token-values(
-    m2-button-toggle.$prefix,
-    $mat-standard-button-toggle-tokens
-  );
-}

package/button-toggle/_m2-button-toggle.scss

@@ -5,19 +5,16 @@
 @use '../core/theming/inspection';
 @use '../core/style/sass-utils';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, button-toggle);
-
 // 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 (
-    focus-state-layer-opacity: 0.12,
-    hover-state-layer-opacity: 0.04,
-    legacy-focus-state-layer-opacity: 1,
-    legacy-height: 36px,
-    legacy-shape: 2px,
-    shape: 4px,
+    button-toggle-focus-state-layer-opacity: 0.12,
+    button-toggle-hover-state-layer-opacity: 0.04,
+    button-toggle-legacy-focus-state-layer-opacity: 1,
+    button-toggle-legacy-height: 36px,
+    button-toggle-legacy-shape: 2px,
+    button-toggle-shape: 4px,
   );
 }
 
@@ -36,47 +33,58 @@ $prefix: (mat, button-toggle);
       $theme-divider-color);
 
   @return (
-    background-color: inspection.get-theme-color($theme, background, card),
-    disabled-selected-state-background-color:
+    button-toggle-background-color: inspection.get-theme-color($theme, background, card),
+    button-toggle-disabled-selected-state-background-color:
         inspection.get-theme-color($theme, background, selected-disabled-button),
-    disabled-selected-state-text-color: inspection.get-theme-color($theme, foreground, text),
-    disabled-state-background-color: inspection.get-theme-color($theme, background, card),
-    disabled-state-text-color: inspection.get-theme-color($theme, foreground, disabled-button),
-    divider-color: $divider-color,
-    legacy-disabled-selected-state-background-color:
+    button-toggle-disabled-selected-state-text-color:
+        inspection.get-theme-color($theme, foreground, text),
+    button-toggle-disabled-state-background-color:
+        inspection.get-theme-color($theme, background, card),
+    button-toggle-disabled-state-text-color:
+        inspection.get-theme-color($theme, foreground, disabled-button),
+    button-toggle-divider-color: $divider-color,
+    button-toggle-legacy-disabled-selected-state-background-color:
         inspection.get-theme-color($theme, background, selected-disabled-button),
-    legacy-disabled-state-background-color:
+    button-toggle-legacy-disabled-state-background-color:
         inspection.get-theme-color($theme, background, disabled-button-toggle),
-    legacy-disabled-state-text-color:
+    button-toggle-legacy-disabled-state-text-color:
         inspection.get-theme-color($theme, foreground, disabled-button),
-    legacy-selected-state-background-color:
+    button-toggle-legacy-selected-state-background-color:
         inspection.get-theme-color($theme, background, selected-button),
-    legacy-selected-state-text-color:
+    button-toggle-legacy-selected-state-text-color:
         inspection.get-theme-color($theme, foreground, secondary-text),
-    legacy-state-layer-color: inspection.get-theme-color($theme, background, focused-button),
-    legacy-text-color: inspection.get-theme-color($theme, foreground, hint-text),
-    selected-state-background-color:
+    button-toggle-legacy-state-layer-color:
+        inspection.get-theme-color($theme, background, focused-button),
+    button-toggle-legacy-text-color: inspection.get-theme-color($theme, foreground, hint-text),
+    button-toggle-selected-state-background-color:
         inspection.get-theme-color($theme, background, selected-button),
-    selected-state-text-color: inspection.get-theme-color($theme, foreground, text),
-    state-layer-color: sass-utils.safe-color-change(
+    button-toggle-selected-state-text-color: inspection.get-theme-color($theme, foreground, text),
+    button-toggle-state-layer-color: sass-utils.safe-color-change(
         inspection.get-theme-color($theme, background, focused-button), $alpha: 1),
-    text-color: inspection.get-theme-color($theme, foreground, text),
+    button-toggle-text-color: inspection.get-theme-color($theme, foreground, text),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
-    legacy-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    legacy-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    legacy-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    legacy-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    legacy-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    button-toggle-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    button-toggle-label-text-line-height:
+        inspection.get-theme-typography($theme, body-1, line-height),
+    button-toggle-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    button-toggle-label-text-tracking:
+        inspection.get-theme-typography($theme, body-1, letter-spacing),
+    button-toggle-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    button-toggle-legacy-label-text-font:
+        inspection.get-theme-typography($theme, body-1, font-family),
+    button-toggle-legacy-label-text-line-height:
+        inspection.get-theme-typography($theme, body-1, line-height),
+    button-toggle-legacy-label-text-size:
+        inspection.get-theme-typography($theme, body-1, font-size),
+    button-toggle-legacy-label-text-tracking:
+        inspection.get-theme-typography($theme, body-1, letter-spacing),
+    button-toggle-legacy-label-text-weight:
+        inspection.get-theme-typography($theme, body-1, font-weight),
   );
 }
 
@@ -92,7 +100,7 @@ $prefix: (mat, button-toggle);
   );
 
   @return (
-    height: map.get($size-scale, $density-scale)
+    button-toggle-height: map.get($size-scale, $density-scale)
   );
 }