@angular/material 20.0.0-next.5 → 20.0.0-next.6

package/button/_m3-fab.scss

@@ -0,0 +1,174 @@
+@use 'sass:map';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
+@use '../core/style/elevation';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, fab);
+
+/// 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));
+    }
+  }
+
+  $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),
+    ),
+    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,
+  );
+
+  @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);
+}

package/{core/tokens/m3/mat/_icon-button.scss → button/_m3-icon-button.scss}

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m3-utils';
+@use '../core/style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, icon-button);
@@ -63,5 +63,5 @@ $prefix: (mat, icon-button);
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/button/index.d.ts

@@ -1,10 +1,10 @@
-export { M as MAT_BUTTON_CONFIG, f as MAT_FAB_DEFAULT_OPTIONS, g as MAT_FAB_DEFAULT_OPTIONS_FACTORY, d as MatAnchor, c as MatButton, a as MatButtonAppearance, b as MatButtonConfig, n as MatButtonModule, j as MatFabAnchor, h as MatFabButton, e as MatFabDefaultOptions, m as MatIconAnchor, l as MatIconButton, k as MatMiniFabAnchor, i as MatMiniFabButton } from '../module.d-1b393e15.js';
+export { M as MAT_BUTTON_CONFIG, f as MAT_FAB_DEFAULT_OPTIONS, g as MAT_FAB_DEFAULT_OPTIONS_FACTORY, d as MatAnchor, c as MatButton, a as MatButtonAppearance, b as MatButtonConfig, n as MatButtonModule, j as MatFabAnchor, h as MatFabButton, e as MatFabDefaultOptions, m as MatIconAnchor, l as MatIconButton, k as MatMiniFabAnchor, i as MatMiniFabButton } from '../module.d-9a1d1c76.js';
 import '@angular/core';
-import '../common-module.d-1b789e68.js';
+import '../common-module.d-421e3498.js';
 import '@angular/cdk/bidi';
-import '../index.d-609609fc.js';
-import '../ripple.d-838c5cd6.js';
+import '../index.d-511f9e6c.js';
+import '../ripple.d-305c30f3.js';
 import '@angular/cdk/platform';
 import '@angular/cdk/a11y';
-import '../palette.d-f5ca9a2b.js';
-import '../ripple-loader.d-ef3a5132.js';
+import '../palette.d-1d8ebc0d.js';
+import '../ripple-loader.d-f51e5eb6.js';

package/button/testing/index.d.ts

@@ -55,4 +55,5 @@ declare class MatButtonHarness extends ContentContainerComponentHarness {
     getAppearance(): Promise<ButtonAppearance | null>;
 }
 
-export { type ButtonAppearance, type ButtonHarnessFilters, type ButtonVariant, MatButtonHarness };
+export { MatButtonHarness };
+export type { ButtonAppearance, ButtonHarnessFilters, ButtonVariant };

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

@@ -1,11 +1,10 @@
-@use '../core/theming/theming';
+@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
-@use '../core/typography/typography';
-@use '../core/tokens/m2/mat/legacy-button-toggle' as tokens-mat-legacy-button-toggle;
-@use '../core/tokens/m2/mat/standard-button-toggle' as tokens-mat-standard-button-toggle;
 @use '../core/tokens/token-utils';
-@use '../core/style/sass-utils';
+@use '../core/typography/typography';
+@use './m2-button-toggle';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-button-toggle.
@@ -16,12 +15,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-legacy-button-toggle.$prefix,
-        tokens-mat-legacy-button-toggle.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-standard-button-toggle.$prefix,
-        tokens-mat-standard-button-toggle.get-unthemable-tokens()
+        m2-button-toggle.$prefix,
+        m2-button-toggle.get-unthemable-tokens()
       );
     }
   }
@@ -38,12 +33,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-legacy-button-toggle.$prefix,
-        tokens-mat-legacy-button-toggle.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-standard-button-toggle.$prefix,
-        tokens-mat-standard-button-toggle.get-color-tokens($theme)
+        m2-button-toggle.$prefix,
+        m2-button-toggle.get-color-tokens($theme)
       );
     }
   }
@@ -57,12 +48,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-legacy-button-toggle.$prefix,
-        tokens-mat-legacy-button-toggle.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-standard-button-toggle.$prefix,
-        tokens-mat-standard-button-toggle.get-typography-tokens($theme)
+        m2-button-toggle.$prefix,
+        m2-button-toggle.get-typography-tokens($theme)
       );
     }
   }
@@ -76,12 +63,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-legacy-button-toggle.$prefix,
-        tokens-mat-legacy-button-toggle.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-standard-button-toggle.$prefix,
-        tokens-mat-standard-button-toggle.get-density-tokens($theme)
+        m2-button-toggle.$prefix,
+        m2-button-toggle.get-density-tokens($theme)
       );
     }
   }
@@ -89,17 +72,11 @@
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
 @function _define-overrides() {
-  $legacy-tokens: tokens-mat-legacy-button-toggle.get-token-slots();
-  $standard-tokens: tokens-mat-standard-button-toggle.get-token-slots();
+  $standard-tokens: m2-button-toggle.get-token-slots();
 
   @return (
     (
-      namespace: tokens-mat-legacy-button-toggle.$prefix,
-      tokens: $legacy-tokens,
-      prefix: 'legacy-',
-    ),
-    (
-      namespace: tokens-mat-standard-button-toggle.$prefix,
+      namespace: m2-button-toggle.$prefix,
       tokens: $standard-tokens,
     ),
   );
@@ -141,11 +118,11 @@
   );
   $mat-standard-button-toggle-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mat-standard-button-toggle.$prefix,
+    m2-button-toggle.$prefix,
     $options...
   );
   @include token-utils.create-token-values(
-    tokens-mat-standard-button-toggle.$prefix,
+    m2-button-toggle.$prefix,
     $mat-standard-button-toggle-tokens
   );
 }

package/{core/tokens/m2/mat/_standard-button-toggle.scss → button-toggle/_m2-button-toggle.scss}

@@ -1,20 +1,23 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../token-definition';
-@use '../../../theming/theming';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/theming';
+@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, standard-button-toggle);
+$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 (
-    shape: 4px,
-    hover-state-layer-opacity: 0.04,
     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,
   );
 }
 
@@ -33,19 +36,31 @@ $prefix: (mat, standard-button-toggle);
       $theme-divider-color);
 
   @return (
-    text-color: inspection.get-theme-color($theme, foreground, text),
     background-color: inspection.get-theme-color($theme, background, card),
-    state-layer-color: sass-utils.safe-color-change(
-        inspection.get-theme-color($theme, background, focused-button), $alpha: 1),
-    selected-state-background-color: inspection.get-theme-color(
-        $theme, background, selected-button),
-    selected-state-text-color: inspection.get-theme-color($theme, foreground, text),
-    disabled-state-text-color: inspection.get-theme-color($theme, foreground, disabled-button),
-    disabled-state-background-color: inspection.get-theme-color($theme, background, card),
-    disabled-selected-state-text-color: inspection.get-theme-color($theme, foreground, text),
     disabled-selected-state-background-color:
-      inspection.get-theme-color($theme, background, selected-disabled-button),
+        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:
+        inspection.get-theme-color($theme, background, selected-disabled-button),
+    legacy-disabled-state-background-color:
+        inspection.get-theme-color($theme, background, disabled-button-toggle),
+    legacy-disabled-state-text-color:
+        inspection.get-theme-color($theme, foreground, disabled-button),
+    legacy-selected-state-background-color:
+        inspection.get-theme-color($theme, background, selected-button),
+    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:
+        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(
+        inspection.get-theme-color($theme, background, focused-button), $alpha: 1),
+    text-color: inspection.get-theme-color($theme, foreground, text),
   );
 }
 
@@ -57,6 +72,11 @@ $prefix: (mat, standard-button-toggle);
     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),
   );
 }
 
@@ -81,8 +101,8 @@ $prefix: (mat, standard-button-toggle);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      get-color-tokens(token-definition.$placeholder-color-config),
-      get-typography-tokens(token-definition.$placeholder-typography-config),
-      get-density-tokens(token-definition.$placeholder-density-config)
+      get-color-tokens(m2-utils.$placeholder-color-config),
+      get-typography-tokens(m2-utils.$placeholder-typography-config),
+      get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_standard-button-toggle.scss → button-toggle/_m3-button-toggle.scss}

@@ -1,9 +1,9 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@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, standard-button-toggle);
+$prefix: (mat, button-toggle);
 
 /// Generates custom tokens for the mat-button-toggle.
 /// @param {Map} $systems The MDC system tokens
@@ -12,13 +12,13 @@ $prefix: (mat, standard-button-toggle);
 /// @return {Map} A set of custom tokens for the mat-button-toggle
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: sass-utils.merge-all(
-    token-definition.generate-typography-tokens($systems, label-text, label-large),
+    m3-utils.generate-typography-tokens($systems, label-text, label-large),
   (
     shape: map.get($systems, md-sys-shape, corner-full),
     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),
     text-color: map.get($systems, md-sys-color, on-surface),
-    background-color: token-definition.hardcode(transparent, $exclude-hardcoded),
+    background-color: m3-utils.hardcode(transparent, $exclude-hardcoded),
     state-layer-color: map.get($systems, md-sys-color, on-surface),
     selected-state-background-color: map.get($systems, md-sys-color, secondary-container),
     selected-state-text-color: map.get($systems, md-sys-color, on-secondary-container),
@@ -27,7 +27,7 @@ $prefix: (mat, standard-button-toggle);
       $alpha: 0.38,
     ),
     disabled-state-background-color:
-        token-definition.hardcode(transparent, $exclude-hardcoded),
+        m3-utils.hardcode(transparent, $exclude-hardcoded),
     disabled-selected-state-text-color: sass-utils.safe-color-change(
       map.get($systems, md-sys-color, on-surface),
       $alpha: 0.38,
@@ -56,5 +56,5 @@ $prefix: (mat, standard-button-toggle);
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, ($tokens, $color-variants), $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $color-variants), $token-slots);
 }

package/button-toggle/index.d.ts

@@ -1,11 +1,11 @@
-import { M as MatButtonToggleGroup, a as MatButtonToggle } from '../button-toggle.d-659ece43.js';
-export { d as MAT_BUTTON_TOGGLE_DEFAULT_OPTIONS, f as MAT_BUTTON_TOGGLE_GROUP, e as MAT_BUTTON_TOGGLE_GROUP_DEFAULT_OPTIONS_FACTORY, g as MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR, a as MatButtonToggle, b as MatButtonToggleAppearance, h as MatButtonToggleChange, c as MatButtonToggleDefaultOptions, M as MatButtonToggleGroup, T as ToggleType } from '../button-toggle.d-659ece43.js';
+import { M as MatButtonToggleGroup, a as MatButtonToggle } from '../button-toggle.d-620c8912.js';
+export { d as MAT_BUTTON_TOGGLE_DEFAULT_OPTIONS, f as MAT_BUTTON_TOGGLE_GROUP, e as MAT_BUTTON_TOGGLE_GROUP_DEFAULT_OPTIONS_FACTORY, g as MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR, a as MatButtonToggle, b as MatButtonToggleAppearance, h as MatButtonToggleChange, c as MatButtonToggleDefaultOptions, M as MatButtonToggleGroup, T as ToggleType } from '../button-toggle.d-620c8912.js';
 import * as i0 from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
-import { M as MatRippleModule } from '../index.d-609609fc.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { M as MatRippleModule } from '../index.d-511f9e6c.js';
 import '@angular/cdk/bidi';
 import '@angular/forms';
-import '../ripple.d-838c5cd6.js';
+import '../ripple.d-305c30f3.js';
 import '@angular/cdk/platform';
 
 declare class MatButtonToggleModule {

package/button-toggle/testing/index.d.ts

@@ -1,5 +1,5 @@
 import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular/cdk/testing';
-import { b as MatButtonToggleAppearance } from '../../button-toggle.d-659ece43.js';
+import { b as MatButtonToggleAppearance } from '../../button-toggle.d-620c8912.js';
 import '@angular/cdk/bidi';
 import '@angular/core';
 import '@angular/forms';
@@ -93,4 +93,5 @@ declare class MatButtonToggleGroupHarness extends ComponentHarness {
     getAppearance(): Promise<MatButtonToggleAppearance>;
 }
 
-export { type ButtonToggleGroupHarnessFilters, type ButtonToggleHarnessFilters, MatButtonToggleGroupHarness, MatButtonToggleHarness };
+export { MatButtonToggleGroupHarness, MatButtonToggleHarness };
+export type { ButtonToggleGroupHarnessFilters, ButtonToggleHarnessFilters };

package/{button-toggle.d-659ece43.d.ts → button-toggle.d-620c8912.d.ts}

@@ -254,4 +254,5 @@ declare class MatButtonToggle implements OnInit, AfterViewInit, OnDestroy {
     static ngAcceptInputType_disabledInteractive: unknown;
 }
 
-export { MatButtonToggleGroup as M, type ToggleType as T, MatButtonToggle as a, type MatButtonToggleAppearance as b, type MatButtonToggleDefaultOptions as c, MAT_BUTTON_TOGGLE_DEFAULT_OPTIONS as d, MAT_BUTTON_TOGGLE_GROUP_DEFAULT_OPTIONS_FACTORY as e, MAT_BUTTON_TOGGLE_GROUP as f, MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR as g, MatButtonToggleChange as h };
+export { MatButtonToggleGroup as M, MatButtonToggle as a, MAT_BUTTON_TOGGLE_DEFAULT_OPTIONS as d, MAT_BUTTON_TOGGLE_GROUP_DEFAULT_OPTIONS_FACTORY as e, MAT_BUTTON_TOGGLE_GROUP as f, MAT_BUTTON_TOGGLE_GROUP_VALUE_ACCESSOR as g, MatButtonToggleChange as h };
+export type { ToggleType as T, MatButtonToggleAppearance as b, MatButtonToggleDefaultOptions as c };

package/card/_card-theme.scss

@@ -5,9 +5,7 @@
 @use '../core/theming/validation';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mat/card' as tokens-mat-card;
-@use '../core/tokens/m2/mat/elevated-card' as tokens-mat-elevated-card;
-@use '../core/tokens/m2/mat/outlined-card' as tokens-mat-outlined-card;
+@use './m2-card';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -15,16 +13,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-elevated-card.$prefix,
-        tokens-mat-elevated-card.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-outlined-card.$prefix,
-        tokens-mat-outlined-card.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-card.$prefix,
-        tokens-mat-card.get-unthemable-tokens()
+        m2-card.$prefix,
+        m2-card.get-unthemable-tokens()
       );
     }
   }
@@ -36,16 +26,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-elevated-card.$prefix,
-        tokens-mat-elevated-card.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-outlined-card.$prefix,
-        tokens-mat-outlined-card.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-card.$prefix,
-        tokens-mat-card.get-color-tokens($theme)
+        m2-card.$prefix,
+        m2-card.get-color-tokens($theme)
       );
     }
   }
@@ -57,16 +39,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-elevated-card.$prefix,
-        tokens-mat-elevated-card.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-outlined-card.$prefix,
-        tokens-mat-outlined-card.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-card.$prefix,
-        tokens-mat-card.get-typography-tokens($theme)
+        m2-card.$prefix,
+        m2-card.get-typography-tokens($theme)
       );
     }
   }
@@ -78,16 +52,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-elevated-card.$prefix,
-        tokens-mat-elevated-card.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-outlined-card.$prefix,
-        tokens-mat-outlined-card.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-card.$prefix,
-        tokens-mat-card.get-density-tokens($theme)
+        m2-card.$prefix,
+        m2-card.get-density-tokens($theme)
       );
     }
   }
@@ -97,18 +63,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-card.$prefix,
-      tokens: tokens-mat-card.get-token-slots(),
-    ),
-    (
-      namespace: tokens-mat-elevated-card.$prefix,
-      tokens: tokens-mat-elevated-card.get-token-slots(),
-      prefix: 'elevated-',
-    ),
-    (
-      namespace: tokens-mat-outlined-card.$prefix,
-      tokens: tokens-mat-outlined-card.get-token-slots(),
-      prefix: 'outlined-',
+      namespace: m2-card.$prefix,
+      tokens: m2-card.get-token-slots(),
     ),
   );
 }
@@ -142,16 +98,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-elevated-card.$prefix,
-      map.get($tokens, tokens-mat-elevated-card.$prefix)
-    );
-    @include token-utils.create-token-values(
-      tokens-mat-outlined-card.$prefix,
-      map.get($tokens, tokens-mat-outlined-card.$prefix)
-    );
-    @include token-utils.create-token-values(
-      tokens-mat-card.$prefix,
-      map.get($tokens, tokens-mat-card.$prefix)
+      m2-card.$prefix,
+      map.get($tokens, m2-card.$prefix)
     );
   }
 }