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

package/{core/tokens/m2/mat/_grid-list.scss → grid-list/_m2-grid-list.scss}

@@ -1,6 +1,6 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@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, grid-list);
@@ -39,8 +39,8 @@ $prefix: (mat, grid-list);
 @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/_grid-list.scss → grid-list/_m3-grid-list.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, grid-list);
@@ -17,5 +17,5 @@ $prefix: (mat, grid-list);
     tile-footer-secondary-text-size: map.get($systems, md-sys-typescale, body-medium),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/grid-list/index.d.ts

@@ -1,8 +1,8 @@
-import { M as MatLine, a as MatLineModule } from '../line.d-570a2537.js';
-export { M as MatLine } from '../line.d-570a2537.js';
+import { M as MatLine, a as MatLineModule } from '../line.d-712398cb.js';
+export { M as MatLine } from '../line.d-712398cb.js';
 import * as i0 from '@angular/core';
 import { AfterContentInit, QueryList, OnInit, AfterContentChecked } from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
 import { NumberInput } from '@angular/cdk/coercion';
 import '@angular/cdk/bidi';
 

package/grid-list/testing/index.d.ts

@@ -78,4 +78,5 @@ declare class MatGridListHarness extends ComponentHarness {
     }): Promise<MatGridTileHarness>;
 }
 
-export { type GridListHarnessFilters, type GridTileHarnessFilters, MatGridListHarness, MatGridTileHarness, MatGridTileSection };
+export { MatGridListHarness, MatGridTileHarness, MatGridTileSection };
+export type { GridListHarnessFilters, GridTileHarnessFilters };

package/icon/_icon-theme.scss

@@ -1,14 +1,14 @@
-@use '../core/theming/theming';
+@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
-@use '../core/tokens/m2/mat/icon' as tokens-mat-icon;
 @use '../core/tokens/token-utils';
-@use '../core/style/sass-utils';
+@use './m2-icon';
 
 @mixin _palette-colors($theme, $palette-name) {
   $color: inspection.get-theme-color($theme, $palette-name, text);
-  $tokens: tokens-mat-icon.private-get-icon-color-tokens($color);
-  @include token-utils.create-token-values-mixed(tokens-mat-icon.$prefix, $tokens);
+  $tokens: m2-icon.private-get-icon-color-tokens($color);
+  @include token-utils.create-token-values-mixed(m2-icon.$prefix, $tokens);
 }
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -32,8 +32,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-icon.$prefix,
-        tokens-mat-icon.get-color-tokens($theme)
+        m2-icon.$prefix,
+        m2-icon.get-color-tokens($theme)
       );
     }
 
@@ -75,8 +75,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-icon.$prefix,
-      tokens: tokens-mat-icon.get-token-slots(),
+      namespace: m2-icon.$prefix,
+      tokens: m2-icon.get-token-slots(),
     ),
   );
 }
@@ -115,6 +115,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-icon-tokens: token-utils.get-tokens-for($tokens, tokens-mat-icon.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mat-icon.$prefix, $mat-icon-tokens);
+  $mat-icon-tokens: token-utils.get-tokens-for($tokens, m2-icon.$prefix, $options...);
+  @include token-utils.create-token-values(m2-icon.$prefix, $mat-icon-tokens);
 }

package/{core/tokens/m2/mat/_icon.scss → icon/_m2-icon.scss}

@@ -1,5 +1,5 @@
-@use '../../token-definition';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, icon);
@@ -38,8 +38,8 @@ $prefix: (mat, icon);
 @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/_icon.scss → icon/_m3-icon.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, icon);
@@ -10,9 +10,11 @@ $prefix: (mat, icon);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of custom tokens for the mat-icon
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: ((
-    color: token-definition.hardcode(inherit, $exclude-hardcoded),
-  ), (
+  $tokens: (
+    color: m3-utils.hardcode(inherit, $exclude-hardcoded),
+  );
+
+  $variant-tokens: (
     // Color variants:
     surface: (), // Default, no overrides needed.
     primary: (
@@ -27,7 +29,7 @@ $prefix: (mat, icon);
     error: (
       color: map.get($systems, md-sys-color, error),
     )
-  ));
+  );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/icon/index.d.ts

@@ -1,9 +1,9 @@
-export { b as MAT_ICON_DEFAULT_OPTIONS, c as MAT_ICON_LOCATION, e as MAT_ICON_LOCATION_FACTORY, f as MatIcon, a as MatIconDefaultOptions, d as MatIconLocation, M as MatIconModule } from '../icon-module.d-aa3bbba0.js';
-export { f as ICON_REGISTRY_PROVIDER, e as ICON_REGISTRY_PROVIDER_FACTORY, I as IconOptions, d as IconResolver, M as MatIconRegistry, S as SafeResourceUrlWithIconOptions, c as getMatIconFailedToSanitizeLiteralError, b as getMatIconFailedToSanitizeUrlError, g as getMatIconNameNotFoundError, a as getMatIconNoHttpProviderError } from '../icon-registry.d-1dffe9de.js';
+export { b as MAT_ICON_DEFAULT_OPTIONS, c as MAT_ICON_LOCATION, e as MAT_ICON_LOCATION_FACTORY, f as MatIcon, a as MatIconDefaultOptions, d as MatIconLocation, M as MatIconModule } from '../icon-module.d-a4b3b1e1.js';
+export { f as ICON_REGISTRY_PROVIDER, e as ICON_REGISTRY_PROVIDER_FACTORY, I as IconOptions, d as IconResolver, M as MatIconRegistry, S as SafeResourceUrlWithIconOptions, c as getMatIconFailedToSanitizeLiteralError, b as getMatIconFailedToSanitizeUrlError, g as getMatIconNameNotFoundError, a as getMatIconNoHttpProviderError } from '../icon-registry.d-6dd1799a.js';
 import '@angular/core';
-import '../common-module.d-0e6515ae.js';
+import '../common-module.d-421e3498.js';
 import '@angular/cdk/bidi';
-import '../palette.d-ec4a617c.js';
+import '../palette.d-1d8ebc0d.js';
 import '@angular/common/http';
 import '@angular/platform-browser';
 import 'rxjs';

package/icon/testing/index.d.ts

@@ -2,7 +2,7 @@ import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular
 import * as i0 from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { Observable } from 'rxjs';
-import { M as MatIconRegistry } from '../../icon-registry.d-1dffe9de.js';
+import { M as MatIconRegistry } from '../../icon-registry.d-6dd1799a.js';
 import '@angular/common/http';
 import '@angular/platform-browser';
 
@@ -77,4 +77,5 @@ declare class MatIconTestingModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatIconTestingModule>;
 }
 
-export { FakeMatIconRegistry, type IconHarnessFilters, IconType, MatIconHarness, MatIconTestingModule };
+export { FakeMatIconRegistry, IconType, MatIconHarness, MatIconTestingModule };
+export type { IconHarnessFilters };

package/{icon-module.d-aa3bbba0.d.ts → icon-module.d-a4b3b1e1.d.ts}

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, OnInit, AfterViewChecked, OnDestroy, ElementRef } from '@angular/core';
-import { M as MatCommonModule } from './common-module.d-0e6515ae.js';
-import { T as ThemePalette } from './palette.d-ec4a617c.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
+import { T as ThemePalette } from './palette.d-1d8ebc0d.js';
 
 /** Default options for `mat-icon`.  */
 interface MatIconDefaultOptions {
@@ -164,4 +164,5 @@ declare class MatIconModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatIconModule>;
 }
 
-export { MatIconModule as M, type MatIconDefaultOptions as a, MAT_ICON_DEFAULT_OPTIONS as b, MAT_ICON_LOCATION as c, type MatIconLocation as d, MAT_ICON_LOCATION_FACTORY as e, MatIcon as f };
+export { MatIconModule as M, MAT_ICON_DEFAULT_OPTIONS as b, MAT_ICON_LOCATION as c, MAT_ICON_LOCATION_FACTORY as e, MatIcon as f };
+export type { MatIconDefaultOptions as a, MatIconLocation as d };

package/{icon-registry.d-1dffe9de.d.ts → icon-registry.d-6dd1799a.d.ts}

@@ -283,4 +283,5 @@ declare const ICON_REGISTRY_PROVIDER: {
     useFactory: typeof ICON_REGISTRY_PROVIDER_FACTORY;
 };
 
-export { type IconOptions as I, MatIconRegistry as M, type SafeResourceUrlWithIconOptions as S, getMatIconNoHttpProviderError as a, getMatIconFailedToSanitizeUrlError as b, getMatIconFailedToSanitizeLiteralError as c, type IconResolver as d, ICON_REGISTRY_PROVIDER_FACTORY as e, ICON_REGISTRY_PROVIDER as f, getMatIconNameNotFoundError as g };
+export { MatIconRegistry as M, getMatIconNoHttpProviderError as a, getMatIconFailedToSanitizeUrlError as b, getMatIconFailedToSanitizeLiteralError as c, ICON_REGISTRY_PROVIDER_FACTORY as e, ICON_REGISTRY_PROVIDER as f, getMatIconNameNotFoundError as g };
+export type { IconOptions as I, SafeResourceUrlWithIconOptions as S, IconResolver as d };

package/{index.d-cc6e48d4.d.ts → index.d-511f9e6c.d.ts}

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
-import { M as MatCommonModule } from './common-module.d-0e6515ae.js';
-import { M as MatRipple } from './ripple.d-f2cd74cf.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
+import { M as MatRipple } from './ripple.d-305c30f3.js';
 
 declare class MatRippleModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatRippleModule, never>;

package/{index.d-d77f0821.d.ts → index.d-73f24bb1.d.ts}

@@ -1,8 +1,8 @@
 import * as i0 from '@angular/core';
-import { M as MatRippleModule } from './index.d-cc6e48d4.js';
-import { M as MatCommonModule } from './common-module.d-0e6515ae.js';
-import { M as MatPseudoCheckboxModule } from './pseudo-checkbox-module.d-d21de92b.js';
-import { M as MatOption, a as MatOptgroup } from './option.d-6f493d78.js';
+import { M as MatRippleModule } from './index.d-511f9e6c.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
+import { M as MatPseudoCheckboxModule } from './pseudo-checkbox-module.d-42351ab6.js';
+import { M as MatOption, a as MatOptgroup } from './option.d-4fb11594.js';
 
 declare class MatOptionModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatOptionModule, never>;

package/input/index.d.ts

@@ -4,15 +4,15 @@ import * as i0 from '@angular/core';
 import { InjectionToken, OnChanges, OnDestroy, AfterViewInit, DoCheck, ElementRef, WritableSignal } from '@angular/core';
 import { NgControl } from '@angular/forms';
 import { Subject } from 'rxjs';
-import { E as ErrorStateMatcher } from '../error-options.d-448d9046.js';
-import { k as MatFormField } from '../form-field.d-2edbc094.js';
-export { a as MatError, k as MatFormField, b as MatHint, d as MatPrefix, f as MatSuffix } from '../form-field.d-2edbc094.js';
-import { M as MatFormFieldControl } from '../form-field-control.d-eb86711c.js';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
-import { a as MatFormFieldModule } from '../module.d-c17c834e.js';
-export { M as MatLabel } from '../module.d-c17c834e.js';
+import { E as ErrorStateMatcher } from '../error-options.d-059d9639.js';
+import { k as MatFormField } from '../form-field.d-486f4e86.js';
+export { a as MatError, k as MatFormField, b as MatHint, d as MatPrefix, f as MatSuffix } from '../form-field.d-486f4e86.js';
+import { M as MatFormFieldControl } from '../form-field-control.d-9ed49092.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { a as MatFormFieldModule } from '../module.d-683b2a19.js';
+export { M as MatLabel } from '../module.d-683b2a19.js';
 import * as i4 from '@angular/cdk/text-field';
-import '../palette.d-ec4a617c.js';
+import '../palette.d-1d8ebc0d.js';
 import '@angular/cdk/bidi';
 import '@angular/cdk/observers';
 
@@ -213,4 +213,5 @@ declare const MAT_INPUT_VALUE_ACCESSOR: InjectionToken<{
 /** @docs-private */
 declare function getMatInputUnsupportedTypeError(type: string): Error;
 
-export { MAT_INPUT_CONFIG, MAT_INPUT_VALUE_ACCESSOR, MatInput, type MatInputConfig, MatInputModule, getMatInputUnsupportedTypeError };
+export { MAT_INPUT_CONFIG, MAT_INPUT_VALUE_ACCESSOR, MatInput, MatInputModule, getMatInputUnsupportedTypeError };
+export type { MatInputConfig };

package/input/testing/index.d.ts

@@ -1,6 +1,6 @@
-export { I as InputHarnessFilters, M as MatInputHarness } from '../../input-harness.d-4eecd1d3.js';
+export { I as InputHarnessFilters, M as MatInputHarness } from '../../input-harness.d-be80831e.js';
 import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular/cdk/testing';
-import { M as MatFormFieldControlHarness } from '../../form-field-control-harness.d-2d91f25a.js';
+import { M as MatFormFieldControlHarness } from '../../form-field-control-harness.d-e3cf007b.js';
 
 /** A set of criteria that can be used to filter a list of `MatNativeSelectHarness` instances. */
 interface NativeSelectHarnessFilters extends BaseHarnessFilters {
@@ -68,4 +68,5 @@ declare class MatNativeSelectHarness extends MatFormFieldControlHarness {
     selectOptions(filter?: NativeOptionHarnessFilters): Promise<void>;
 }
 
-export { MatNativeOptionHarness, MatNativeSelectHarness, type NativeOptionHarnessFilters, type NativeSelectHarnessFilters };
+export { MatNativeOptionHarness, MatNativeSelectHarness };
+export type { NativeOptionHarnessFilters, NativeSelectHarnessFilters };

package/{input-harness.d-4eecd1d3.d.ts → input-harness.d-be80831e.d.ts}

@@ -1,5 +1,5 @@
 import { BaseHarnessFilters, HarnessPredicate } from '@angular/cdk/testing';
-import { M as MatFormFieldControlHarness } from './form-field-control-harness.d-2d91f25a.js';
+import { M as MatFormFieldControlHarness } from './form-field-control-harness.d-e3cf007b.js';
 
 /** A set of criteria that can be used to filter a list of `MatInputHarness` instances. */
 interface InputHarnessFilters extends BaseHarnessFilters {
@@ -57,4 +57,5 @@ declare class MatInputHarness extends MatFormFieldControlHarness {
     setValue(newValue: string): Promise<void>;
 }
 
-export { type InputHarnessFilters as I, MatInputHarness as M };
+export { MatInputHarness as M };
+export type { InputHarnessFilters as I };

package/{line.d-570a2537.d.ts → line.d-712398cb.d.ts}

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { QueryList, ElementRef } from '@angular/core';
-import { M as MatCommonModule } from './common-module.d-0e6515ae.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
 
 /**
  * Shared directive to count lines inside a text area, such as a list item.

package/list/_list-theme.scss

@@ -1,15 +1,14 @@
 @use 'sass:map';
 
+@use '../checkbox/m2-checkbox';
 @use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
-@use '../core/tokens/m2/mat/list' as tokens-mat-list;
-@use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;
-@use '../core/tokens/m2/mdc/radio' as tokens-mdc-radio;
-@use '../core/tokens/m2/mdc/list' as tokens-mdc-list;
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
+@use '../radio/m2-radio';
+@use './m2-list';
 
 @mixin base($theme) {
   // Add default values for tokens not related to color, typography, or density.
@@ -18,13 +17,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-list.$prefix,
-        tokens-mdc-list.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-unthemable-tokens()
-      );
+        m2-list.$prefix, m2-list.get-unthemable-tokens());
     }
   }
 }
@@ -35,29 +28,21 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-list.$prefix,
-        tokens-mdc-list.get-color-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-color-tokens($theme)
-      );
+        m2-list.$prefix, m2-list.get-color-tokens($theme));
     }
 
     .mdc-list-item__start,
     .mdc-list-item__end {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-radio.$prefix,
-        tokens-mdc-radio.get-color-tokens($theme, primary)
-      );
+        m2-radio.$prefix, m2-radio.get-color-tokens($theme, primary));
     }
 
     .mat-accent {
       .mdc-list-item__start,
       .mdc-list-item__end {
         @include token-utils.create-token-values-mixed(
-          tokens-mdc-radio.$prefix,
-          tokens-mdc-radio.get-color-tokens($theme, accent)
+          m2-radio.$prefix,
+          m2-radio.get-color-tokens($theme, accent)
         );
       }
     }
@@ -66,28 +51,28 @@
       .mdc-list-item__start,
       .mdc-list-item__end {
         @include token-utils.create-token-values-mixed(
-          tokens-mdc-radio.$prefix,
-          tokens-mdc-radio.get-color-tokens($theme, warn)
+          m2-radio.$prefix,
+          m2-radio.get-color-tokens($theme, warn)
         );
       }
     }
 
     .mat-mdc-list-option {
       @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)
       );
     }
     .mat-mdc-list-option.mat-accent {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-checkbox.$prefix,
-        tokens-mdc-checkbox.get-color-tokens($theme, accent)
+        m2-checkbox.$prefix,
+        m2-checkbox.get-color-tokens($theme, accent)
       );
     }
     .mat-mdc-list-option.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)
       );
     }
 
@@ -123,22 +108,15 @@
     $density-scale: inspection.get-theme-density($theme);
 
     @include sass-utils.current-selector-or-root() {
+      // TODO: See if this can be removed
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-list.$prefix,
-        tokens-mdc-list.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-density-tokens($theme)
-      );
+        m2-list.$prefix, m2-list.get-density-tokens($theme));
     }
 
     .mdc-list-item__start,
     .mdc-list-item__end {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-radio.$prefix,
-        tokens-mdc-radio.get-density-tokens($theme)
-      );
+          m2-radio.$prefix, m2-radio.get-density-tokens($theme));
     }
 
     // TODO(mmalerba): This is added to maintain the same style MDC used prior to the token-based
@@ -186,13 +164,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mdc-list.$prefix,
-        tokens-mdc-list.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-typography-tokens($theme)
-      );
+        m2-list.$prefix, m2-list.get-typography-tokens($theme));
     }
 
     // MDC does not have tokens for the subheader.
@@ -208,12 +180,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-list.$prefix,
-      tokens: tokens-mat-list.get-token-slots(),
-    ),
-    (
-      namespace: tokens-mdc-list.$prefix,
-      tokens: tokens-mdc-list.get-token-slots(),
+      namespace: m2-list.$prefix,
+      tokens: m2-list.get-token-slots(),
     ),
   );
 }
@@ -245,8 +213,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mdc-list-tokens: token-utils.get-tokens-for($tokens, tokens-mdc-list.$prefix);
-  $mat-list-tokens: token-utils.get-tokens-for($tokens, tokens-mat-list.$prefix);
-  @include token-utils.create-token-values(tokens-mdc-list.$prefix, $mdc-list-tokens);
-  @include token-utils.create-token-values(tokens-mat-list.$prefix, $mat-list-tokens);
+  $mat-list-tokens: token-utils.get-tokens-for($tokens, m2-list.$prefix);
+  @include token-utils.create-token-values(m2-list.$prefix, $mat-list-tokens);
 }

package/list/_m2-list.scss

@@ -0,0 +1,133 @@
+@use '../core/tokens/m2-utils';
+@use '../core/style/sass-utils';
+@use '../core/theming/inspection';
+@use 'sass:map';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, list);
+
+// 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 (
+    active-indicator-color: transparent,
+    active-indicator-shape: 4px,
+    list-item-container-shape: 0,
+    list-item-leading-avatar-shape: 50%,
+    list-item-container-color: transparent,
+    list-item-selected-container-color: transparent,
+    list-item-leading-avatar-color: transparent,
+    list-item-leading-icon-size: 24px,
+    list-item-leading-avatar-size: 40px,
+    list-item-trailing-icon-size: 24px,
+    list-item-disabled-state-layer-color: transparent,
+    list-item-disabled-state-layer-opacity: 0,
+    list-item-disabled-label-text-opacity: 0.38,
+    list-item-disabled-leading-icon-opacity: 0.38,
+    list-item-disabled-trailing-icon-opacity: 0.38,
+  );
+}
+
+// Tokens that can be configured through Angular Material's color theming API.
+@function get-color-tokens($theme) {
+  $is-dark: inspection.get-theme-type($theme) == dark;
+  $foreground-base: inspection.get-theme-color($theme, foreground, base);
+  $foreground-text: inspection.get-theme-color($theme, foreground, text);
+  $foreground-secondary-text: inspection.get-theme-color($theme, foreground, secondary-text);
+  $foreground-hint-text: inspection.get-theme-color($theme, foreground, hint-text);
+  $text-icon-on-background: sass-utils.safe-color-change(
+      $foreground-base, $alpha: if($is-dark, 0.5, 0.38));
+
+  @return (
+    list-item-label-text-color: $foreground-text,
+    list-item-supporting-text-color: $foreground-secondary-text,
+    list-item-leading-icon-color: $text-icon-on-background,
+    list-item-trailing-supporting-text-color: $foreground-hint-text,
+    list-item-trailing-icon-color: $text-icon-on-background,
+    list-item-selected-trailing-icon-color: $text-icon-on-background,
+    list-item-disabled-label-text-color: $foreground-base,
+    list-item-disabled-leading-icon-color: $foreground-base,
+    list-item-disabled-trailing-icon-color: $foreground-base,
+    list-item-hover-label-text-color: $foreground-text,
+    list-item-hover-leading-icon-color: $text-icon-on-background,
+    list-item-hover-state-layer-color: $foreground-base,
+    list-item-hover-state-layer-opacity: if($is-dark, 0.08, 0.04),
+    list-item-hover-trailing-icon-color: $text-icon-on-background,
+    list-item-focus-label-text-color: $foreground-text,
+    list-item-focus-state-layer-color: $foreground-base,
+    list-item-focus-state-layer-opacity: if($is-dark, 0.24, 0.12),
+  );
+}
+
+// Tokens that can be configured through Angular Material's typography theming API.
+@function get-typography-tokens($theme) {
+  @return (
+    list-item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    list-item-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
+    list-item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    list-item-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
+    list-item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    list-item-supporting-text-font: inspection.get-theme-typography($theme, body-2, font-family),
+    list-item-supporting-text-line-height:inspection.get-theme-typography(
+        $theme, body-2, line-height),
+    list-item-supporting-text-size: inspection.get-theme-typography($theme, body-2, font-size),
+    list-item-supporting-text-tracking: inspection.get-theme-typography(
+        $theme, body-2, letter-spacing),
+    list-item-supporting-text-weight: inspection.get-theme-typography($theme, body-2, font-weight),
+    list-item-trailing-supporting-text-font: inspection.get-theme-typography(
+        $theme, caption, font-family),
+    list-item-trailing-supporting-text-line-height: inspection.get-theme-typography(
+        $theme, caption, line-height),
+    list-item-trailing-supporting-text-size: inspection.get-theme-typography(
+        $theme, caption, font-size),
+    list-item-trailing-supporting-text-tracking: inspection.get-theme-typography(
+        $theme, caption, letter-spacing),
+    list-item-trailing-supporting-text-weight: inspection.get-theme-typography(
+        $theme, caption, font-weight),
+  );
+}
+
+// Tokens that can be configured through Angular Material's density theming API.
+@function get-density-tokens($theme) {
+  $scale: inspection.get-theme-density($theme);
+
+  @return (
+    list-item-leading-icon-start-space: 16px,
+    list-item-leading-icon-end-space: 32px,
+    list-item-one-line-container-height: map.get((
+      0: 48px,
+      -1: 44px,
+      -2: 40px,
+      -3: 36px,
+      -4: 32px,
+      -5: 24px,
+    ), $scale),
+    list-item-two-line-container-height: map.get((
+      0: 64px,
+      -1: 60px,
+      -2: 56px,
+      -3: 52px,
+      -4: 48px,
+      -5: 48px,
+    ), $scale),
+    list-item-three-line-container-height: map.get((
+      0: 88px,
+      -1: 84px,
+      -2: 80px,
+      -3: 76px,
+      -4: 72px,
+      -5: 56px,
+    ), $scale),
+  );
+}
+
+// Combines the tokens generated by the above functions into a single map with placeholder values.
+// This is used to create token slots.
+@function get-token-slots() {
+  @return sass-utils.deep-merge-all(
+      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)
+  );
+}