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

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,
@@ -37,7 +37,9 @@ $prefix: (mat, standard-button-toggle);
       $alpha: 0.12,
     ),
     divider-color: map.get($systems, md-sys-color, outline),
-  ), (
+  ));
+
+  $color-variants: (
     // Color variants:
     primary: (
       selected-state-background-color: map.get($systems, md-sys-color, primary-container),
@@ -52,7 +54,7 @@ $prefix: (mat, standard-button-toggle);
       selected-state-background-color: map.get($systems, md-sys-color, error-container),
       selected-state-text-color: map.get($systems, md-sys-color, on-error-container),
     )
-  ));
+  );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $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-e3ddc80f.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-e3ddc80f.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-0e6515ae.js';
-import { M as MatRippleModule } from '../index.d-cc6e48d4.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-f2cd74cf.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-e3ddc80f.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-e3ddc80f.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/mdc/elevated-card' as tokens-mdc-elevated-card;
-@use '../core/tokens/m2/mdc/outlined-card' as tokens-mdc-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-mdc-elevated-card.$prefix,
-        tokens-mdc-elevated-card.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mdc-outlined-card.$prefix,
-        tokens-mdc-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-mdc-elevated-card.$prefix,
-        tokens-mdc-elevated-card.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mdc-outlined-card.$prefix,
-        tokens-mdc-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-mdc-elevated-card.$prefix,
-        tokens-mdc-elevated-card.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mdc-outlined-card.$prefix,
-        tokens-mdc-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-mdc-elevated-card.$prefix,
-        tokens-mdc-elevated-card.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mdc-outlined-card.$prefix,
-        tokens-mdc-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-mdc-elevated-card.$prefix,
-      tokens: tokens-mdc-elevated-card.get-token-slots(),
-      prefix: 'elevated-',
-    ),
-    (
-      namespace: tokens-mdc-outlined-card.$prefix,
-      tokens: tokens-mdc-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-mdc-elevated-card.$prefix,
-      map.get($tokens, tokens-mdc-elevated-card.$prefix)
-    );
-    @include token-utils.create-token-values(
-      tokens-mdc-outlined-card.$prefix,
-      map.get($tokens, tokens-mdc-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)
     );
   }
 }

package/{core/tokens/m2/mat/_card.scss → card/_m2-card.scss}

@@ -1,6 +1,7 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
+@use '../core/style/elevation';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, card);
@@ -8,13 +9,21 @@ $prefix: (mat, card);
 // 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 ();
+  @return (
+    elevated-container-shape: 4px,
+    outlined-container-shape: 4px,
+    outlined-outline-width: 1px,
+  );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
   @return (
-    // Text color of the card's subtitle.
+    elevated-container-color: inspection.get-theme-color($theme, background, card),
+    elevated-container-elevation: elevation.get-box-shadow(1),
+    outlined-container-color: inspection.get-theme-color($theme, background, card),
+    outlined-container-elevation: elevation.get-box-shadow(0),
+    outlined-outline-color: rgba(inspection.get-theme-color($theme, foreground, base), 0.12),
     subtitle-text-color: inspection.get-theme-color($theme, foreground, secondary-text),
   );
 }
@@ -22,25 +31,15 @@ $prefix: (mat, card);
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    // Font family of the card's title.
     title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
-    // Line height of the card's title.
     title-text-line-height: inspection.get-theme-typography($theme, headline-6, line-height),
-    // Font size of the card's title.
     title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
-    // Letter spacing of the card's title.
     title-text-tracking: inspection.get-theme-typography($theme, headline-6, letter-spacing),
-    // Font weight of the card's title.
     title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
-    // Font family of the card's subtitle.
     subtitle-text-font: inspection.get-theme-typography($theme, subtitle-2, font-family),
-    // Line height of the card's subtitle.
     subtitle-text-line-height: inspection.get-theme-typography($theme, subtitle-2, line-height),
-    // Font size of the card's subtitle.
     subtitle-text-size: inspection.get-theme-typography($theme, subtitle-2, font-size),
-    // Letter spacing of the card's subtitle.
     subtitle-text-tracking: inspection.get-theme-typography($theme, subtitle-2, letter-spacing),
-    // Font weight of the card's subtitle.
     subtitle-text-weight: inspection.get-theme-typography($theme, subtitle-2, font-weight),
   );
 }
@@ -55,8 +54,8 @@ $prefix: (mat, card);
 @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/card/_m3-card.scss

@@ -0,0 +1,45 @@
+@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, card);
+
+/// Generates custom tokens for the mat-card.
+/// @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-card
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  $tokens: sass-utils.merge-all(
+    m3-utils.generate-typography-tokens($systems, title-text, title-large),
+    m3-utils.generate-typography-tokens($systems, subtitle-text, title-medium),
+    (
+      subtitle-text-color: map.get($systems, md-sys-color, on-surface),
+      elevated-container-color: map.get($systems, md-sys-color, surface-container-low),
+      elevated-container-elevation: map.get($systems, md-sys-elevation, level1),
+      elevated-container-shape: map.get($systems, md-sys-shape, corner-medium),
+      outlined-container-color: map.get($systems, md-sys-color, surface),
+      outlined-container-elevation: map.get($systems, md-sys-elevation, level0),
+      outlined-container-shape: map.get($systems, md-sys-shape, corner-medium),
+      outlined-outline-color: map.get($systems, md-sys-color, outline-variant),
+      outlined-outline-width: if($exclude-hardcoded, null, 1px),
+    ),
+  );
+
+  $elevated-elevation: map.get($tokens, elevated-container-elevation);
+  @if ($elevated-elevation != null) {
+    $tokens: map.set($tokens, elevated-container-elevation,
+        elevation.get-box-shadow($elevated-elevation));
+  }
+
+  $outlined-elevation: map.get($tokens, outlined-container-elevation);
+  @if ($outlined-elevation != null) {
+    $tokens: map.set($tokens, outlined-container-elevation,
+        elevation.get-box-shadow($outlined-elevation));
+  }
+
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+}
+

package/card/index.d.ts

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { InjectionToken } from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
 import '@angular/cdk/bidi';
 
 type MatCardAppearance = 'outlined' | 'raised';
@@ -153,4 +153,5 @@ declare class MatCardModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatCardModule>;
 }
 
-export { MAT_CARD_CONFIG, MatCard, MatCardActions, type MatCardAppearance, MatCardAvatar, type MatCardConfig, MatCardContent, MatCardFooter, MatCardHeader, MatCardImage, MatCardLgImage, MatCardMdImage, MatCardModule, MatCardSmImage, MatCardSubtitle, MatCardTitle, MatCardTitleGroup, MatCardXlImage };
+export { MAT_CARD_CONFIG, MatCard, MatCardActions, MatCardAvatar, MatCardContent, MatCardFooter, MatCardHeader, MatCardImage, MatCardLgImage, MatCardMdImage, MatCardModule, MatCardSmImage, MatCardSubtitle, MatCardTitle, MatCardTitleGroup, MatCardXlImage };
+export type { MatCardAppearance, MatCardConfig };

package/card/testing/index.d.ts

@@ -37,4 +37,5 @@ declare class MatCardHarness extends ContentContainerComponentHarness<MatCardSec
     getSubtitleText(): Promise<string>;
 }
 
-export { type CardHarnessFilters, MatCardHarness, MatCardSection };
+export { MatCardHarness, MatCardSection };
+export type { CardHarnessFilters };

package/checkbox/_checkbox-theme.scss

@@ -4,8 +4,7 @@
 @use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;
-@use '../core/tokens/m2/mat/checkbox' as tokens-mat-checkbox;
+@use './m2-checkbox';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-checkbox.
@@ -16,13 +15,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-unthemable-tokens()
-      );
+        m2-checkbox.$prefix, m2-checkbox.get-unthemable-tokens());
     }
   }
 }
@@ -38,27 +31,23 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-color-tokens($theme)
-      );
+        m2-checkbox.$prefix, m2-checkbox.get-color-tokens($theme));
     }
 
     .mat-mdc-checkbox {
       &.mat-primary {
         @include token-utils.create-token-values-mixed(
-          tokens-mdc-checkbox.$prefix,
-          tokens-mdc-checkbox.get-color-tokens($theme, primary)
+          m2-checkbox.$prefix,
+          m2-checkbox.get-color-tokens($theme, primary,
+              $exclude: (disabled-label-color, label-text-color))
         );
       }
 
       &.mat-warn {
         @include token-utils.create-token-values-mixed(
-          tokens-mdc-checkbox.$prefix,
-          tokens-mdc-checkbox.get-color-tokens($theme, warn)
+          m2-checkbox.$prefix,
+          m2-checkbox.get-color-tokens($theme, warn,
+              $exclude: (disabled-label-color, label-text-color))
         );
       }
     }
@@ -73,12 +62,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-typography-tokens($theme)
+        m2-checkbox.$prefix,
+        m2-checkbox.get-typography-tokens($theme)
       );
     }
   }
@@ -94,12 +79,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-density-tokens($theme)
+        m2-checkbox.$prefix,
+        m2-checkbox.get-density-tokens($theme)
       );
     }
   }
@@ -109,12 +90,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-checkbox.$prefix,
-      tokens: tokens-mat-checkbox.get-token-slots(),
-    ),
-    (
-      namespace: tokens-mdc-checkbox.$prefix,
-      tokens: tokens-mdc-checkbox.get-token-slots(),
+      namespace: m2-checkbox.$prefix,
+      tokens: m2-checkbox.get-token-slots(),
     ),
   );
 }
@@ -153,14 +130,10 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mdc-checkbox-tokens: token-utils.get-tokens-for(
+  $mat-checkbox-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mdc-checkbox.$prefix,
+    m2-checkbox.$prefix,
     $options...
   );
-  // Don't pass $options here, since the mdc-checkbox doesn't support color options,
-  // only the mdc-checkbox does.
-  $mat-checkbox-tokens: token-utils.get-tokens-for($tokens, tokens-mat-checkbox.$prefix);
-  @include token-utils.create-token-values(tokens-mdc-checkbox.$prefix, $mdc-checkbox-tokens);
-  @include token-utils.create-token-values(tokens-mat-checkbox.$prefix, $mat-checkbox-tokens);
+  @include token-utils.create-token-values(m2-checkbox.$prefix, $mat-checkbox-tokens);
 }