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

package/input/_input-theme.scss

@@ -1,35 +1,21 @@
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 
 @mixin base($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
-  } @else {
-  }
+  // No-op
 }
 
 @mixin color($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
-  } @else {
-  }
+  // No-op
 }
 
 @mixin typography($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
-  } @else {
-  }
+  // No-op
 }
 
 @mixin density($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
-  } @else {
-  }
+  // No-op
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -37,36 +23,17 @@
   @return (
     (
       namespace: '',
-      tokens: (),
+      tokens: token-utils.get-overrides((base: (), color: (), typography: (), density: ()), input),
     ),
   );
 }
 
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+  @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-input') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
-    }
+    // No-op
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-}

package/list/_list-theme.scss

@@ -4,7 +4,6 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/inspection';
 @use '../core/theming/theming';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use '../radio/m2-radio';
@@ -14,67 +13,49 @@
 @mixin base($theme) {
   // Add default values for tokens not related to color, typography, or density.
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-list.$prefix, m2-list.get-unthemable-tokens());
+      @include token-utils.create-token-values-mixed(m2-list.get-unthemable-tokens());
     }
   }
 }
 
 @mixin color($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-list.$prefix, m2-list.get-color-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-list.get-color-tokens($theme));
     }
 
     .mdc-list-item__start,
     .mdc-list-item__end {
-      @include token-utils.create-token-values-mixed(
-        m2-radio.$prefix, m2-radio.get-color-tokens($theme, primary));
+      @include token-utils.create-token-values-mixed(m2-radio.get-color-tokens($theme, primary));
     }
 
     .mat-accent {
       .mdc-list-item__start,
       .mdc-list-item__end {
-        @include token-utils.create-token-values-mixed(
-          m2-radio.$prefix,
-          m2-radio.get-color-tokens($theme, accent)
-        );
+        @include token-utils.create-token-values-mixed(m2-radio.get-color-tokens($theme, accent));
       }
     }
 
     .mat-warn {
       .mdc-list-item__start,
       .mdc-list-item__end {
-        @include token-utils.create-token-values-mixed(
-          m2-radio.$prefix,
-          m2-radio.get-color-tokens($theme, warn)
-        );
+        @include token-utils.create-token-values-mixed(m2-radio.get-color-tokens($theme, warn));
       }
     }
 
     .mat-mdc-list-option {
-      @include token-utils.create-token-values-mixed(
-        m2-checkbox.$prefix,
-        m2-checkbox.get-color-tokens($theme, primary)
-      );
+      @include token-utils.create-token-values-mixed(m2-checkbox.get-color-tokens($theme, primary));
     }
     .mat-mdc-list-option.mat-accent {
-      @include token-utils.create-token-values-mixed(
-        m2-checkbox.$prefix,
-        m2-checkbox.get-color-tokens($theme, accent)
-      );
+      @include token-utils.create-token-values-mixed(m2-checkbox.get-color-tokens($theme, accent));
     }
     .mat-mdc-list-option.mat-warn {
-      @include token-utils.create-token-values-mixed(
-        m2-checkbox.$prefix,
-        m2-checkbox.get-color-tokens($theme, warn)
-      );
+      @include token-utils.create-token-values-mixed(m2-checkbox.get-color-tokens($theme, warn));
     }
 
     // There is no token for activated color on nav list.
@@ -104,20 +85,18 @@
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(m3-list.$prefix, m3-list.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), density));
   } @else {
     $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(
-        m2-list.$prefix, m2-list.get-density-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-list.get-density-tokens($theme));
     }
 
     .mdc-list-item__start,
     .mdc-list-item__end {
-      @include token-utils.create-token-values-mixed(
-          m2-radio.$prefix, m2-radio.get-density-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-radio.get-density-tokens($theme));
     }
 
     // TODO(mmalerba): This is added to maintain the same style MDC used prior to the token-based
@@ -161,11 +140,10 @@
 
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-list.$prefix, m2-list.get-typography-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-list.get-typography-tokens($theme));
     }
 
     // MDC does not have tokens for the subheader.
@@ -181,23 +159,23 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-list.$prefix,
-      tokens: m2-list.get-token-slots(),
+      namespace: list,
+      tokens: token-utils.get-overrides(m3-list.get-tokens(), list)
     ),
   );
 }
 
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-list') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -212,11 +190,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  $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

@@ -3,28 +3,25 @@
 @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,
+    list-active-indicator-color: transparent,
+    list-active-indicator-shape: 4px,
+    list-list-item-container-shape: 0,
+    list-list-item-leading-avatar-shape: 50%,
+    list-list-item-container-color: transparent,
+    list-list-item-selected-container-color: transparent,
+    list-list-item-leading-avatar-color: transparent,
+    list-list-item-leading-icon-size: 24px,
+    list-list-item-leading-avatar-size: 40px,
+    list-list-item-trailing-icon-size: 24px,
+    list-list-item-disabled-state-layer-color: transparent,
+    list-list-item-disabled-state-layer-opacity: 0,
+    list-list-item-disabled-label-text-opacity: 0.38,
+    list-list-item-disabled-leading-icon-opacity: 0.38,
+    list-list-item-disabled-trailing-icon-opacity: 0.38,
   );
 }
 
@@ -39,50 +36,54 @@ $prefix: (mat, list);
       $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),
+    list-list-item-label-text-color: $foreground-text,
+    list-list-item-supporting-text-color: $foreground-secondary-text,
+    list-list-item-leading-icon-color: $text-icon-on-background,
+    list-list-item-trailing-supporting-text-color: $foreground-hint-text,
+    list-list-item-trailing-icon-color: $text-icon-on-background,
+    list-list-item-selected-trailing-icon-color: $text-icon-on-background,
+    list-list-item-disabled-label-text-color: $foreground-base,
+    list-list-item-disabled-leading-icon-color: $foreground-base,
+    list-list-item-disabled-trailing-icon-color: $foreground-base,
+    list-list-item-hover-label-text-color: $foreground-text,
+    list-list-item-hover-leading-icon-color: $text-icon-on-background,
+    list-list-item-hover-state-layer-color: $foreground-base,
+    list-list-item-hover-state-layer-opacity: if($is-dark, 0.08, 0.04),
+    list-list-item-hover-trailing-icon-color: $text-icon-on-background,
+    list-list-item-focus-label-text-color: $foreground-text,
+    list-list-item-focus-state-layer-color: $foreground-base,
+    list-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(
+    list-list-item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    list-list-item-label-text-line-height:
+        inspection.get-theme-typography($theme, body-1, line-height),
+    list-list-item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    list-list-item-label-text-tracking:
+        inspection.get-theme-typography($theme, body-1, letter-spacing),
+    list-list-item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    list-list-item-supporting-text-font:
+        inspection.get-theme-typography($theme, body-2, font-family),
+    list-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(
+    list-list-item-supporting-text-size: inspection.get-theme-typography($theme, body-2, font-size),
+    list-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(
+    list-list-item-supporting-text-weight:
+        inspection.get-theme-typography($theme, body-2, font-weight),
+    list-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(
+    list-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(
+    list-list-item-trailing-supporting-text-size: inspection.get-theme-typography(
         $theme, caption, font-size),
-    list-item-trailing-supporting-text-tracking: inspection.get-theme-typography(
+    list-list-item-trailing-supporting-text-tracking: inspection.get-theme-typography(
         $theme, caption, letter-spacing),
-    list-item-trailing-supporting-text-weight: inspection.get-theme-typography(
+    list-list-item-trailing-supporting-text-weight: inspection.get-theme-typography(
         $theme, caption, font-weight),
   );
 }
@@ -92,9 +93,9 @@ $prefix: (mat, list);
   $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((
+    list-list-item-leading-icon-start-space: 16px,
+    list-list-item-leading-icon-end-space: 32px,
+    list-list-item-one-line-container-height: map.get((
       0: 48px,
       -1: 44px,
       -2: 40px,
@@ -102,7 +103,7 @@ $prefix: (mat, list);
       -4: 32px,
       -5: 24px,
     ), $scale),
-    list-item-two-line-container-height: map.get((
+    list-list-item-two-line-container-height: map.get((
       0: 64px,
       -1: 60px,
       -2: 56px,
@@ -110,7 +111,7 @@ $prefix: (mat, list);
       -4: 48px,
       -5: 48px,
     ), $scale),
-    list-item-three-line-container-height: map.get((
+    list-list-item-three-line-container-height: map.get((
       0: 88px,
       -1: 84px,
       -2: 80px,

package/list/_m3-list.scss

@@ -3,16 +3,12 @@
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, list);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-list.
-/// @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-list
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
+
   // list-item-container-color
   // This does not match the spec, which defines this to be `md.sys.color.surface`.
   // However, this interferes with the use case of placing a list on other components. For example,
@@ -22,71 +18,77 @@ $prefix: (mat, list);
   // list-item-leading-icon-size
   // Match spec, which has list-item-leading-icon-size of 24px.
   // Current version of tokens (0_161) has 18px.
-  $tokens: (
-    active-indicator-color: map.get($systems, md-sys-color, secondary-container),
-    active-indicator-shape: map.get($systems, md-sys-shape, corner-full),
-    list-item-container-color: if($exclude-hardcoded, null, transparent),
-    list-item-container-shape: map.get($systems, md-sys-shape, corner-none),
-    list-item-disabled-label-text-color: map.get($systems, md-sys-color, on-surface),
-    list-item-disabled-label-text-opacity: if($exclude-hardcoded, null, 0.3),
-    list-item-disabled-leading-icon-color: map.get($systems, md-sys-color, on-surface),
-    list-item-disabled-leading-icon-opacity: if($exclude-hardcoded, null, 0.38),
-    list-item-disabled-state-layer-color: map.get($systems, md-sys-color, on-surface),
-    list-item-disabled-state-layer-opacity:
-        map.get($systems, md-sys-state, focus-state-layer-opacity),
-    list-item-disabled-trailing-icon-color: map.get($systems, md-sys-color, on-surface),
-    list-item-disabled-trailing-icon-opacity: if($exclude-hardcoded, null, 0.38),
-    list-item-focus-label-text-color: map.get($systems, md-sys-color, on-surface),
-    list-item-focus-state-layer-color: map.get($systems, md-sys-color, on-surface),
-    list-item-focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-    list-item-hover-label-text-color: map.get($systems, md-sys-color, on-surface),
-    list-item-hover-state-layer-color: map.get($systems, md-sys-color, on-surface),
-    list-item-hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-    list-item-label-text-color: map.get($systems, md-sys-color, on-surface),
-    list-item-label-text-font: map.get($systems, md-sys-typescale, body-large-font),
-    list-item-label-text-line-height: map.get($systems, md-sys-typescale, body-large-line-height),
-    list-item-label-text-size: map.get($systems, md-sys-typescale, body-large-size),
-    list-item-label-text-tracking: map.get($systems, md-sys-typescale, body-large-tracking),
-    list-item-label-text-weight: map.get($systems, md-sys-typescale, body-large-weight),
-    list-item-leading-avatar-color: map.get($systems, md-sys-color, primary-container),
-    list-item-leading-avatar-shape: map.get($systems, md-sys-shape, corner-full),
-    list-item-leading-avatar-size: if($exclude-hardcoded, null, 40px),
-    list-item-leading-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-    list-item-leading-icon-size: if($exclude-hardcoded, null, 24px),
-    list-item-selected-trailing-icon-color: map.get($systems, md-sys-color, primary),
-    list-item-supporting-text-color: map.get($systems, md-sys-color, on-surface-variant),
-    list-item-supporting-text-font: map.get($systems, md-sys-typescale, body-medium-font),
-    list-item-supporting-text-line-height:
-        map.get($systems, md-sys-typescale, body-medium-line-height),
-    list-item-supporting-text-size: map.get($systems, md-sys-typescale, body-medium-size),
-    list-item-supporting-text-tracking: map.get($systems, md-sys-typescale, body-medium-tracking),
-    list-item-supporting-text-weight: map.get($systems, md-sys-typescale, body-medium-weight),
-    list-item-trailing-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-    list-item-trailing-icon-size: if($exclude-hardcoded, null, 24px),
-    list-item-trailing-supporting-text-color: map.get($systems, md-sys-color, on-surface-variant),
-    list-item-trailing-supporting-text-font: map.get($systems, md-sys-typescale, label-small-font),
-    list-item-trailing-supporting-text-line-height:
-        map.get($systems, md-sys-typescale, label-small-line-height),
-    list-item-trailing-supporting-text-size: map.get($systems, md-sys-typescale, label-small-size),
-    list-item-trailing-supporting-text-tracking:
-        map.get($systems, md-sys-typescale, label-small-tracking),
-    list-item-trailing-supporting-text-weight:
-        map.get($systems, md-sys-typescale, label-small-weight),
+  @return (
+    base: (),
+    color: (
+      list-active-indicator-color: map.get($system, secondary-container),
+      list-active-indicator-shape: map.get($system, corner-full),
+      list-list-item-container-color: transparent,
+      list-list-item-container-shape: map.get($system, corner-none),
+      list-list-item-disabled-label-text-color: map.get($system, on-surface),
+      list-list-item-disabled-label-text-opacity: 0.3,
+      list-list-item-disabled-leading-icon-color: map.get($system, on-surface),
+      list-list-item-disabled-leading-icon-opacity: 0.38,
+      list-list-item-disabled-state-layer-color: map.get($system, on-surface),
+      list-list-item-disabled-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      list-list-item-disabled-trailing-icon-color: map.get($system, on-surface),
+      list-list-item-disabled-trailing-icon-opacity: 0.38,
+      list-list-item-focus-label-text-color: map.get($system, on-surface),
+      list-list-item-focus-state-layer-color: map.get($system, on-surface),
+      list-list-item-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      list-list-item-hover-label-text-color: map.get($system, on-surface),
+      list-list-item-hover-state-layer-color: map.get($system, on-surface),
+      list-list-item-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      list-list-item-label-text-color: map.get($system, on-surface),
+      list-list-item-leading-avatar-color: map.get($system, primary-container),
+      list-list-item-leading-avatar-shape: map.get($system, corner-full),
+      list-list-item-leading-avatar-size: 40px,
+      list-list-item-leading-icon-color: map.get($system, on-surface-variant),
+      list-list-item-leading-icon-size: 24px,
+      list-list-item-selected-trailing-icon-color: map.get($system, primary),
+      list-list-item-supporting-text-color: map.get($system, on-surface-variant),
+      list-list-item-trailing-icon-color: map.get($system, on-surface-variant),
+      list-list-item-trailing-icon-size: 24px,
+      list-list-item-trailing-supporting-text-color: map.get($system, on-surface-variant),
+      list-list-item-selected-container-color: null,
+      list-list-item-hover-leading-icon-color: null,
+      list-list-item-hover-trailing-icon-color: null,
+    ),
+    typography: (
+      list-list-item-label-text-font: map.get($system, body-large-font),
+      list-list-item-label-text-line-height: map.get($system, body-large-line-height),
+      list-list-item-label-text-size: map.get($system, body-large-size),
+      list-list-item-label-text-tracking: map.get($system, body-large-tracking),
+      list-list-item-label-text-weight: map.get($system, body-large-weight),
+      list-list-item-supporting-text-font: map.get($system, body-medium-font),
+      list-list-item-supporting-text-line-height: map.get($system, body-medium-line-height),
+      list-list-item-supporting-text-size: map.get($system, body-medium-size),
+      list-list-item-supporting-text-tracking: map.get($system, body-medium-tracking),
+      list-list-item-supporting-text-weight: map.get($system, body-medium-weight),
+      list-list-item-trailing-supporting-text-font: map.get($system, label-small-font),
+      list-list-item-trailing-supporting-text-line-height:
+          map.get($system, label-small-line-height),
+      list-list-item-trailing-supporting-text-size: map.get($system, label-small-size),
+      list-list-item-trailing-supporting-text-tracking: map.get($system, label-small-tracking),
+      list-list-item-trailing-supporting-text-weight: map.get($system, label-small-weight),
+    ),
+    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
   );
-
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }
 
 // Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -5);
+@function get-density-tokens($scale) {
+  $scale: theming.clamp-density($scale, -5);
   $index: ($scale * -1) + 1;
 
   @return (
-    list-item-leading-icon-start-space: list.nth((16px, 12px, 8px, 4px, 4px, 4px), $index),
-    list-item-leading-icon-end-space: list.nth((16px, 12px, 8px, 4px, 4px, 4px), $index),
-    list-item-one-line-container-height: list.nth((48px, 44px, 40px, 36px, 32px, 24px), $index),
-    list-item-two-line-container-height: list.nth((64px, 60px, 56px, 52px, 48px, 48px), $index),
-    list-item-three-line-container-height: list.nth((88px, 84px, 80px, 76px, 72px, 56px), $index),
+    list-list-item-leading-icon-start-space: list.nth((16px, 12px, 8px, 4px, 4px, 4px), $index),
+    list-list-item-leading-icon-end-space: list.nth((16px, 12px, 8px, 4px, 4px, 4px), $index),
+    list-list-item-one-line-container-height:
+        list.nth((48px, 44px, 40px, 36px, 32px, 24px), $index),
+    list-list-item-two-line-container-height:
+        list.nth((64px, 60px, 56px, 52px, 48px, 48px), $index),
+    list-list-item-three-line-container-height:
+        list.nth((88px, 84px, 80px, 76px, 72px, 56px), $index),
   );
 }

package/menu/_m2-menu.scss

@@ -3,26 +3,23 @@
 @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, menu);
-
 // 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 (
-    container-shape: 4px,
-    divider-bottom-spacing: 0,
-    divider-top-spacing: 0,
-    item-spacing: 16px,
-    item-icon-size: 24px,
-    item-leading-spacing: 16px,
-    item-trailing-spacing: 16px,
-    item-with-icon-leading-spacing: 16px,
-    item-with-icon-trailing-spacing: 16px,
-    container-elevation-shadow: elevation.get-box-shadow(8),
+    menu-container-shape: 4px,
+    menu-divider-bottom-spacing: 0,
+    menu-divider-top-spacing: 0,
+    menu-item-spacing: 16px,
+    menu-item-icon-size: 24px,
+    menu-item-leading-spacing: 16px,
+    menu-item-trailing-spacing: 16px,
+    menu-item-with-icon-leading-spacing: 16px,
+    menu-item-with-icon-trailing-spacing: 16px,
+    menu-container-elevation-shadow: elevation.get-box-shadow(8),
 
     // Unused
-    base-elevation-level: null,
+    menu-base-elevation-level: null,
   );
 }
 
@@ -34,23 +31,23 @@ $prefix: (mat, menu);
   $text-color: inspection.get-theme-color($theme, foreground, text);
 
   @return (
-    item-label-text-color: $text-color,
-    item-icon-color: $text-color,
-    item-hover-state-layer-color: $active-state-layer-color,
-    item-focus-state-layer-color: $active-state-layer-color,
-    container-color: inspection.get-theme-color($theme, background, card),
-    divider-color: inspection.get-theme-color($theme, foreground, divider),
+    menu-item-label-text-color: $text-color,
+    menu-item-icon-color: $text-color,
+    menu-item-hover-state-layer-color: $active-state-layer-color,
+    menu-item-focus-state-layer-color: $active-state-layer-color,
+    menu-container-color: inspection.get-theme-color($theme, background, card),
+    menu-divider-color: inspection.get-theme-color($theme, foreground, divider),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    item-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    item-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    menu-item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    menu-item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    menu-item-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
+    menu-item-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
+    menu-item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
   );
 }