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

package/chips/index.d.ts

@@ -3,12 +3,12 @@ import { ElementRef, OnInit, AfterViewInit, AfterContentInit, DoCheck, OnDestroy
 import { Subject, Observable } from 'rxjs';
 import { FocusKeyManager } from '@angular/cdk/a11y';
 import { ControlValueAccessor, NgControl } from '@angular/forms';
-import { E as ErrorStateMatcher } from '../error-options.d-448d9046.js';
-import { M as MatFormFieldControl } from '../form-field-control.d-eb86711c.js';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
-import { M as MatRippleModule } from '../index.d-cc6e48d4.js';
+import { E as ErrorStateMatcher } from '../error-options.d-059d9639.js';
+import { M as MatFormFieldControl } from '../form-field-control.d-9ed49092.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { M as MatRippleModule } from '../index.d-511f9e6c.js';
 import '@angular/cdk/bidi';
-import '../ripple.d-f2cd74cf.js';
+import '../ripple.d-305c30f3.js';
 import '@angular/cdk/platform';
 
 /**
@@ -913,4 +913,5 @@ declare const MAT_CHIP_REMOVE: InjectionToken<unknown>;
  */
 declare const MAT_CHIP: InjectionToken<unknown>;
 
-export { MAT_CHIP, MAT_CHIPS_DEFAULT_OPTIONS, MAT_CHIP_AVATAR, MAT_CHIP_LISTBOX_CONTROL_VALUE_ACCESSOR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON, MatChip, MatChipAvatar, MatChipEditInput, type MatChipEditedEvent, type MatChipEvent, MatChipGrid, MatChipGridChange, MatChipInput, type MatChipInputEvent, MatChipListbox, MatChipListboxChange, MatChipOption, MatChipRemove, MatChipRow, MatChipSelectionChange, MatChipSet, type MatChipTextControl, MatChipTrailingIcon, type MatChipsDefaultOptions, MatChipsModule };
+export { MAT_CHIP, MAT_CHIPS_DEFAULT_OPTIONS, MAT_CHIP_AVATAR, MAT_CHIP_LISTBOX_CONTROL_VALUE_ACCESSOR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON, MatChip, MatChipAvatar, MatChipEditInput, MatChipGrid, MatChipGridChange, MatChipInput, MatChipListbox, MatChipListboxChange, MatChipOption, MatChipRemove, MatChipRow, MatChipSelectionChange, MatChipSet, MatChipTrailingIcon, MatChipsModule };
+export type { MatChipEditedEvent, MatChipEvent, MatChipInputEvent, MatChipTextControl, MatChipsDefaultOptions };

package/chips/testing/index.d.ts

@@ -245,4 +245,5 @@ declare class MatChipSetHarness extends ComponentHarness {
     getChips(filter?: ChipHarnessFilters): Promise<MatChipHarness[]>;
 }
 
-export { type ChipAvatarHarnessFilters, type ChipEditInputHarnessFilters, type ChipGridHarnessFilters, type ChipHarnessFilters, type ChipInputHarnessFilters, type ChipListboxHarnessFilters, type ChipOptionHarnessFilters, type ChipRemoveHarnessFilters, type ChipRowHarnessFilters, type ChipSetHarnessFilters, MatChipAvatarHarness, MatChipEditInputHarness, MatChipGridHarness, MatChipHarness, MatChipInputHarness, MatChipListboxHarness, MatChipOptionHarness, MatChipRemoveHarness, MatChipRowHarness, MatChipSetHarness };
+export { MatChipAvatarHarness, MatChipEditInputHarness, MatChipGridHarness, MatChipHarness, MatChipInputHarness, MatChipListboxHarness, MatChipOptionHarness, MatChipRemoveHarness, MatChipRowHarness, MatChipSetHarness };
+export type { ChipAvatarHarnessFilters, ChipEditInputHarnessFilters, ChipGridHarnessFilters, ChipHarnessFilters, ChipInputHarnessFilters, ChipListboxHarnessFilters, ChipOptionHarnessFilters, ChipRemoveHarnessFilters, ChipRowHarnessFilters, ChipSetHarnessFilters };

package/{common-module.d-0e6515ae.d.ts → common-module.d-421e3498.d.ts}

@@ -40,4 +40,5 @@ declare class MatCommonModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatCommonModule>;
 }
 
-export { type GranularSanityChecks as G, MatCommonModule as M, type SanityChecks as S, MATERIAL_SANITY_CHECKS as a };
+export { MatCommonModule as M, MATERIAL_SANITY_CHECKS as a };
+export type { GranularSanityChecks as G, SanityChecks as S };

package/core/_core-theme.scss

@@ -8,12 +8,11 @@
 @use './style/sass-utils';
 @use './typography/typography';
 @use './tokens/token-utils';
-@use './tokens/m2/mat/app' as tokens-mat-app;
-@use './tokens/m2/mat/ripple' as tokens-mat-ripple;
-@use './tokens/m2/mat/option' as tokens-mat-option;
-@use './tokens/m2/mat/optgroup' as tokens-mat-optgroup;
-@use './tokens/m2/mat/full-pseudo-checkbox' as tokens-mat-full-pseudo-checkbox;
-@use './tokens/m2/mat/minimal-pseudo-checkbox' as tokens-mat-minimal-pseudo-checkbox;
+@use './m2-app';
+@use 'ripple/m2-ripple';
+@use 'option/m2-option';
+@use 'option/m2-optgroup';
+@use 'selection/pseudo-checkbox/m2-pseudo-checkbox';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -25,9 +24,7 @@
     @include pseudo-checkbox-theme.base($theme);
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-app.$prefix,
-        tokens-mat-app.get-unthemable-tokens()
-      );
+        m2-app.$prefix, m2-app.get-unthemable-tokens());
     }
   }
 }
@@ -42,9 +39,7 @@
     @include pseudo-checkbox-theme.color($theme);
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-app.$prefix,
-        tokens-mat-app.get-color-tokens($theme)
-      );
+        m2-app.$prefix, m2-app.get-color-tokens($theme));
     }
   }
 }
@@ -72,28 +67,22 @@
 }
 
 @function _define-overrides() {
-  $app-tokens: tokens-mat-app.get-token-slots();
-  $ripple-tokens: tokens-mat-ripple.get-token-slots();
-  $option-tokens: tokens-mat-option.get-token-slots();
-  $optgroup-tokens: tokens-mat-optgroup.get-token-slots();
-  $full-pseudo-checkbox-tokens: tokens-mat-full-pseudo-checkbox.get-token-slots();
-  $minimal-pseudo-checkbox-tokens: tokens-mat-minimal-pseudo-checkbox.get-token-slots();
+  $app-tokens: m2-app.get-token-slots();
+  $ripple-tokens: m2-ripple.get-token-slots();
+  $option-tokens: m2-option.get-token-slots();
+  $optgroup-tokens: m2-optgroup.get-token-slots();
+  $pseudo-checkbox-tokens: m2-pseudo-checkbox.get-token-slots();
 
   @return (
-    (namespace: tokens-mat-app.$prefix, tokens: $app-tokens, prefix: 'app-'),
-    (namespace: tokens-mat-ripple.$prefix, tokens: $ripple-tokens, prefix: 'ripple-'),
-    (namespace: tokens-mat-option.$prefix, tokens: $option-tokens, prefix: 'option-'),
-    (namespace: tokens-mat-optgroup.$prefix, tokens: $optgroup-tokens, prefix: 'optgroup-'),
+    (namespace: m2-app.$prefix, tokens: $app-tokens, prefix: 'app-'),
+    (namespace: m2-ripple.$prefix, tokens: $ripple-tokens, prefix: 'ripple-'),
+    (namespace: m2-option.$prefix, tokens: $option-tokens, prefix: 'option-'),
+    (namespace: m2-optgroup.$prefix, tokens: $optgroup-tokens, prefix: 'optgroup-'),
     (
-      namespace: tokens-mat-full-pseudo-checkbox.$prefix,
-      tokens: $full-pseudo-checkbox-tokens,
-      prefix: 'pseudo-checkbox-full-'
+      namespace: m2-pseudo-checkbox.$prefix,
+      tokens: m2-pseudo-checkbox.get-token-slots(),
+      prefix: 'pseudo-checkbox-'
     ),
-    (
-      namespace: tokens-mat-minimal-pseudo-checkbox.$prefix,
-      tokens: $minimal-pseudo-checkbox-tokens,
-      prefix: 'pseudo-checkbox-minimal-'
-    )
   );
 }
 
@@ -128,35 +117,26 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-app-tokens: token-utils.get-tokens-for($tokens, tokens-mat-app.$prefix, $options...);
-  $mat-ripple-tokens: token-utils.get-tokens-for($tokens, tokens-mat-ripple.$prefix, $options...);
-  $mat-option-tokens: token-utils.get-tokens-for($tokens, tokens-mat-option.$prefix, $options...);
+  $mat-app-tokens: token-utils.get-tokens-for($tokens, m2-app.$prefix, $options...);
+  $mat-ripple-tokens: token-utils.get-tokens-for($tokens, m2-ripple.$prefix, $options...);
+  $mat-option-tokens: token-utils.get-tokens-for($tokens, m2-option.$prefix, $options...);
   $mat-optgroup-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mat-optgroup.$prefix,
-    $options...
-  );
-  $mat-full-pseudo-checkbox-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-full-pseudo-checkbox.$prefix,
+    m2-optgroup.$prefix,
     $options...
   );
-  $mat-minimal-pseudo-checkbox-tokens: token-utils.get-tokens-for(
+  $mat-pseudo-checkbox-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
+    m2-pseudo-checkbox.$prefix,
     $options...
   );
 
-  @include token-utils.create-token-values(tokens-mat-app.$prefix, $mat-app-tokens);
-  @include token-utils.create-token-values(tokens-mat-ripple.$prefix, $mat-ripple-tokens);
-  @include token-utils.create-token-values(tokens-mat-option.$prefix, $mat-option-tokens);
-  @include token-utils.create-token-values(tokens-mat-optgroup.$prefix, $mat-optgroup-tokens);
-  @include token-utils.create-token-values(
-    tokens-mat-full-pseudo-checkbox.$prefix,
-    $mat-full-pseudo-checkbox-tokens
-  );
+  @include token-utils.create-token-values(m2-app.$prefix, $mat-app-tokens);
+  @include token-utils.create-token-values(m2-ripple.$prefix, $mat-ripple-tokens);
+  @include token-utils.create-token-values(m2-option.$prefix, $mat-option-tokens);
+  @include token-utils.create-token-values(m2-optgroup.$prefix, $mat-optgroup-tokens);
   @include token-utils.create-token-values(
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
-    $mat-minimal-pseudo-checkbox-tokens
+    m2-pseudo-checkbox.$prefix,
+    $mat-pseudo-checkbox-tokens
   );
 }

package/core/_core.scss

@@ -1,4 +1,4 @@
-@use './tokens/m2/mat/app' as tokens-mat-app;
+@use './m2-app';
 @use './tokens/token-utils';
 @use './style/elevation';
 
@@ -20,10 +20,10 @@
   // user's content isn't inside of a `mat-sidenav-container`.
   @at-root {
     // Note: we need to emit fallback values here to avoid errors in internal builds.
-    @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
+    @include token-utils.use-tokens(m2-app.$prefix, m2-app.get-token-slots()) {
       .mat-app-background {
-        @include token-utils.create-token-slot(background-color, background-color, transparent);
-        @include token-utils.create-token-slot(color, text-color, inherit);
+        background-color: token-utils.slot(background-color, transparent);
+        color: token-utils.slot(text-color, inherit);
       }
     }
   }
@@ -35,7 +35,7 @@
 // Material Design specification.
 @mixin elevation-classes() {
   @at-root {
-    @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
+    @include token-utils.use-tokens(m2-app.$prefix, m2-app.get-token-slots()) {
       // Provides external CSS classes for each elevation value. Each CSS class is formatted as
       // `mat-elevation-z$z-value` where `$z-value` corresponds to the z-space to which the element
       // is elevated.
@@ -44,7 +44,7 @@
         // We need the `mat-mdc-elevation-specific`, because some MDC mixins
         // come with elevation baked in and we don't have a way of removing it.
         .#{$selector}, .mat-mdc-elevation-specific.#{$selector} {
-          @include token-utils.create-token-slot(box-shadow, 'elevation-shadow-level-#{$z-value}',
+          box-shadow: token-utils.slot('elevation-shadow-level-#{$z-value}',
             none);
         }
       }

package/core/{tokens/m2/mat/_app.scss → _m2-app.scss}

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

@@ -1,7 +1,7 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../../style/elevation';
-@use '../../token-definition';
+@use './style/elevation';
+@use './tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, app);
@@ -12,7 +12,6 @@ $prefix: (mat, app);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of custom tokens for the app
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $shadow-color: map.get($systems, md-sys-color, shadow);
   $tokens: (
     background-color: map.get($systems, md-sys-color, background),
     text-color: map.get($systems, md-sys-color, on-background),
@@ -20,6 +19,7 @@ $prefix: (mat, app);
 
   // If the shadow-color is an actual color, convert it to a box-shadow value. Otherwise
   // use the token value as itself (e,g. as a CSS var name).
+  $shadow-color: map.get($systems, md-sys-color, shadow);
   @if (meta.type-of($shadow-color) == color) {
     @for $zValue from 0 through 24 {
       $shadow: elevation.get-box-shadow($zValue, $shadow-color);
@@ -27,5 +27,5 @@ $prefix: (mat, app);
     }
   }
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

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-421e3498.js';
+export { T as ThemePalette } from '../palette.d-1d8ebc0d.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-d77f0821.js';
-export { M as MatRippleLoader } from '../ripple-loader.d-e5ac6c14.js';
-export { M as MatRippleModule } from '../index.d-cc6e48d4.js';
-export { b as MatPseudoCheckbox, M as MatPseudoCheckboxModule, a as MatPseudoCheckboxState } from '../pseudo-checkbox-module.d-d21de92b.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-f2cd74cf.js';
+import { E as ErrorStateMatcher$1 } from '../error-options.d-059d9639.js';
+export { E as ErrorStateMatcher, S as ShowOnDirtyErrorStateMatcher } from '../error-options.d-059d9639.js';
+export { M as MatLine, a as MatLineModule, s as setLines } from '../line.d-712398cb.js';
+export { M as MatOptionModule } from '../index.d-73f24bb1.js';
+export { M as MatRippleLoader } from '../ripple-loader.d-f51e5eb6.js';
+export { M as MatRippleModule } from '../index.d-511f9e6c.js';
+export { b as MatPseudoCheckbox, M as MatPseudoCheckboxModule, a as MatPseudoCheckboxState } from '../pseudo-checkbox-module.d-42351ab6.js';
+import { D as DateAdapter } from '../date-adapter.d-e8299690.js';
+export { D as DateAdapter, M as MAT_DATE_LOCALE, a as MAT_DATE_LOCALE_FACTORY } from '../date-adapter.d-e8299690.js';
+export { d as MAT_OPTGROUP, a as MatOptgroup, M as MatOption, b as MatOptionSelectionChange, _ as _countGroupLabelsBeforeOption, c as _getOptionScrollPosition } from '../option.d-4fb11594.js';
+export { a as MAT_OPTION_PARENT_COMPONENT, M as MatOptionParentComponent } from '../option-parent.d-d4243d2f.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-305c30f3.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
@@ -196,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, _animationsDisabled, provideNativeDateAdapter };
+export { AnimationCurves, AnimationDurations, MATERIAL_ANIMATIONS, MAT_DATE_FORMATS, MAT_NATIVE_DATE_FORMATS, MatNativeDateModule, NativeDateAdapter, NativeDateModule, VERSION, _ErrorStateTracker, _MatInternalFormField, _StructuralStylesLoader, _animationsDisabled, provideNativeDateAdapter };
+export type { AnimationsConfig, MatDateFormats };

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';
@@ -20,9 +20,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-optgroup.$prefix,
-        tokens-mat-optgroup.get-color-tokens($theme)
-      );
+        m2-optgroup.$prefix, m2-optgroup.get-color-tokens($theme));
     }
   }
 }
@@ -33,9 +31,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-optgroup.$prefix,
-        tokens-mat-optgroup.get-typography-tokens($theme)
-      );
+        m2-optgroup.$prefix, m2-optgroup.get-typography-tokens($theme));
     }
   }
 }
@@ -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';
@@ -27,23 +27,17 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme)
-      );
+        m2-option.$prefix, m2-option.get-color-tokens($theme));
     }
 
     .mat-accent {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme, accent)
-      );
+        m2-option.$prefix, m2-option.get-color-tokens($theme, accent));
     }
 
     .mat-warn {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme, warn)
-      );
+        m2-option.$prefix, m2-option.get-color-tokens($theme, warn));
     }
   }
 }
@@ -56,9 +50,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-typography-tokens($theme)
-      );
+        m2-option.$prefix, m2-option.get-typography-tokens($theme));
     }
   }
 }
@@ -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);
 }

package/core/{tokens/m2/mat/_ripple.scss → ripple/_m2-ripple.scss}

@@ -1,7 +1,7 @@
 @use 'sass:meta';
-@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, ripple);
@@ -42,8 +42,8 @@ $prefix: (mat, ripple);
 @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/_ripple.scss → ripple/_m3-ripple.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, ripple);
@@ -15,5 +15,5 @@ $prefix: (mat, ripple);
     color: sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.1),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }