@angular/material 20.0.0-next.0 → 20.0.0-next.10

package/card/index.d.ts

@@ -1,81 +1,47 @@
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
 import { InjectionToken } from '@angular/core';
+import { M as MatCommonModule } from '../common-module.d-C8xzHJDr.js';
+import '@angular/cdk/bidi';
 
-declare namespace i2 {
-    export {
-        MatCardAppearance,
-        MatCardConfig,
-        MAT_CARD_CONFIG,
-        MatCard,
-        MatCardTitle,
-        MatCardTitleGroup,
-        MatCardContent,
-        MatCardSubtitle,
-        MatCardActions,
-        MatCardHeader,
-        MatCardFooter,
-        MatCardImage,
-        MatCardSmImage,
-        MatCardMdImage,
-        MatCardLgImage,
-        MatCardXlImage,
-        MatCardAvatar
-    }
+type MatCardAppearance = 'outlined' | 'raised' | 'filled';
+/** Object that can be used to configure the default options for the card module. */
+interface MatCardConfig {
+    /** Default appearance for cards. */
+    appearance?: MatCardAppearance;
 }
-
 /** Injection token that can be used to provide the default options the card module. */
-export declare const MAT_CARD_CONFIG: InjectionToken<MatCardConfig>;
-
+declare const MAT_CARD_CONFIG: InjectionToken<MatCardConfig>;
 /**
  * Material Design card component. Cards contain content and actions about a single subject.
  * See https://material.io/design/components/cards.html
  *
  * MatCard provides no behaviors, instead serving as a purely visual treatment.
  */
-export declare class MatCard {
+declare class MatCard {
     appearance: MatCardAppearance;
     constructor(...args: unknown[]);
     static ɵfac: i0.ɵɵFactoryDeclaration<MatCard, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatCard, "mat-card", ["matCard"], { "appearance": { "alias": "appearance"; "required": false; }; }, {}, never, ["*"], true, never>;
 }
-
 /**
- * Bottom area of a card that contains action buttons, intended for use within `<mat-card>`.
- * This component is an optional convenience for use with other convenience elements, such as
- * `<mat-card-content>`; any custom action block element may be used in its place.
+ * Title of a card, intended for use within `<mat-card>`. This component is an optional
+ * convenience for one variety of card title; any custom title element may be used in its place.
  *
- * MatCardActions provides no behaviors, instead serving as a purely visual treatment.
+ * MatCardTitle provides no behaviors, instead serving as a purely visual treatment.
  */
-export declare class MatCardActions {
-    /** Position of the actions inside the card. */
-    align: 'start' | 'end';
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardActions, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardActions, "mat-card-actions", ["matCardActions"], { "align": { "alias": "align"; "required": false; }; }, {}, never, never, true, never>;
+declare class MatCardTitle {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardTitle, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardTitle, "mat-card-title, [mat-card-title], [matCardTitle]", never, {}, {}, never, never, true, never>;
 }
-
-export declare type MatCardAppearance = 'outlined' | 'raised';
-
 /**
- * Avatar image content for a card, intended for use within `<mat-card>`. Can be applied to
- * any media element, such as `<img>` or `<picture>`.
- *
- * This component is an optional convenience for use with other convenience elements, such as
- * `<mat-card-title>`; any custom media element may be used in its place.
- *
- * MatCardAvatar provides no behaviors, instead serving as a purely visual treatment.
+ * Container intended to be used within the `<mat-card>` component. Can contain exactly one
+ * `<mat-card-title>`, one `<mat-card-subtitle>` and one content image of any size
+ * (e.g. `<img matCardLgImage>`).
  */
-export declare class MatCardAvatar {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardAvatar, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardAvatar, "[mat-card-avatar], [matCardAvatar]", never, {}, {}, never, never, true, never>;
-}
-
-/** Object that can be used to configure the default options for the card module. */
-export declare interface MatCardConfig {
-    /** Default appearance for cards. */
-    appearance?: MatCardAppearance;
+declare class MatCardTitleGroup {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardTitleGroup, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatCardTitleGroup, "mat-card-title-group", never, {}, {}, never, ["mat-card-title, mat-card-subtitle,\n      [mat-card-title], [mat-card-subtitle],\n      [matCardTitle], [matCardSubtitle]", "[mat-card-image], [matCardImage],\n                    [mat-card-sm-image], [matCardImageSmall],\n                    [mat-card-md-image], [matCardImageMedium],\n                    [mat-card-lg-image], [matCardImageLarge],\n                    [mat-card-xl-image], [matCardImageXLarge]", "*"], true, never>;
 }
-
 /**
  * Content of a card, intended for use within `<mat-card>`. This component is an optional
  * convenience for use with other convenience elements, such as `<mat-card-title>`; any custom
@@ -83,23 +49,34 @@ export declare interface MatCardConfig {
  *
  * MatCardContent provides no behaviors, instead serving as a purely visual treatment.
  */
-export declare class MatCardContent {
+declare class MatCardContent {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatCardContent, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardContent, "mat-card-content", never, {}, {}, never, never, true, never>;
 }
-
 /**
- * Footer area a card, intended for use within `<mat-card>`.
+ * Sub-title of a card, intended for use within `<mat-card>` beneath a `<mat-card-title>`. This
+ * component is an optional convenience for use with other convenience elements, such as
+ * `<mat-card-title>`.
+ *
+ * MatCardSubtitle provides no behaviors, instead serving as a purely visual treatment.
+ */
+declare class MatCardSubtitle {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardSubtitle, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardSubtitle, "mat-card-subtitle, [mat-card-subtitle], [matCardSubtitle]", never, {}, {}, never, never, true, never>;
+}
+/**
+ * Bottom area of a card that contains action buttons, intended for use within `<mat-card>`.
  * This component is an optional convenience for use with other convenience elements, such as
- * `<mat-card-content>`; any custom footer block element may be used in its place.
+ * `<mat-card-content>`; any custom action block element may be used in its place.
  *
- * MatCardFooter provides no behaviors, instead serving as a purely visual treatment.
+ * MatCardActions provides no behaviors, instead serving as a purely visual treatment.
  */
-export declare class MatCardFooter {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardFooter, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardFooter, "mat-card-footer", never, {}, {}, never, never, true, never>;
+declare class MatCardActions {
+    /** Position of the actions inside the card. */
+    align: 'start' | 'end';
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardActions, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardActions, "mat-card-actions", ["matCardActions"], { "align": { "alias": "align"; "required": false; }; }, {}, never, never, true, never>;
 }
-
 /**
  * Header region of a card, intended for use within `<mat-card>`. This header captures
  * a card title, subtitle, and avatar.  This component is an optional convenience for use with
@@ -108,11 +85,21 @@ export declare class MatCardFooter {
  *
  * MatCardHeader provides no behaviors, instead serving as a purely visual treatment.
  */
-export declare class MatCardHeader {
+declare class MatCardHeader {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatCardHeader, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatCardHeader, "mat-card-header", never, {}, {}, never, ["[mat-card-avatar], [matCardAvatar]", "mat-card-title, mat-card-subtitle,\n      [mat-card-title], [mat-card-subtitle],\n      [matCardTitle], [matCardSubtitle]", "*"], true, never>;
 }
-
+/**
+ * Footer area a card, intended for use within `<mat-card>`.
+ * This component is an optional convenience for use with other convenience elements, such as
+ * `<mat-card-content>`; any custom footer block element may be used in its place.
+ *
+ * MatCardFooter provides no behaviors, instead serving as a purely visual treatment.
+ */
+declare class MatCardFooter {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardFooter, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardFooter, "mat-card-footer", never, {}, {}, never, never, true, never>;
+}
 /**
  * Primary image content for a card, intended for use within `<mat-card>`. Can be applied to
  * any media element, such as `<img>` or `<picture>`.
@@ -122,72 +109,49 @@ export declare class MatCardHeader {
  *
  * MatCardImage provides no behaviors, instead serving as a purely visual treatment.
  */
-export declare class MatCardImage {
+declare class MatCardImage {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatCardImage, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardImage, "[mat-card-image], [matCardImage]", never, {}, {}, never, never, true, never>;
 }
-
-/** Same as `MatCardImage`, but large. */
-export declare class MatCardLgImage {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardLgImage, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardLgImage, "[mat-card-lg-image], [matCardImageLarge]", never, {}, {}, never, never, true, never>;
+/** Same as `MatCardImage`, but small. */
+declare class MatCardSmImage {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardSmImage, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardSmImage, "[mat-card-sm-image], [matCardImageSmall]", never, {}, {}, never, never, true, never>;
 }
-
 /** Same as `MatCardImage`, but medium. */
-export declare class MatCardMdImage {
+declare class MatCardMdImage {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatCardMdImage, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardMdImage, "[mat-card-md-image], [matCardImageMedium]", never, {}, {}, never, never, true, never>;
 }
-
-export declare class MatCardModule {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatCardModule, never, [typeof i1.MatCommonModule, typeof i2.MatCard, typeof i2.MatCardActions, typeof i2.MatCardAvatar, typeof i2.MatCardContent, typeof i2.MatCardFooter, typeof i2.MatCardHeader, typeof i2.MatCardImage, typeof i2.MatCardLgImage, typeof i2.MatCardMdImage, typeof i2.MatCardSmImage, typeof i2.MatCardSubtitle, typeof i2.MatCardTitle, typeof i2.MatCardTitleGroup, typeof i2.MatCardXlImage], [typeof i2.MatCard, typeof i2.MatCardActions, typeof i2.MatCardAvatar, typeof i2.MatCardContent, typeof i2.MatCardFooter, typeof i2.MatCardHeader, typeof i2.MatCardImage, typeof i2.MatCardLgImage, typeof i2.MatCardMdImage, typeof i2.MatCardSmImage, typeof i2.MatCardSubtitle, typeof i2.MatCardTitle, typeof i2.MatCardTitleGroup, typeof i2.MatCardXlImage, typeof i1.MatCommonModule]>;
-    static ɵinj: i0.ɵɵInjectorDeclaration<MatCardModule>;
+/** Same as `MatCardImage`, but large. */
+declare class MatCardLgImage {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardLgImage, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardLgImage, "[mat-card-lg-image], [matCardImageLarge]", never, {}, {}, never, never, true, never>;
 }
-
-/** Same as `MatCardImage`, but small. */
-export declare class MatCardSmImage {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardSmImage, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardSmImage, "[mat-card-sm-image], [matCardImageSmall]", never, {}, {}, never, never, true, never>;
+/** Same as `MatCardImage`, but extra-large. */
+declare class MatCardXlImage {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardXlImage, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardXlImage, "[mat-card-xl-image], [matCardImageXLarge]", never, {}, {}, never, never, true, never>;
 }
-
 /**
- * Sub-title of a card, intended for use within `<mat-card>` beneath a `<mat-card-title>`. This
- * component is an optional convenience for use with other convenience elements, such as
- * `<mat-card-title>`.
+ * Avatar image content for a card, intended for use within `<mat-card>`. Can be applied to
+ * any media element, such as `<img>` or `<picture>`.
  *
- * MatCardSubtitle provides no behaviors, instead serving as a purely visual treatment.
- */
-export declare class MatCardSubtitle {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardSubtitle, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardSubtitle, "mat-card-subtitle, [mat-card-subtitle], [matCardSubtitle]", never, {}, {}, never, never, true, never>;
-}
-
-/**
- * Title of a card, intended for use within `<mat-card>`. This component is an optional
- * convenience for one variety of card title; any custom title element may be used in its place.
+ * This component is an optional convenience for use with other convenience elements, such as
+ * `<mat-card-title>`; any custom media element may be used in its place.
  *
- * MatCardTitle provides no behaviors, instead serving as a purely visual treatment.
- */
-export declare class MatCardTitle {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardTitle, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardTitle, "mat-card-title, [mat-card-title], [matCardTitle]", never, {}, {}, never, never, true, never>;
-}
-
-/**
- * Container intended to be used within the `<mat-card>` component. Can contain exactly one
- * `<mat-card-title>`, one `<mat-card-subtitle>` and one content image of any size
- * (e.g. `<img matCardLgImage>`).
+ * MatCardAvatar provides no behaviors, instead serving as a purely visual treatment.
  */
-export declare class MatCardTitleGroup {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardTitleGroup, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatCardTitleGroup, "mat-card-title-group", never, {}, {}, never, ["mat-card-title, mat-card-subtitle,\n      [mat-card-title], [mat-card-subtitle],\n      [matCardTitle], [matCardSubtitle]", "[mat-card-image], [matCardImage],\n                    [mat-card-sm-image], [matCardImageSmall],\n                    [mat-card-md-image], [matCardImageMedium],\n                    [mat-card-lg-image], [matCardImageLarge],\n                    [mat-card-xl-image], [matCardImageXLarge]", "*"], true, never>;
+declare class MatCardAvatar {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardAvatar, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardAvatar, "[mat-card-avatar], [matCardAvatar]", never, {}, {}, never, never, true, never>;
 }
 
-/** Same as `MatCardImage`, but extra-large. */
-export declare class MatCardXlImage {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardXlImage, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatCardXlImage, "[mat-card-xl-image], [matCardImageXLarge]", never, {}, {}, never, never, true, never>;
+declare class MatCardModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCardModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatCardModule, never, [typeof MatCommonModule, typeof MatCard, typeof MatCardActions, typeof MatCardAvatar, typeof MatCardContent, typeof MatCardFooter, typeof MatCardHeader, typeof MatCardImage, typeof MatCardLgImage, typeof MatCardMdImage, typeof MatCardSmImage, typeof MatCardSubtitle, typeof MatCardTitle, typeof MatCardTitleGroup, typeof MatCardXlImage], [typeof MatCard, typeof MatCardActions, typeof MatCardAvatar, typeof MatCardContent, typeof MatCardFooter, typeof MatCardHeader, typeof MatCardImage, typeof MatCardLgImage, typeof MatCardMdImage, typeof MatCardSmImage, typeof MatCardSubtitle, typeof MatCardTitle, typeof MatCardTitleGroup, typeof MatCardXlImage, typeof MatCommonModule]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<MatCardModule>;
 }
 
-export { }
+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

@@ -1,10 +1,7 @@
-import { BaseHarnessFilters } from '@angular/cdk/testing';
-import { ComponentHarnessConstructor } from '@angular/cdk/testing';
-import { ContentContainerComponentHarness } from '@angular/cdk/testing';
-import { HarnessPredicate } from '@angular/cdk/testing';
+import { BaseHarnessFilters, ContentContainerComponentHarness, ComponentHarnessConstructor, HarnessPredicate } from '@angular/cdk/testing';
 
 /** A set of criteria that can be used to filter a list of `MatCardHarness` instances. */
-export declare interface CardHarnessFilters extends BaseHarnessFilters {
+interface CardHarnessFilters extends BaseHarnessFilters {
     /** Only find instances whose text matches the given value. */
     text?: string | RegExp;
     /** Only find instances whose title matches the given value. */
@@ -13,8 +10,15 @@ export declare interface CardHarnessFilters extends BaseHarnessFilters {
     subtitle?: string | RegExp;
 }
 
+/** Selectors for different sections of the mat-card that can container user content. */
+declare enum MatCardSection {
+    HEADER = ".mat-mdc-card-header",
+    CONTENT = ".mat-mdc-card-content",
+    ACTIONS = ".mat-mdc-card-actions",
+    FOOTER = ".mat-mdc-card-footer"
+}
 /** Harness for interacting with a mat-card in tests. */
-export declare class MatCardHarness extends ContentContainerComponentHarness<MatCardSection> {
+declare class MatCardHarness extends ContentContainerComponentHarness<MatCardSection> {
     /** The selector for the host element of a `MatCard` instance. */
     static hostSelector: string;
     /**
@@ -33,12 +37,5 @@ export declare class MatCardHarness extends ContentContainerComponentHarness<Mat
     getSubtitleText(): Promise<string>;
 }
 
-/** Selectors for different sections of the mat-card that can container user content. */
-export declare enum MatCardSection {
-    HEADER = ".mat-mdc-card-header",
-    CONTENT = ".mat-mdc-card-content",
-    ACTIONS = ".mat-mdc-card-actions",
-    FOOTER = ".mat-mdc-card-footer"
-}
-
-export { }
+export { MatCardHarness, MatCardSection };
+export type { CardHarnessFilters };

package/checkbox/_checkbox-theme.scss

@@ -4,8 +4,8 @@
 @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';
+@use './m3-checkbox';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-checkbox.
@@ -15,14 +15,8 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-checkbox.$prefix, m2-checkbox.get-unthemable-tokens());
     }
   }
 }
@@ -37,28 +31,24 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-checkbox.$prefix, m2-checkbox.get-color-tokens($theme));
     }
 
     .mat-mdc-checkbox {
       &.mat-primary {
-        @include token-utils.create-token-values(
-          tokens-mdc-checkbox.$prefix,
-          tokens-mdc-checkbox.get-color-tokens($theme, primary)
+        @include token-utils.create-token-values-mixed(
+          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(
-          tokens-mdc-checkbox.$prefix,
-          tokens-mdc-checkbox.get-color-tokens($theme, warn)
+        @include token-utils.create-token-values-mixed(
+          m2-checkbox.$prefix,
+          m2-checkbox.get-color-tokens($theme, warn,
+              $exclude: (disabled-label-color, label-text-color))
         );
       }
     }
@@ -72,13 +62,9 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-typography-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-checkbox.$prefix,
+        m2-checkbox.get-typography-tokens($theme)
       );
     }
   }
@@ -90,16 +76,13 @@
   $density-scale: inspection.get-theme-density($theme);
 
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    @include token-utils.create-token-values(
+        m3-checkbox.$prefix, m3-checkbox.get-density-tokens($theme));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-density-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-checkbox.$prefix,
+        m2-checkbox.get-density-tokens($theme)
       );
     }
   }
@@ -109,12 +92,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(),
     ),
   );
 }
@@ -134,6 +113,9 @@
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-checkbox') {
     @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);
+      }
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -153,14 +135,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);
 }

package/{core/tokens/m2/mdc/_checkbox.scss → checkbox/_m2-checkbox.scss}

@@ -1,50 +1,30 @@
 @use 'sass:map';
-@use '../../../m2/palette' as m2-palette;
-@use '../../../m2/theming' as m2-theming;
-@use '../../../theming/theming';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/theming';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
+@use '../core/m2/theming' as m2-theming;
+@use '../core/m2/palette' as m2-palette;
 
 // The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mdc, checkbox);
+$prefix: (mat, checkbox);
 
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
-//
-// Tokens that are available in MDC, but not used in Angular Material should be mapped to `null`.
-// `null` indicates that we are intentionally choosing not to emit a slot or value for the token in
-// our CSS.
 @function get-unthemable-tokens() {
   @return (
-    // The color of the checkmark when the checkbox is selected and disabled.
     disabled-selected-checkmark-color: #fff,
-    // The opacity of the ripple when the checkbox is selected and focused.
     selected-focus-state-layer-opacity: 0.16,
-    // The opacity of the ripple when the checkbox is selected and hovered.
     selected-hover-state-layer-opacity: 0.04,
-    // The opacity of the ripple when the checkbox is selected and pressed.
     selected-pressed-state-layer-opacity: 0.16,
-    // The opacity of the ripple when the checkbox is unselected and focused.
     unselected-focus-state-layer-opacity: 0.16,
-    // The opacity of the ripple when the checkbox is unselected and hovered.
     unselected-hover-state-layer-opacity: 0.04,
-    // The opacity of the ripple when the checkbox is unselected and pressed.
     unselected-pressed-state-layer-opacity: 0.16,
-    // =============================================================================================
-    // = TOKENS NOT USED IN ANGULAR MATERIAL                                                       =
-    // =============================================================================================
-    selected-pressed-icon-color: null,
-    unselected-pressed-icon-color: null,
-
-    // MDC currently doesn't output a slot for these tokens.
-    disabled-selected-icon-opacity: null,
-    disabled-unselected-icon-opacity: null,
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $palette-name: accent) {
+@function get-color-tokens($theme, $palette-name: accent, $exclude: ()) {
   $is-dark: inspection.get-theme-type($theme) == dark;
   $foreground-base: inspection.get-theme-color($theme, foreground, base);
   $palette-default: inspection.get-theme-color($theme, $palette-name, default);
@@ -59,8 +39,8 @@ $prefix: (mdc, checkbox);
 
   // Ideally we would derive all values directly from the theme, but it causes a lot of regressions
   // internally. For now we fall back to the old hardcoded behavior only for internal apps.
-  @if (token-definition.$private-is-internal-build) {
-    $contrast-tone: token-definition.contrast-tone($palette-selected, $is-dark);
+  @if (m2-utils.$private-is-internal-build) {
+    $contrast-tone: m2-utils.contrast-tone($palette-selected, $is-dark);
     $selected-checkmark-color: if($contrast-tone == 'dark', #000, #fff);
   }
   @else {
@@ -68,45 +48,43 @@ $prefix: (mdc, checkbox);
       inspection.get-theme-color($theme, $palette-name, default-contrast, 1);
   }
 
-  @return (
-    // The color of the checkbox fill when the checkbox is selected and disabled.
+  $tokens: (
+    disabled-label-color: inspection.get-theme-color($theme, foreground, disabled-text),
+    label-text-color: inspection.get-theme-color($theme, foreground, text),
     disabled-selected-icon-color: $disabled-color,
-    // The color of the checkbox border when the checkbox is unselected and disabled.
     disabled-unselected-icon-color: $disabled-color,
-    // The color of the checkmark when the checkbox is selected.
     selected-checkmark-color: $selected-checkmark-color,
-    // The color of the checkbox fill when the checkbox is selected and focused.
     selected-focus-icon-color: $palette-selected,
-    // The color of the checkbox fill when the checkbox is selected and hovered.
     selected-hover-icon-color: $palette-selected,
-    // The color of the checkbox fill when the checkbox is selected.
     selected-icon-color: $palette-selected,
-    // The color of the checkbox fill when the checkbox is selected and pressed.
     selected-pressed-icon-color: $palette-selected,
-    // The color of the checkbox border when the checkbox is unselected and focused.
     unselected-focus-icon-color: $active-border-color,
-    // The color of the checkbox border when the checkbox is unselected and hovered.
     unselected-hover-icon-color: $active-border-color,
-    // The color of the checkbox border when the checkbox is unselected.
     unselected-icon-color: $border-color,
-    // The color of the ripple when the checkbox is selected and focused.
     selected-focus-state-layer-color: $palette-default,
-    // The color of the ripple when the checkbox is selected and hovered.
     selected-hover-state-layer-color: $palette-default,
-    // The color of the ripple when the checkbox is selected and pressed.
     selected-pressed-state-layer-color: $palette-default,
-    // The color of the ripple when the checkbox is unselected and focused.
     unselected-focus-state-layer-color: $foreground-base,
-    // The color of the ripple when the checkbox is unselected and hovered.
     unselected-hover-state-layer-color: $foreground-base,
-    // The color of the ripple when the checkbox is unselected and pressed.
     unselected-pressed-state-layer-color: $foreground-base,
   );
+
+  @each $token in $exclude {
+    $tokens: map.remove($tokens, $token);
+  }
+
+  @return $tokens;
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
-  @return ();
+  @return (
+    label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
+    label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
+    label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
+    label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
+    label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
+  );
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
@@ -114,7 +92,7 @@ $prefix: (mdc, checkbox);
   $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
 
   @return (
-    // The diameter of the checkbox's ripple.
+    touch-target-display: if($scale < -1, none, block),
     state-layer-size: map.get((
       0: 40px,
       -1: 36px,
@@ -128,9 +106,9 @@ $prefix: (mdc, checkbox);
 // This is used to create token slots.
 @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-unthemable-tokens(),
+    get-color-tokens(m2-utils.$placeholder-color-config),
+    get-typography-tokens(m2-utils.$placeholder-typography-config),
+    get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }