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

package/core/density/private/_all-density.scss

@@ -1,33 +1,33 @@
-@use '../../theming/inspection';
+@use '../../../autocomplete/autocomplete-theme';
+@use '../../../button-toggle/button-toggle-theme';
 @use '../../../button/button-theme';
-@use '../../../button/icon-button-theme';
 @use '../../../button/fab-theme';
+@use '../../../button/icon-button-theme';
+@use '../../../card/card-theme';
+@use '../../../checkbox/checkbox-theme';
+@use '../../../chips/chips-theme';
+@use '../../../core/core-theme';
+@use '../../../dialog/dialog-theme';
 @use '../../../expansion/expansion-theme';
-@use '../../../stepper/stepper-theme';
-@use '../../../toolbar/toolbar-theme';
-@use '../../../tree/tree-theme';
-@use '../../../paginator/paginator-theme';
 @use '../../../form-field/form-field-theme';
-@use '../../../button-toggle/button-toggle-theme';
-@use '../../../card/card-theme';
+@use '../../../input/input-theme';
+@use '../../../list/list-theme';
+@use '../../../menu/menu-theme';
+@use '../../../paginator/paginator-theme';
 @use '../../../progress-bar/progress-bar-theme';
 @use '../../../progress-spinner/progress-spinner-theme';
-@use '../../../tooltip/tooltip-theme';
-@use '../../../input/input-theme';
-@use '../../../autocomplete/autocomplete-theme';
-@use '../../../checkbox/checkbox-theme';
-@use '../../../core/core-theme';
+@use '../../../radio/radio-theme';
 @use '../../../select/select-theme';
-@use '../../../dialog/dialog-theme';
-@use '../../../chips/chips-theme';
 @use '../../../slide-toggle/slide-toggle-theme';
-@use '../../../radio/radio-theme';
 @use '../../../slider/slider-theme';
-@use '../../../menu/menu-theme';
-@use '../../../list/list-theme';
-@use '../../../tabs/tabs-theme';
 @use '../../../snack-bar/snack-bar-theme';
+@use '../../../stepper/stepper-theme';
 @use '../../../table/table-theme';
+@use '../../../tabs/tabs-theme';
+@use '../../../toolbar/toolbar-theme';
+@use '../../../tooltip/tooltip-theme';
+@use '../../../tree/tree-theme';
+@use '../../theming/inspection';
 
 // Includes all of the density styles.
 @mixin all-component-densities($theme) {
@@ -40,35 +40,35 @@
   // not possible as it would introduce a circular dependency for density because the `mat-core`
   // mixin that is transitively loaded by the `all-theme` file, imports `all-density` which
   // would then load `all-theme` again. This ultimately results a circular dependency.
-  @include form-field-theme.density($theme);
+  @include autocomplete-theme.density($theme);
+  @include button-theme.density($theme);
+  @include button-toggle-theme.density($theme);
   @include card-theme.density($theme);
+  @include checkbox-theme.density($theme);
+  @include chips-theme.density($theme);
+  @include core-theme.density($theme);
+  @include dialog-theme.density($theme);
+  @include expansion-theme.density($theme);
+  @include fab-theme.density($theme);
+  @include form-field-theme.density($theme);
+  @include icon-button-theme.density($theme);
+  @include input-theme.density($theme);
+  @include list-theme.density($theme);
+  @include menu-theme.density($theme);
+  @include paginator-theme.density($theme);
   @include progress-bar-theme.density($theme);
   @include progress-spinner-theme.density($theme);
-  @include tooltip-theme.density($theme);
-  @include input-theme.density($theme);
-  @include core-theme.density($theme);
+  @include radio-theme.density($theme);
   @include select-theme.density($theme);
-  @include checkbox-theme.density($theme);
-  @include autocomplete-theme.density($theme);
-  @include dialog-theme.density($theme);
-  @include chips-theme.density($theme);
   @include slide-toggle-theme.density($theme);
-  @include radio-theme.density($theme);
   @include slider-theme.density($theme);
-  @include menu-theme.density($theme);
-  @include list-theme.density($theme);
-  @include paginator-theme.density($theme);
-  @include tabs-theme.density($theme);
   @include snack-bar-theme.density($theme);
-  @include button-theme.density($theme);
-  @include icon-button-theme.density($theme);
-  @include fab-theme.density($theme);
-  @include table-theme.density($theme);
-  @include expansion-theme.density($theme);
   @include stepper-theme.density($theme);
+  @include table-theme.density($theme);
+  @include tabs-theme.density($theme);
   @include toolbar-theme.density($theme);
+  @include tooltip-theme.density($theme);
   @include tree-theme.density($theme);
-  @include button-toggle-theme.density($theme);
 }
 
 

package/core/index.d.ts

@@ -1,21 +1,21 @@
 import * as i0 from '@angular/core';
 import { Version, InjectionToken, Provider } from '@angular/core';
-export { G as GranularSanityChecks, a as MATERIAL_SANITY_CHECKS, M as MatCommonModule, S as SanityChecks } from '../common-module.d-0e6515ae.js';
-export { T as ThemePalette } from '../palette.d-ec4a617c.js';
+export { G as GranularSanityChecks, a as MATERIAL_SANITY_CHECKS, M as MatCommonModule, S as SanityChecks } from '../common-module.d-C8xzHJDr.js';
+export { T as ThemePalette } from '../palette.d-BSSFKjO6.js';
 import { NgControl, FormGroupDirective, NgForm } from '@angular/forms';
 import { Subject } from 'rxjs';
-import { E as ErrorStateMatcher$1 } from '../error-options.d-448d9046.js';
-export { E as ErrorStateMatcher, S as ShowOnDirtyErrorStateMatcher } from '../error-options.d-448d9046.js';
-export { M as MatLine, a as MatLineModule, s as setLines } from '../line.d-570a2537.js';
-export { M as MatOptionModule } from '../index.d-37e31cd3.js';
-export { M as MatRippleLoader } from '../ripple-loader.d-8aac2988.js';
-export { M as MatRippleModule } from '../index.d-0536b706.js';
-export { b as MatPseudoCheckbox, M as MatPseudoCheckboxModule, a as MatPseudoCheckboxState } from '../pseudo-checkbox-module.d-3abc0461.js';
-import { D as DateAdapter } from '../date-adapter.d-c6835d41.js';
-export { D as DateAdapter, M as MAT_DATE_LOCALE, a as MAT_DATE_LOCALE_FACTORY } from '../date-adapter.d-c6835d41.js';
-export { d as MAT_OPTGROUP, a as MatOptgroup, M as MatOption, b as MatOptionSelectionChange, _ as _countGroupLabelsBeforeOption, c as _getOptionScrollPosition } from '../option.d-6f493d78.js';
-export { a as MAT_OPTION_PARENT_COMPONENT, M as MatOptionParentComponent } from '../option-parent.d-559ad5c5.js';
-export { c as MAT_RIPPLE_GLOBAL_OPTIONS, M as MatRipple, g as RippleAnimationConfig, f as RippleConfig, b as RippleGlobalOptions, h as RippleRef, R as RippleRenderer, e as RippleState, a as RippleTarget, d as defaultRippleAnimationConfig } from '../ripple.d-2fb57d04.js';
+import { E as ErrorStateMatcher$1 } from '../error-options.d-CGdTZUYk.js';
+export { S as ShowOnDirtyErrorStateMatcher } from '../error-options.d-CGdTZUYk.js';
+export { M as MatLine, a as MatLineModule, s as setLines } from '../line.d-C-QdueRc.js';
+export { M as MatOptionModule } from '../index.d-CikM2bbf.js';
+export { M as MatRippleLoader } from '../ripple-loader.d-9me-KFSi.js';
+export { M as MatRippleModule } from '../index.d-C5neTPvr.js';
+export { b as MatPseudoCheckbox, M as MatPseudoCheckboxModule, a as MatPseudoCheckboxState } from '../pseudo-checkbox-module.d-BHmTZ10P.js';
+import { D as DateAdapter } from '../date-adapter.d-CtKXIxk0.js';
+export { M as MAT_DATE_LOCALE, a as MAT_DATE_LOCALE_FACTORY } from '../date-adapter.d-CtKXIxk0.js';
+export { d as MAT_OPTGROUP, a as MatOptgroup, M as MatOption, b as MatOptionSelectionChange, _ as _countGroupLabelsBeforeOption, c as _getOptionScrollPosition } from '../option.d-BVGX3edu.js';
+export { a as MAT_OPTION_PARENT_COMPONENT, M as MatOptionParentComponent } from '../option-parent.d-CnYuuMkO.js';
+export { c as MAT_RIPPLE_GLOBAL_OPTIONS, M as MatRipple, g as RippleAnimationConfig, f as RippleConfig, R as RippleGlobalOptions, h as RippleRef, a as RippleRenderer, e as RippleState, b as RippleTarget, d as defaultRippleAnimationConfig } from '../ripple.d-BT30YVLB.js';
 import '@angular/cdk/bidi';
 import '@angular/cdk/a11y';
 import '@angular/cdk/platform';
@@ -23,6 +23,13 @@ import '@angular/cdk/platform';
 /** Current version of Angular Material. */
 declare const VERSION: Version;
 
+/** Object used to configure the animation in Angular Material. */
+interface AnimationsConfig {
+    /** Whether all animations should be disabled. */
+    animationsDisabled?: boolean;
+}
+/** Injection token used to configure the animations in Angular Material. */
+declare const MATERIAL_ANIMATIONS: InjectionToken<AnimationsConfig>;
 /**
  * @deprecated No longer used, will be removed.
  * @breaking-change 21.0.0
@@ -44,6 +51,11 @@ declare class AnimationDurations {
     static ENTERING: string;
     static EXITING: string;
 }
+/**
+ * Returns whether animations have been disabled by DI. Must be called in a DI context.
+ * @docs-private
+ */
+declare function _animationsDisabled(): boolean;
 
 interface ErrorStateMatcher extends ErrorStateMatcher$1 {
 }
@@ -191,4 +203,5 @@ declare class _MatInternalFormField {
     static ɵcmp: i0.ɵɵComponentDeclaration<_MatInternalFormField, "div[mat-internal-form-field]", never, { "labelPosition": { "alias": "labelPosition"; "required": true; }; }, {}, never, ["*"], true, never>;
 }
 
-export { AnimationCurves, AnimationDurations, MAT_DATE_FORMATS, MAT_NATIVE_DATE_FORMATS, type MatDateFormats, MatNativeDateModule, NativeDateAdapter, NativeDateModule, VERSION, _ErrorStateTracker, _MatInternalFormField, _StructuralStylesLoader, provideNativeDateAdapter };
+export { AnimationCurves, AnimationDurations, DateAdapter, ErrorStateMatcher$1 as ErrorStateMatcher, MATERIAL_ANIMATIONS, MAT_DATE_FORMATS, MAT_NATIVE_DATE_FORMATS, MatNativeDateModule, NativeDateAdapter, NativeDateModule, VERSION, _ErrorStateTracker, _MatInternalFormField, _StructuralStylesLoader, _animationsDisabled, provideNativeDateAdapter };
+export type { AnimationsConfig, MatDateFormats };

package/core/m2/_theming.scss

@@ -24,7 +24,6 @@
   @return map.get(map.get($palette, contrast), $hue);
 }
 
-
 /// Creates a map of hues to colors for a theme. This is used to define a theme palette in terms
 /// of the Material Design hues.
 /// @param {Map} $base-palette Map of hue keys to color values for the basis for this palette.
@@ -33,29 +32,39 @@
 /// @param {String | Number} $darker "darker" hue for this palette.
 /// @param {String | Number} $text "text" hue for this palette.
 /// @returns {Map} A complete Angular Material theming palette.
-@function define-palette($base-palette, $default: 500, $lighter: 100, $darker: 700,
-  $text: $default) {
-  $result: map.merge($base-palette, (
-    default: _get-color-from-palette($base-palette, $default),
-    lighter: _get-color-from-palette($base-palette, $lighter),
-    darker: _get-color-from-palette($base-palette, $darker),
-    text: _get-color-from-palette($base-palette, $text),
-    default-contrast: get-contrast-color-from-palette($base-palette, $default),
-    lighter-contrast: get-contrast-color-from-palette($base-palette, $lighter),
-    darker-contrast: get-contrast-color-from-palette($base-palette, $darker)
-  ));
+@function define-palette(
+  $base-palette,
+  $default: 500,
+  $lighter: 100,
+  $darker: 700,
+  $text: $default
+) {
+  $result: map.merge(
+    $base-palette,
+    (
+      default: _get-color-from-palette($base-palette, $default),
+      lighter: _get-color-from-palette($base-palette, $lighter),
+      darker: _get-color-from-palette($base-palette, $darker),
+      text: _get-color-from-palette($base-palette, $text),
+      default-contrast: get-contrast-color-from-palette($base-palette, $default),
+      lighter-contrast: get-contrast-color-from-palette($base-palette, $lighter),
+      darker-contrast: get-contrast-color-from-palette($base-palette, $darker),
+    )
+  );
 
   // For each hue in the palette, add a "-contrast" color to the map.
   @each $hue, $color in $base-palette {
-    $result: map.merge($result, (
-      '#{$hue}-contrast': get-contrast-color-from-palette($base-palette, $hue)
-    ));
+    $result: map.merge(
+      $result,
+      (
+        '#{$hue}-contrast': get-contrast-color-from-palette($base-palette, $hue),
+      )
+    );
   }
 
   @return $result;
 }
 
-
 /// Gets a color from a theme palette (the output of mat-palette).
 /// The hue can be one of the standard values (500, A400, etc.), one of the three preconfigured
 /// hues (default, lighter, darker), or any of the aforementioned suffixed with "-contrast".
@@ -93,11 +102,9 @@
     $color: map.get($theme, color);
     @if not map.get($color, primary) {
       @error 'Theme does not define a valid "primary" palette.';
-    }
-    @else if not map.get($color, accent) {
+    } @else if not map.get($color, accent) {
       @error 'Theme does not define a valid "accent" palette.';
-    }
-    @else if not map.get($color, warn) {
+    } @else if not map.get($color, warn) {
       @error 'Theme does not define a valid "warn" palette.';
     }
   }
@@ -113,7 +120,7 @@
     warn: if($warn != null, $warn, define-palette(palette.$red-palette)),
     is-dark: false,
     foreground: palette.$light-theme-foreground-palette,
-    background: palette.$light-theme-background-palette,
+    background: palette.$light-theme-background-palette
   );
 }
 
@@ -126,7 +133,7 @@
     warn: if($warn != null, $warn, define-palette(palette.$red-palette)),
     is-dark: true,
     foreground: palette.$dark-theme-foreground-palette,
-    background: palette.$dark-theme-background-palette,
+    background: palette.$dark-theme-background-palette
   );
 }
 
@@ -152,10 +159,12 @@
   // configuration for the `color` theming part.
   @if $accent != null {
     @warn theming.$private-legacy-theme-warning;
-    $theme: _mat-validate-theme((
-      _is-legacy-theme: true,
-      color: _mat-create-light-color-config($primary, $accent, $warn),
-    ));
+    $theme: _mat-validate-theme(
+      (
+        _is-legacy-theme: true,
+        color: _mat-create-light-color-config($primary, $accent, $warn),
+      )
+    );
 
     @return _internalize-theme(theming.private-create-backwards-compatibility-theme($theme));
   }
@@ -168,10 +177,16 @@
     $primary: map.get($color-settings, primary);
     $accent: map.get($color-settings, accent);
     $warn: map.get($color-settings, warn);
-    $result: map.merge($result, (color: _mat-create-light-color-config($primary, $accent, $warn)));
+    $result: map.merge(
+      $result,
+      (
+        color: _mat-create-light-color-config($primary, $accent, $warn),
+      )
+    );
   }
   @return _internalize-theme(
-      theming.private-create-backwards-compatibility-theme(_mat-validate-theme($result)));
+    theming.private-create-backwards-compatibility-theme(_mat-validate-theme($result))
+  );
 }
 
 // TODO: Remove legacy API and rename below `$primary` to `$config`. Currently it cannot be renamed
@@ -196,10 +211,12 @@
   // configuration for the `color` theming part.
   @if $accent != null {
     @warn theming.$private-legacy-theme-warning;
-    $theme: _mat-validate-theme((
-      _is-legacy-theme: true,
-      color: _mat-create-dark-color-config($primary, $accent, $warn),
-    ));
+    $theme: _mat-validate-theme(
+      (
+        _is-legacy-theme: true,
+        color: _mat-create-dark-color-config($primary, $accent, $warn),
+      )
+    );
     @return _internalize-theme(theming.private-create-backwards-compatibility-theme($theme));
   }
   // If the map pattern is used (1), we just pass-through the configurations for individual
@@ -211,10 +228,16 @@
     $primary: map.get($color-settings, primary);
     $accent: map.get($color-settings, accent);
     $warn: map.get($color-settings, warn);
-    $result: map.merge($result, (color: _mat-create-dark-color-config($primary, $accent, $warn)));
+    $result: map.merge(
+      $result,
+      (
+        color: _mat-create-dark-color-config($primary, $accent, $warn),
+      )
+    );
   }
   @return _internalize-theme(
-      theming.private-create-backwards-compatibility-theme(_mat-validate-theme($result)));
+    theming.private-create-backwards-compatibility-theme(_mat-validate-theme($result))
+  );
 }
 
 /// Gets the color configuration from the given theme or configuration.
@@ -227,11 +250,11 @@
 }
 
 /// Gets the density configuration from the given theme or configuration.
-/// @param {Map} $theme-or-config  The theme map returned from `define-light-theme` or
+/// @param {Map|string|number} $theme-or-config  The theme map returned from `define-light-theme` or
 ///     `define-dark-theme`.
-/// @param {Map} $default The default value returned if the given `$theme` does not include a
-///     `density` configuration.
-/// @returns {Map} Density configuration for a theme.
+/// @param {string|number} $default The default value returned if the given `$theme` does not
+///     include a `density` configuration.
+/// @returns {string|number} Density configuration for a theme.
 @function get-density-config($theme-or-config, $default: 0) {
   @return theming.private-get-density-config($theme-or-config, $default);
 }
@@ -258,14 +281,16 @@
   $internalized-theme: (
     theming.$private-internal-name: (
       theme-version: 0,
-      m2-config: $theme
-    )
+      m2-config: $theme,
+    ),
   );
   @if (theming.$theme-legacy-inspection-api-compatibility) {
     @return map.merge($theme, $internalized-theme);
   }
-  $error-theme:
-    _replace-values-with-errors($theme, 'Theme may only be accessed via theme inspection API');
+  $error-theme: _replace-values-with-errors(
+    $theme,
+    'Theme may only be accessed via theme inspection API'
+  );
   @return map.merge($error-theme, $internalized-theme);
 }
 
@@ -285,8 +310,7 @@
       $value: map.set($value, $k, _replace-values-with-errors($v, $message));
     }
     @return $value;
-  }
-  @else if $value-type == 'list' and list.length($value) > 0 {
+  } @else if $value-type == 'list' and list.length($value) > 0 {
     @for $i from 1 through list.length() {
       $value: list.set-nth($value, $i, _replace-values-with-errors(list.nth($value, $i), $message));
     }

package/core/{tokens/m2/mat/_optgroup.scss → option/_m2-optgroup.scss}

@@ -1,6 +1,6 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../style/sass-utils';
+@use '../theming/inspection';
+@use '../tokens/m2-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, optgroup);
@@ -39,8 +39,8 @@ $prefix: (mat, optgroup);
 @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/m2/mat/_option.scss → option/_m2-option.scss}

@@ -1,6 +1,6 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../tokens/m2-utils';
+@use '../theming/inspection';
+@use '../style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, option);
@@ -47,8 +47,8 @@ $prefix: (mat, option);
 @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/_optgroup.scss → option/_m3-optgroup.scss}

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../style/sass-utils';
+@use '../tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, optgroup);
@@ -12,11 +12,11 @@ $prefix: (mat, optgroup);
 /// @return {Map} A set of custom tokens for the mat-optgroup
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: sass-utils.merge-all(
-    token-definition.generate-typography-tokens($systems, label-text, title-small),
+    m3-utils.generate-typography-tokens($systems, label-text, title-small),
     (
       label-text-color: map.get($systems, md-sys-color, on-surface-variant),
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/core/option/_m3-option.scss

@@ -0,0 +1,57 @@
+@use 'sass:map';
+@use '../style/sass-utils';
+@use '../tokens/m3-utils';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, option);
+
+/// Generates custom tokens for the mat-option.
+/// @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-option
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  $tokens: (
+    selected-state-label-text-color: map.get($systems, md-sys-color, on-secondary-container),
+    label-text-color: map.get($systems, md-sys-color, on-surface),
+    hover-state-layer-color: sass-utils.safe-color-change(
+      map.get($systems, md-sys-color, on-surface),
+      $alpha: map.get($systems, md-sys-state, hover-state-layer-opacity)
+    ),
+    focus-state-layer-color: sass-utils.safe-color-change(
+      map.get($systems, md-sys-color, on-surface),
+      $alpha: map.get($systems, md-sys-state, focus-state-layer-opacity)
+    ),
+    selected-state-layer-color: map.get($systems, md-sys-color, secondary-container),
+
+    // According to the spec the options have to be `label-large` in all typography
+    // dimensions, however this is inconsistent with the designs and with MDC's
+    // own implementation. This appears to be a bug in the spec, because MDC overrides
+    // the font size and weight to be `body-large` (see b/261838263). We make the same
+    // override here so the label looks correct.
+    label-text-size: map.get($systems, md-sys-typescale, body-large-size),
+    label-text-weight: map.get($systems, md-sys-typescale, body-large-weight),
+    label-text-font: map.get($systems, md-sys-typescale, label-large-font),
+    label-text-line-height: map.get($systems, md-sys-typescale, label-large-line-height),
+    label-text-tracking: map.get($systems, md-sys-typescale, label-large-tracking),
+  );
+
+  $variant-tokens: (
+    // Color variants:
+    primary: (
+      selected-state-label-text-color: map.get($systems, md-sys-color, on-primary-container),
+      selected-state-layer-color: map.get($systems, md-sys-color, primary-container),
+    ),
+    secondary: (), // Default, no overrides needed
+    tertiary: (
+      selected-state-label-text-color: map.get($systems, md-sys-color, on-tertiary-container),
+      selected-state-layer-color: map.get($systems, md-sys-color, tertiary-container),
+    ),
+    error: (
+      selected-state-label-text-color: map.get($systems, md-sys-color, on-error-container),
+      selected-state-layer-color: map.get($systems, md-sys-color, error-container),
+    )
+  );
+
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
+}

package/core/option/_optgroup-theme.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../tokens/m2/mat/optgroup' as tokens-mat-optgroup;
+@use './m2-optgroup';
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
 @use '../theming/theming';
@@ -19,10 +19,8 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mat-optgroup.$prefix,
-        tokens-mat-optgroup.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-optgroup.$prefix, m2-optgroup.get-color-tokens($theme));
     }
   }
 }
@@ -32,17 +30,15 @@
     @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-mat-optgroup.$prefix,
-        tokens-mat-optgroup.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-optgroup.$prefix, m2-optgroup.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @else {
   }
 }
@@ -51,8 +47,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-optgroup.$prefix,
-      tokens: tokens-mat-optgroup.get-token-slots(),
+      namespace: m2-optgroup.$prefix,
+      tokens: m2-optgroup.get-token-slots(),
     ),
   );
 }
@@ -86,8 +82,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-optgroup.$prefix,
-      map.get($tokens, tokens-mat-optgroup.$prefix)
+      m2-optgroup.$prefix,
+      map.get($tokens, m2-optgroup.$prefix)
     );
   }
 }

package/core/option/_option-theme.scss

@@ -1,4 +1,4 @@
-@use '../tokens/m2/mat/option' as tokens-mat-option;
+@use './m2-option';
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
 @use '../theming/theming';
@@ -26,24 +26,18 @@
     @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-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-option.$prefix, m2-option.get-color-tokens($theme));
     }
 
     .mat-accent {
-      @include token-utils.create-token-values(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme, accent)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-option.$prefix, m2-option.get-color-tokens($theme, accent));
     }
 
     .mat-warn {
-      @include token-utils.create-token-values(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme, warn)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-option.$prefix, m2-option.get-color-tokens($theme, warn));
     }
   }
 }
@@ -55,10 +49,8 @@
     @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-mat-option.$prefix,
-        tokens-mat-option.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-option.$prefix, m2-option.get-typography-tokens($theme));
     }
   }
 }
@@ -67,7 +59,7 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @else {
   }
 }
@@ -76,8 +68,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-option.$prefix,
-      tokens: tokens-mat-option.get-token-slots(),
+      namespace: m2-option.$prefix,
+      tokens: m2-option.get-token-slots(),
     ),
   );
 }
@@ -116,6 +108,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-option-tokens: token-utils.get-tokens-for($tokens, tokens-mat-option.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mat-option.$prefix, $mat-option-tokens);
+  $mat-option-tokens: token-utils.get-tokens-for($tokens, m2-option.$prefix, $options...);
+  @include token-utils.create-token-values(m2-option.$prefix, $mat-option-tokens);
 }