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

package/form-field/_m3-form-field.scss

@@ -1,153 +1,138 @@
 @use 'sass:map';
 @use 'sass:list';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
+@use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, form-field);
 
 /// Generates custom tokens for the mat-form-field.
-/// @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-form-field
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: sass-utils.merge-all(
-    m3-utils.generate-typography-tokens($systems, container-text, body-large),
-    m3-utils.generate-typography-tokens($systems, subscript-text, body-small),
-    (
-      disabled-input-text-placeholder-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      state-layer-color: map.get($systems, md-sys-color, on-surface),
-      error-text-color: map.get($systems, md-sys-color, error),
-      select-option-text-color: map.get($systems, md-ref-palette, neutral10),
-      select-disabled-option-text-color:
-          sass-utils.safe-color-change(map.get($systems, md-ref-palette, neutral10), $alpha: 0.38),
-      enabled-select-arrow-color: map.get($systems, md-sys-color, on-surface-variant),
-      disabled-select-arrow-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-      focus-state-layer-opacity: m3-utils.hardcode(0, $exclude-hardcoded),
-      focus-select-arrow-color: map.get($systems, md-sys-color, primary),
-      leading-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-      disabled-leading-icon-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      trailing-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-      disabled-trailing-icon-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      error-focus-trailing-icon-color: map.get($systems, md-sys-color, error),
-      error-hover-trailing-icon-color: map.get($systems, md-sys-color, on-error-container),
-      error-trailing-icon-color: map.get($systems, md-sys-color, error),
-      filled-active-indicator-color: map.get($systems, md-sys-color, on-surface-variant),
-      filled-active-indicator-height: if($exclude-hardcoded, null, 1px),
-      filled-caret-color: map.get($systems, md-sys-color, primary),
-      filled-container-color: map.get($systems, md-sys-color, surface-variant),
-      filled-container-shape: map.get($systems, md-sys-shape, corner-extra-small),
-      filled-disabled-active-indicator-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      filled-disabled-container-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.04),
-      filled-disabled-input-text-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      filled-disabled-label-text-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      filled-error-active-indicator-color: map.get($systems, md-sys-color, error),
-      filled-error-focus-active-indicator-color: map.get($systems, md-sys-color, error),
-      filled-error-focus-label-text-color: map.get($systems, md-sys-color, error),
-      filled-error-hover-active-indicator-color:
-          map.get($systems, md-sys-color, on-error-container),
-      filled-error-hover-label-text-color: map.get($systems, md-sys-color, on-error-container),
-      filled-error-label-text-color: map.get($systems, md-sys-color, error),
-      filled-focus-active-indicator-color: map.get($systems, md-sys-color, primary),
-      filled-focus-active-indicator-height: if($exclude-hardcoded, null, 2px),
-      filled-focus-label-text-color: map.get($systems, md-sys-color, primary),
-      filled-hover-active-indicator-color: map.get($systems, md-sys-color, on-surface),
-      filled-hover-label-text-color: map.get($systems, md-sys-color, on-surface-variant),
-      filled-input-text-color: map.get($systems, md-sys-color, on-surface),
-      filled-input-text-placeholder-color: map.get($systems, md-sys-color, on-surface-variant),
-      filled-label-text-color: map.get($systems, md-sys-color, on-surface-variant),
-      filled-label-text-font: map.get($systems, md-sys-typescale, body-large-font),
-      filled-label-text-size: map.get($systems, md-sys-typescale, body-large-size),
-      filled-label-text-tracking: map.get($systems, md-sys-typescale, body-large-tracking),
-      filled-label-text-weight: map.get($systems, md-sys-typescale, body-large-weight),
-      outlined-caret-color: map.get($systems, md-sys-color, primary),
-      outlined-container-shape: map.get($systems, md-sys-shape, corner-extra-small),
-      outlined-disabled-input-text-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      outlined-disabled-label-text-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      outlined-disabled-outline-color:
-          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.12),
-      outlined-error-focus-label-text-color: map.get($systems, md-sys-color, error),
-      outlined-error-focus-outline-color: map.get($systems, md-sys-color, error),
-      outlined-error-hover-label-text-color: map.get($systems, md-sys-color, on-error-container),
-      outlined-error-hover-outline-color: map.get($systems, md-sys-color, on-error-container),
-      outlined-error-label-text-color: map.get($systems, md-sys-color, error),
-      outlined-error-outline-color: map.get($systems, md-sys-color, error),
-      outlined-focus-label-text-color: map.get($systems, md-sys-color, primary),
-      outlined-focus-outline-color: map.get($systems, md-sys-color, primary),
-      outlined-focus-outline-width: if($exclude-hardcoded, null, 2px),
-      outlined-hover-label-text-color: map.get($systems, md-sys-color, on-surface),
-      outlined-hover-outline-color: map.get($systems, md-sys-color, on-surface),
-      outlined-input-text-color: map.get($systems, md-sys-color, on-surface),
-      outlined-input-text-placeholder-color: map.get($systems, md-sys-color, on-surface-variant),
-      outlined-label-text-color: map.get($systems, md-sys-color, on-surface-variant),
-      outlined-label-text-font: map.get($systems, md-sys-typescale, body-large-font),
-      outlined-label-text-size: map.get($systems, md-sys-typescale, body-large-size),
-      outlined-label-text-tracking: map.get($systems, md-sys-typescale, body-large-tracking),
-      outlined-label-text-weight: map.get($systems, md-sys-typescale, body-large-weight),
-      outlined-outline-color: map.get($systems, md-sys-color, outline),
-      outlined-outline-width: if($exclude-hardcoded, null, 1px),
-    )
-  );
+/// @param {String} $color-variant The color variant to use for the component
+@function get-tokens($theme: m3.$sys-theme, $color-variant: null) {
+  $system: m3-utils.get-system($theme);
+  @if $color-variant {
+    $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
+  }
 
-  $variant-tokens: (
-    // Color variants:
-    primary: (), // Default, no overrides needed.
-    secondary: (
-      focus-select-arrow-color: map.get($systems, md-sys-color, secondary),
-      filled-caret-color: map.get($systems, md-sys-color, secondary),
-      filled-focus-active-indicator-color: map.get($systems, md-sys-color, secondary),
-      filled-focus-label-text-color: map.get($systems, md-sys-color, secondary),
-      outlined-caret-color: map.get($systems, md-sys-color, secondary),
-      outlined-focus-label-text-color: map.get($systems, md-sys-color, secondary),
-      outlined-focus-outline-color: map.get($systems, md-sys-color, secondary),
+  @return (
+    base: (
+      form-field-filled-active-indicator-height: 1px,
+      form-field-filled-focus-active-indicator-height: 2px,
+      form-field-filled-container-shape: map.get($system, corner-extra-small),
+      form-field-outlined-outline-width: 1px,
+      form-field-outlined-focus-outline-width: 2px,
+      form-field-outlined-container-shape: map.get($system, corner-extra-small),
     ),
-    tertiary: (
-      focus-select-arrow-color: map.get($systems, md-sys-color, tertiary),
-      filled-caret-color: map.get($systems, md-sys-color, tertiary),
-      filled-focus-active-indicator-color: map.get($systems, md-sys-color, tertiary),
-      filled-focus-label-text-color: map.get($systems, md-sys-color, tertiary),
-      outlined-caret-color: map.get($systems, md-sys-color, tertiary),
-      outlined-focus-label-text-color: map.get($systems, md-sys-color, tertiary),
-      outlined-focus-outline-color: map.get($systems, md-sys-color, tertiary),
+    color: (
+      form-field-disabled-input-text-placeholder-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-disabled-leading-icon-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-disabled-select-arrow-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-disabled-trailing-icon-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-enabled-select-arrow-color: map.get($system, on-surface-variant),
+      form-field-error-focus-trailing-icon-color: map.get($system, error),
+      form-field-error-hover-trailing-icon-color: map.get($system, on-error-container),
+      form-field-error-text-color: map.get($system, error),
+      form-field-error-trailing-icon-color: map.get($system, error),
+      form-field-filled-active-indicator-color: map.get($system, on-surface-variant),
+      form-field-filled-caret-color: map.get($system, primary),
+      form-field-filled-container-color: map.get($system, surface-variant),
+      form-field-filled-disabled-active-indicator-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-filled-disabled-container-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 4%),
+      form-field-filled-disabled-input-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-filled-disabled-label-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-filled-error-active-indicator-color: map.get($system, error),
+      form-field-filled-error-caret-color: map.get($system, error),
+      form-field-filled-error-focus-active-indicator-color: map.get($system, error),
+      form-field-filled-error-focus-label-text-color: map.get($system, error),
+      form-field-filled-error-hover-active-indicator-color: map.get($system, on-error-container),
+      form-field-filled-error-hover-label-text-color: map.get($system, on-error-container),
+      form-field-filled-error-label-text-color: map.get($system, error),
+      form-field-filled-focus-active-indicator-color: map.get($system, primary),
+      form-field-filled-focus-label-text-color: map.get($system, primary),
+      form-field-filled-hover-active-indicator-color: map.get($system, on-surface),
+      form-field-filled-hover-label-text-color: map.get($system, on-surface-variant),
+      form-field-filled-input-text-color: map.get($system, on-surface),
+      form-field-filled-input-text-placeholder-color: map.get($system, on-surface-variant),
+      form-field-filled-label-text-color: map.get($system, on-surface-variant),
+      form-field-focus-select-arrow-color: map.get($system, primary),
+      form-field-focus-state-layer-opacity: 0,
+      form-field-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      form-field-leading-icon-color: map.get($system, on-surface-variant),
+      form-field-outlined-caret-color: map.get($system, primary),
+      form-field-outlined-disabled-input-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-outlined-disabled-label-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      form-field-outlined-disabled-outline-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      form-field-outlined-error-caret-color: map.get($system, error),
+      form-field-outlined-error-focus-label-text-color: map.get($system, error),
+      form-field-outlined-error-focus-outline-color: map.get($system, error),
+      form-field-outlined-error-hover-label-text-color: map.get($system, on-error-container),
+      form-field-outlined-error-hover-outline-color: map.get($system, on-error-container),
+      form-field-outlined-error-label-text-color: map.get($system, error),
+      form-field-outlined-error-outline-color: map.get($system, error),
+      form-field-outlined-focus-label-text-color: map.get($system, primary),
+      form-field-outlined-focus-outline-color: map.get($system, primary),
+      form-field-outlined-hover-label-text-color: map.get($system, on-surface),
+      form-field-outlined-hover-outline-color: map.get($system, on-surface),
+      form-field-outlined-input-text-color: map.get($system, on-surface),
+      form-field-outlined-input-text-placeholder-color: map.get($system, on-surface-variant),
+      form-field-outlined-label-text-color: map.get($system, on-surface-variant),
+      form-field-outlined-outline-color: map.get($system, outline),
+      form-field-select-disabled-option-text-color:
+          m3-utils.color-with-opacity(map.get($system, neutral10), 38%),
+      form-field-select-option-text-color: map.get($system, neutral10),
+      form-field-state-layer-color: map.get($system, on-surface),
+      form-field-trailing-icon-color: map.get($system, on-surface-variant),
     ),
-    error: (
-      focus-select-arrow-color: map.get($systems, md-sys-color, error),
-      filled-caret-color: map.get($systems, md-sys-color, error),
-      filled-focus-active-indicator-color: map.get($systems, md-sys-color, error),
-      filled-focus-label-text-color: map.get($systems, md-sys-color, error),
-      outlined-caret-color: map.get($systems, md-sys-color, error),
-      outlined-focus-label-text-color: map.get($systems, md-sys-color, error),
-      outlined-focus-outline-color: map.get($systems, md-sys-color, error),
-    )
+    typography: (
+      form-field-container-text-font: map.get($system, body-large-font),
+      form-field-container-text-line-height: map.get($system, body-large-line-height),
+      form-field-container-text-size: map.get($system, body-large-size),
+      form-field-container-text-tracking: map.get($system, body-large-tracking),
+      form-field-container-text-weight: map.get($system, body-large-weight),
+      form-field-subscript-text-font: map.get($system, body-small-font),
+      form-field-subscript-text-line-height: map.get($system, body-small-line-height),
+      form-field-subscript-text-size: map.get($system, body-small-size),
+      form-field-subscript-text-tracking: map.get($system, body-small-tracking),
+      form-field-subscript-text-weight: map.get($system, body-small-weight),
+      form-field-outlined-label-text-font: map.get($system, body-large-font),
+      form-field-outlined-label-text-size: map.get($system, body-large-size),
+      form-field-outlined-label-text-tracking: map.get($system, body-large-tracking),
+      form-field-outlined-label-text-weight: map.get($system, body-large-weight),
+      form-field-filled-label-text-font: map.get($system, body-large-font),
+      form-field-filled-label-text-size: map.get($system, body-large-size),
+      form-field-filled-label-text-tracking: map.get($system, body-large-tracking),
+      form-field-filled-label-text-weight: map.get($system, body-large-weight),
+      form-field-outlined-label-text-populated-size: null,
+    ),
+    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
   );
-
-  @return m3-utils.namespace($prefix, ($tokens, $variant-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 (
-    container-height: list.nth((56px, 52px, 48px, 44px, 40px, 36px), $index),
-    filled-label-display: list.nth((block, block, none, none, none, none), $index),
-    container-vertical-padding: list.nth((16px, 14px, 12px, 10px, 8px, 6px), $index),
-    filled-with-label-container-padding-top: list.nth((24px, 22px, 12px, 10px, 8px, 6px), $index),
-    filled-with-label-container-padding-bottom: list.nth((8px, 6px, 12px, 10px, 8px, 6px), $index),
+    form-field-container-height: list.nth((56px, 52px, 48px, 44px, 40px, 36px), $index),
+    form-field-filled-label-display: list.nth((block, block, none, none, none, none), $index),
+    form-field-container-vertical-padding: list.nth((16px, 14px, 12px, 10px, 8px, 6px), $index),
+    form-field-filled-with-label-container-padding-top:
+        list.nth((24px, 22px, 12px, 10px, 8px, 6px), $index),
+    form-field-filled-with-label-container-padding-bottom:
+        list.nth((8px, 6px, 12px, 10px, 8px, 6px), $index),
   );
 }

package/grid-list/_grid-list-theme.scss

@@ -1,15 +1,15 @@
 @use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/typography/typography';
 @use './m2-grid-list';
+@use './m3-grid-list';
 @use '../core/style/sass-utils';
 @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));
+    @include token-utils.create-token-values(map.get(m3-grid-list.get-tokens($theme), base));
   } @else {
   }
 }
@@ -17,25 +17,24 @@
 // Include this empty mixin for consistency with the other components.
 @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-grid-list.get-tokens($theme), color));
   } @else {
   }
 }
 
 @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-grid-list.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-grid-list.$prefix, m2-grid-list.get-typography-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-grid-list.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
+    @include token-utils.create-token-values(map.get(m3-grid-list.get-tokens($theme), density));
   } @else {
   }
 }
@@ -44,20 +43,23 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-grid-list.$prefix,
-      tokens: m2-grid-list.get-token-slots(),
+      namespace: grid-list,
+      tokens: token-utils.get-overrides(m3-grid-list.get-tokens(), grid-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-grid-list') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -72,15 +74,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'
-  );
-  @if ($tokens != ()) {
-    @include token-utils.create-token-values(
-      m2-grid-list.$prefix,
-      map.get($tokens, m2-grid-list.$prefix)
-    );
-  }
-}

package/grid-list/_m2-grid-list.scss

@@ -2,9 +2,6 @@
 @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);
-
 // 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() {
@@ -22,10 +19,14 @@ $prefix: (mat, grid-list);
     // TODO(crisbeto): other components have tokens for all typography dimensions.
     // Here we only set the font size to maintain the same appearance as the pre-tokens
     // theming API. Consider adding more tokens for letter spacing, font weight etc.
-    tile-header-primary-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    tile-header-secondary-text-size: inspection.get-theme-typography($theme, caption, font-size),
-    tile-footer-primary-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    tile-footer-secondary-text-size: inspection.get-theme-typography($theme, caption, font-size),
+    grid-list-tile-header-primary-text-size:
+        inspection.get-theme-typography($theme, body-2, font-size),
+    grid-list-tile-header-secondary-text-size:
+        inspection.get-theme-typography($theme, caption, font-size),
+    grid-list-tile-footer-primary-text-size:
+        inspection.get-theme-typography($theme, body-2, font-size),
+    grid-list-tile-footer-secondary-text-size:
+        inspection.get-theme-typography($theme, caption, font-size),
   );
 }
 

package/grid-list/_m3-grid-list.scss

@@ -1,21 +1,20 @@
 @use 'sass:map';
 @use '../core/tokens/m3-utils';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, grid-list);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-grid-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-grid-list
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    tile-header-primary-text-size: map.get($systems, md-sys-typescale, body-large),
-    tile-header-secondary-text-size: map.get($systems, md-sys-typescale, body-medium),
-    tile-footer-primary-text-size: map.get($systems, md-sys-typescale, body-large),
-    tile-footer-secondary-text-size: map.get($systems, md-sys-typescale, body-medium),
-  );
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
 
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+  @return (
+    base: (),
+    color: (),
+    typography: (
+      grid-list-tile-header-primary-text-size: map.get($system, body-large),
+      grid-list-tile-header-secondary-text-size: map.get($system, body-medium),
+      grid-list-tile-footer-primary-text-size: map.get($system, body-large),
+      grid-list-tile-footer-secondary-text-size: map.get($system, body-medium),
+    ),
+    density: (),
+  );
 }

package/icon/_icon-theme.scss

@@ -1,14 +1,15 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/inspection';
 @use '../core/theming/theming';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use './m2-icon';
+@use './m3-icon';
+@use 'sass:map';
 
 @mixin _palette-colors($theme, $palette-name) {
   $color: inspection.get-theme-color($theme, $palette-name, text);
   $tokens: m2-icon.private-get-icon-color-tokens($color);
-  @include token-utils.create-token-values-mixed(m2-icon.$prefix, $tokens);
+  @include token-utils.create-token-values-mixed($tokens);
 }
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -16,25 +17,21 @@
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
   @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-icon.get-tokens($theme), base));
   } @else {
   }
 }
 
 /// Outputs color theme styles for the mat-icon.
 /// @param {Map} $theme The theme to generate color styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the icon: primary, secondary, tertiary, or error
-///     (If not specified, default neutral color will be used).
-@mixin color($theme, $options...) {
+/// @param {String} $color-variant The color variant to use for the component (M3 only)
+@mixin color($theme, $color-variant: null) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
+    @include token-utils.create-token-values(
+        map.get(m3-icon.get-tokens($theme, $color-variant), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-icon.$prefix,
-        m2-icon.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-icon.get-color-tokens($theme));
     }
 
     .mat-icon {
@@ -57,7 +54,7 @@
 /// @param {Map} $theme The theme to generate typography styles for.
 @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-icon.get-tokens($theme), typography));
   } @else {
   }
 }
@@ -66,7 +63,7 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
+    @include token-utils.create-token-values(map.get(m3-icon.get-tokens($theme), density));
   } @else {
   }
 }
@@ -75,8 +72,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-icon.$prefix,
-      tokens: m2-icon.get-token-slots(),
+      namespace: icon,
+      tokens: token-utils.get-overrides(m3-icon.get-tokens(), icon)
     ),
   );
 }
@@ -84,18 +81,19 @@
 /// Outputs the CSS variable values for the given tokens.
 /// @param {Map} $tokens The token values to emit.
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 /// Outputs all (base, color, typography, and density) theme styles for the mat-icon.
 /// @param {Map} $theme The theme to generate styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the icon: surface, primary, secondary, tertiary,
-///     or error (If not specified, default surface color will be used).
-@mixin theme($theme, $options...) {
+/// @param {String} $color-variant The color variant to use for the component (M3 only)
+@mixin theme($theme, $color-variant: null) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-icon') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
+      @include base($theme);
+      @include color($theme, $color-variant);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -110,11 +108,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens, $options...) {
-  @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, m2-icon.$prefix, $options...);
-  @include token-utils.create-token-values(m2-icon.$prefix, $mat-icon-tokens);
-}

package/icon/_m2-icon.scss

@@ -1,9 +1,6 @@
 @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);
-
 // 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() {
@@ -29,7 +26,7 @@ $prefix: (mat, icon);
 // Mixin used to set a specific color on an icon.
 @function private-get-icon-color-tokens($color) {
   @return (
-    color: $color,
+    icon-color: $color,
   );
 }
 

package/icon/_m3-icon.scss

@@ -1,35 +1,21 @@
 @use 'sass:map';
 @use '../core/tokens/m3-utils';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, icon);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-icon.
-/// @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-icon
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    color: m3-utils.hardcode(inherit, $exclude-hardcoded),
-  );
+@function get-tokens($theme: m3.$sys-theme, $color-variant: null) {
+  $system: m3-utils.get-system($theme);
+  $color: inherit;
+  @if $color-variant {
+    $color: map.get($system, $color-variant);
+  }
 
-  $variant-tokens: (
-    // Color variants:
-    surface: (), // Default, no overrides needed.
-    primary: (
-      color: map.get($systems, md-sys-color, primary),
-    ),
-    secondary: (
-      color: map.get($systems, md-sys-color, secondary),
+  @return (
+    base: (),
+    color: (
+      icon-color: $color,
     ),
-    tertiary: (
-      color: map.get($systems, md-sys-color, tertiary),
-    ),
-    error: (
-      color: map.get($systems, md-sys-color, error),
-    )
+    typography: (),
+    density: (),
   );
-
-  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }