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

package/_index.scss

@@ -17,7 +17,7 @@
 @forward './core/theming/theming' as private-* show private-clamp-density;
 @forward './core/typography/typography' show typography-hierarchy;
 @forward './core/typography/typography-utils' show font-shorthand;
-@forward './core/tokens/m2' show m2-tokens-from-theme;
+@forward 'core/tokens/m2-tokens' show m2-tokens-from-theme;
 @forward './core/tokens/m3-system' show system-level-colors,
     system-level-typography, system-level-elevation, system-level-shape,
     system-level-motion, system-level-state, theme, theme-overrides;

package/autocomplete/_autocomplete-theme.scss

@@ -5,7 +5,7 @@
 @use '../core/typography/typography';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mat/autocomplete' as tokens-mat-autocomplete;
+@use 'm2-autocomplete';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -13,8 +13,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-autocomplete.$prefix,
-        tokens-mat-autocomplete.get-unthemable-tokens()
+        m2-autocomplete.$prefix,
+        m2-autocomplete.get-unthemable-tokens()
       );
     }
   }
@@ -26,8 +26,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-autocomplete.$prefix,
-        tokens-mat-autocomplete.get-color-tokens($theme)
+        m2-autocomplete.$prefix,
+        m2-autocomplete.get-color-tokens($theme)
       );
     }
   }
@@ -39,8 +39,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-autocomplete.$prefix,
-        tokens-mat-autocomplete.get-typography-tokens($theme)
+        m2-autocomplete.$prefix,
+        m2-autocomplete.get-typography-tokens($theme)
       );
     }
   }
@@ -52,8 +52,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-autocomplete.$prefix,
-        tokens-mat-autocomplete.get-density-tokens($theme)
+        m2-autocomplete.$prefix,
+        m2-autocomplete.get-density-tokens($theme)
       );
     }
   }
@@ -63,8 +63,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-autocomplete.$prefix,
-      tokens: tokens-mat-autocomplete.get-token-slots(),
+      namespace: m2-autocomplete.$prefix,
+      tokens: m2-autocomplete.get-token-slots(),
     ),
   );
 }
@@ -98,8 +98,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-autocomplete.$prefix,
-      map.get($tokens, tokens-mat-autocomplete.$prefix)
+      m2-autocomplete.$prefix,
+      map.get($tokens, m2-autocomplete.$prefix)
     );
   }
 }

package/{core/tokens/m2/mat/_autocomplete.scss → autocomplete/_m2-autocomplete.scss}

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

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../../style/elevation';
-@use '../../token-definition';
+@use '../core/style/elevation';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, autocomplete);
@@ -15,7 +15,7 @@ $prefix: (mat, autocomplete);
     background-color: map.get($systems, md-sys-color, surface-container),
     container-shape: map.get($systems, md-sys-shape, corner-extra-small),
     container-elevation-shadow:
-      token-definition.hardcode(elevation.get-box-shadow(2), $exclude-hardcoded),
+      m3-utils.hardcode(elevation.get-box-shadow(2), $exclude-hardcoded),
   );
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/autocomplete/index.d.ts

@@ -2,19 +2,19 @@ import * as i0 from '@angular/core';
 import { InjectionToken, AfterContentInit, OnDestroy, TemplateRef, ElementRef, QueryList, EventEmitter, AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
 import * as i2 from '@angular/cdk/overlay';
 import { ScrollStrategy, Overlay } from '@angular/cdk/overlay';
-import { M as MatOptionModule } from '../index.d-d77f0821.js';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
-import { T as ThemePalette } from '../palette.d-ec4a617c.js';
-import { M as MatOption, a as MatOptgroup, b as MatOptionSelectionChange } from '../option.d-6f493d78.js';
-export { a as MatOptgroup, M as MatOption } from '../option.d-6f493d78.js';
+import { M as MatOptionModule } from '../index.d-73f24bb1.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { T as ThemePalette } from '../palette.d-1d8ebc0d.js';
+import { M as MatOption, a as MatOptgroup, b as MatOptionSelectionChange } from '../option.d-4fb11594.js';
+export { a as MatOptgroup, M as MatOption } from '../option.d-4fb11594.js';
 import { ActiveDescendantKeyManager } from '@angular/cdk/a11y';
 import { ControlValueAccessor } from '@angular/forms';
 import { Observable } from 'rxjs';
 import * as i5 from '@angular/cdk/scrolling';
-import '../index.d-cc6e48d4.js';
-import '../ripple.d-f2cd74cf.js';
+import '../index.d-511f9e6c.js';
+import '../ripple.d-305c30f3.js';
 import '@angular/cdk/platform';
-import '../pseudo-checkbox-module.d-d21de92b.js';
+import '../pseudo-checkbox-module.d-42351ab6.js';
 import '@angular/cdk/bidi';
 
 /** Event object that is emitted when an autocomplete option is selected. */
@@ -438,4 +438,5 @@ declare class MatAutocompleteModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatAutocompleteModule>;
 }
 
-export { MAT_AUTOCOMPLETE_DEFAULT_OPTIONS, MAT_AUTOCOMPLETE_DEFAULT_OPTIONS_FACTORY, MAT_AUTOCOMPLETE_SCROLL_STRATEGY, MAT_AUTOCOMPLETE_SCROLL_STRATEGY_FACTORY, MAT_AUTOCOMPLETE_SCROLL_STRATEGY_FACTORY_PROVIDER, MAT_AUTOCOMPLETE_VALUE_ACCESSOR, MatAutocomplete, type MatAutocompleteActivatedEvent, type MatAutocompleteDefaultOptions, MatAutocompleteModule, MatAutocompleteOrigin, MatAutocompleteSelectedEvent, MatAutocompleteTrigger, getMatAutocompleteMissingPanelError };
+export { MAT_AUTOCOMPLETE_DEFAULT_OPTIONS, MAT_AUTOCOMPLETE_DEFAULT_OPTIONS_FACTORY, MAT_AUTOCOMPLETE_SCROLL_STRATEGY, MAT_AUTOCOMPLETE_SCROLL_STRATEGY_FACTORY, MAT_AUTOCOMPLETE_SCROLL_STRATEGY_FACTORY_PROVIDER, MAT_AUTOCOMPLETE_VALUE_ACCESSOR, MatAutocomplete, MatAutocompleteModule, MatAutocompleteOrigin, MatAutocompleteSelectedEvent, MatAutocompleteTrigger, getMatAutocompleteMissingPanelError };
+export type { MatAutocompleteActivatedEvent, MatAutocompleteDefaultOptions };

package/autocomplete/testing/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseHarnessFilters, ComponentHarness, ComponentHarnessConstructor, HarnessPredicate } from '@angular/cdk/testing';
-import { O as OptionHarnessFilters, M as MatOptionHarness } from '../../option-harness.d-3d33fc9a.js';
-import { O as OptgroupHarnessFilters, M as MatOptgroupHarness } from '../../optgroup-harness.d-7f741f69.js';
+import { O as OptionHarnessFilters, M as MatOptionHarness } from '../../option-harness.d-4f143bc0.js';
+import { O as OptgroupHarnessFilters, M as MatOptgroupHarness } from '../../optgroup-harness.d-c52f5a8b.js';
 
 /** A set of criteria that can be used to filter a list of `MatAutocompleteHarness` instances. */
 interface AutocompleteHarnessFilters extends BaseHarnessFilters {
@@ -49,4 +49,5 @@ declare class MatAutocompleteHarness extends ComponentHarness {
     protected _getPanelSelector(): Promise<string>;
 }
 
-export { type AutocompleteHarnessFilters, MatAutocompleteHarness };
+export { MatAutocompleteHarness };
+export type { AutocompleteHarnessFilters };

package/badge/_badge-theme.scss

@@ -3,7 +3,7 @@
 @use '../core/theming/inspection';
 @use '../core/theming/validation';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mat/badge' as tokens-mat-badge;
+@use './m2-badge';
 @use '../core/tokens/token-utils';
 @use '../core/style/sass-utils';
 
@@ -16,8 +16,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-badge.$prefix,
-        tokens-mat-badge.get-unthemable-tokens()
+        m2-badge.$prefix,
+        m2-badge.get-unthemable-tokens()
       );
     }
   }
@@ -34,22 +34,22 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-badge.$prefix,
-        tokens-mat-badge.get-color-tokens($theme)
+        m2-badge.$prefix,
+        m2-badge.get-color-tokens($theme)
       );
     }
 
     .mat-badge-accent {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-badge.$prefix,
-        tokens-mat-badge.private-get-color-palette-color-tokens($theme, accent)
+        m2-badge.$prefix,
+        m2-badge.private-get-color-palette-color-tokens($theme, accent)
       );
     }
 
     .mat-badge-warn {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-badge.$prefix,
-        tokens-mat-badge.private-get-color-palette-color-tokens($theme, warn)
+        m2-badge.$prefix,
+        m2-badge.private-get-color-palette-color-tokens($theme, warn)
       );
     }
   }
@@ -63,8 +63,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-badge.$prefix,
-        tokens-mat-badge.get-typography-tokens($theme)
+        m2-badge.$prefix,
+        m2-badge.get-typography-tokens($theme)
       );
     }
   }
@@ -83,8 +83,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-badge.$prefix,
-      tokens: tokens-mat-badge.get-token-slots(),
+      namespace: m2-badge.$prefix,
+      tokens: m2-badge.get-token-slots(),
     ),
   );
 }
@@ -123,6 +123,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-badge-tokens: token-utils.get-tokens-for($tokens, tokens-mat-badge.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mat-badge.$prefix, $mat-badge-tokens);
+  $mat-badge-tokens: token-utils.get-tokens-for($tokens, m2-badge.$prefix, $options...);
+  @include token-utils.create-token-values(m2-badge.$prefix, $mat-badge-tokens);
 }

package/{core/tokens/m2/mat/_badge.scss → badge/_m2-badge.scss}

@@ -2,9 +2,9 @@
 @use 'sass:map';
 @use 'sass:math';
 @use 'sass:color';
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
 
 $_default-size: 22px;
 $_small-size: $_default-size - 6px;
@@ -103,8 +103,8 @@ $prefix: (mat, badge);
 @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/_badge.scss → badge/_m3-badge.scss}

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, badge);
@@ -11,41 +11,42 @@ $prefix: (mat, badge);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of custom tokens for the mat-badge
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: ((
+  $tokens: (
     background-color: map.get($systems, md-sys-color, error),
     text-color: map.get($systems, md-sys-color, on-error),
     disabled-state-background-color: sass-utils.safe-color-change(
       map.get($systems, md-sys-color, error),
-      $alpha: 0.38,
-    ),
+      $alpha: 0.38),
     disabled-state-text-color: map.get($systems, md-sys-color, on-error),
     text-font: map.get($systems, md-sys-typescale, label-small-font),
     text-size: map.get($systems, md-sys-typescale, label-small-size),
     text-weight: map.get($systems, md-sys-typescale, label-small-weight),
-    small-size-text-size: token-definition.hardcode(0, $exclude-hardcoded),
+    small-size-text-size: m3-utils.hardcode(0, $exclude-hardcoded),
     container-shape: map.get($systems, md-sys-shape, corner-full),
-    container-size: token-definition.hardcode(16px, $exclude-hardcoded),
-    line-height: token-definition.hardcode(16px, $exclude-hardcoded),
-    legacy-container-size: token-definition.hardcode(unset, $exclude-hardcoded),
-    legacy-small-size-container-size: token-definition.hardcode(unset, $exclude-hardcoded),
-    small-size-container-size: token-definition.hardcode(6px, $exclude-hardcoded),
-    small-size-line-height: token-definition.hardcode(6px, $exclude-hardcoded),
-    container-padding: token-definition.hardcode(0 4px, $exclude-hardcoded),
-    small-size-container-padding: token-definition.hardcode(0, $exclude-hardcoded),
-    container-offset: token-definition.hardcode(-12px 0, $exclude-hardcoded),
-    small-size-container-offset: token-definition.hardcode(-6px 0, $exclude-hardcoded),
-    container-overlap-offset: token-definition.hardcode(-12px, $exclude-hardcoded),
-    small-size-container-overlap-offset: token-definition.hardcode(-6px, $exclude-hardcoded),
+    container-size: m3-utils.hardcode(16px, $exclude-hardcoded),
+    line-height: m3-utils.hardcode(16px, $exclude-hardcoded),
+    legacy-container-size: m3-utils.hardcode(unset, $exclude-hardcoded),
+    legacy-small-size-container-size: m3-utils.hardcode(unset, $exclude-hardcoded),
+    small-size-container-size: m3-utils.hardcode(6px, $exclude-hardcoded),
+    small-size-line-height: m3-utils.hardcode(6px, $exclude-hardcoded),
+    container-padding: m3-utils.hardcode(0 4px, $exclude-hardcoded),
+    small-size-container-padding: m3-utils.hardcode(0, $exclude-hardcoded),
+    container-offset: m3-utils.hardcode(-12px 0, $exclude-hardcoded),
+    small-size-container-offset: m3-utils.hardcode(-6px 0, $exclude-hardcoded),
+    container-overlap-offset: m3-utils.hardcode(-12px, $exclude-hardcoded),
+    small-size-container-overlap-offset: m3-utils.hardcode(-6px, $exclude-hardcoded),
 
     // This size isn't in the M3 spec so we emit the same values as for `medium`.
-    large-size-container-size: token-definition.hardcode(16px, $exclude-hardcoded),
-    large-size-line-height: token-definition.hardcode(16px, $exclude-hardcoded),
-    large-size-container-offset: token-definition.hardcode(-12px 0, $exclude-hardcoded),
-    large-size-container-overlap-offset: token-definition.hardcode(-12px, $exclude-hardcoded),
+    large-size-container-size: m3-utils.hardcode(16px, $exclude-hardcoded),
+    large-size-line-height: m3-utils.hardcode(16px, $exclude-hardcoded),
+    large-size-container-offset: m3-utils.hardcode(-12px 0, $exclude-hardcoded),
+    large-size-container-overlap-offset: m3-utils.hardcode(-12px, $exclude-hardcoded),
     large-size-text-size: map.get($systems, md-sys-typescale, label-small-size),
-    large-size-container-padding: token-definition.hardcode(0 4px, $exclude-hardcoded),
-    legacy-large-size-container-size: token-definition.hardcode(unset, $exclude-hardcoded),
-  ), (
+    large-size-container-padding: m3-utils.hardcode(0 4px, $exclude-hardcoded),
+    legacy-large-size-container-size: m3-utils.hardcode(unset, $exclude-hardcoded),
+  );
+
+  $variant-tokens: (
     primary: (
       background-color: map.get($systems, md-sys-color, primary),
       text-color: map.get($systems, md-sys-color, on-primary),
@@ -74,7 +75,7 @@ $prefix: (mat, badge);
       disabled-state-text-color: map.get($systems, md-sys-color, on-tertiary),
     ),
     error: () // Default, no overrides needed
-  ));
+  );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/badge/index.d.ts

@@ -1,10 +1,10 @@
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/a11y';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
-import { M as MatBadge, _ as _MatBadgeStyleLoader } from '../badge.d-d42103d0.js';
-export { M as MatBadge, a as MatBadgePosition, b as MatBadgeSize } from '../badge.d-d42103d0.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { M as MatBadge, _ as _MatBadgeStyleLoader } from '../badge.d-619691fb.js';
+export { M as MatBadge, a as MatBadgePosition, b as MatBadgeSize } from '../badge.d-619691fb.js';
 import '@angular/cdk/bidi';
-import '../palette.d-ec4a617c.js';
+import '../palette.d-1d8ebc0d.js';
 
 declare class MatBadgeModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatBadgeModule, never>;

package/badge/testing/index.d.ts

@@ -1,7 +1,7 @@
 import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular/cdk/testing';
-import { a as MatBadgePosition, b as MatBadgeSize } from '../../badge.d-d42103d0.js';
+import { a as MatBadgePosition, b as MatBadgeSize } from '../../badge.d-619691fb.js';
 import '@angular/core';
-import '../../palette.d-ec4a617c.js';
+import '../../palette.d-1d8ebc0d.js';
 
 interface BadgeHarnessFilters extends BaseHarnessFilters {
     text?: string | RegExp;
@@ -32,4 +32,5 @@ declare class MatBadgeHarness extends ComponentHarness {
     isDisabled(): Promise<boolean>;
 }
 
-export { type BadgeHarnessFilters, MatBadgeHarness };
+export { MatBadgeHarness };
+export type { BadgeHarnessFilters };

package/{badge.d-d42103d0.d.ts → badge.d-619691fb.d.ts}

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { OnInit, OnDestroy } from '@angular/core';
-import { T as ThemePalette } from './palette.d-ec4a617c.js';
+import { T as ThemePalette } from './palette.d-1d8ebc0d.js';
 
 /** Allowed position options for matBadgePosition */
 type MatBadgePosition = 'above after' | 'above before' | 'below before' | 'below after' | 'before' | 'after' | 'above' | 'below';
@@ -95,4 +95,5 @@ declare class MatBadge implements OnInit, OnDestroy {
     static ngAcceptInputType_hidden: unknown;
 }
 
-export { MatBadge as M, _MatBadgeStyleLoader as _, type MatBadgePosition as a, type MatBadgeSize as b };
+export { MatBadge as M, _MatBadgeStyleLoader as _ };
+export type { MatBadgePosition as a, MatBadgeSize as b };

package/bottom-sheet/_bottom-sheet-theme.scss

@@ -5,7 +5,7 @@
 @use '../core/theming/validation';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/tokens/m2/mat/bottom-sheet' as tokens-mat-bottom-sheet;
+@use './m2-bottom-sheet';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -13,8 +13,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-bottom-sheet.$prefix,
-        tokens-mat-bottom-sheet.get-unthemable-tokens()
+        m2-bottom-sheet.$prefix,
+        m2-bottom-sheet.get-unthemable-tokens()
       );
     }
   }
@@ -26,8 +26,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-bottom-sheet.$prefix,
-        tokens-mat-bottom-sheet.get-color-tokens($theme)
+        m2-bottom-sheet.$prefix,
+        m2-bottom-sheet.get-color-tokens($theme)
       );
     }
   }
@@ -39,8 +39,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-bottom-sheet.$prefix,
-        tokens-mat-bottom-sheet.get-typography-tokens($theme)
+        m2-bottom-sheet.$prefix,
+        m2-bottom-sheet.get-typography-tokens($theme)
       );
     }
   }
@@ -57,8 +57,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-bottom-sheet.$prefix,
-      tokens: tokens-mat-bottom-sheet.get-token-slots(),
+      namespace: m2-bottom-sheet.$prefix,
+      tokens: m2-bottom-sheet.get-token-slots(),
     ),
   );
 }
@@ -92,8 +92,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-bottom-sheet.$prefix,
-      map.get($tokens, tokens-mat-bottom-sheet.$prefix)
+      m2-bottom-sheet.$prefix,
+      map.get($tokens, m2-bottom-sheet.$prefix)
     );
   }
 }

package/{core/tokens/m2/mat/_bottom-sheet.scss → bottom-sheet/_m2-bottom-sheet.scss}

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

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, bottom-sheet);
@@ -12,13 +12,13 @@ $prefix: (mat, bottom-sheet);
 /// @return {Map} A set of custom tokens for the mat-bottom-sheet
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: sass-utils.merge-all(
-    token-definition.generate-typography-tokens($systems, container-text, body-large),
+    m3-utils.generate-typography-tokens($systems, container-text, body-large),
     (
-      container-shape: token-definition.hardcode(28px, $exclude-hardcoded),
+      container-shape: m3-utils.hardcode(28px, $exclude-hardcoded),
       container-text-color: map.get($systems, md-sys-color, on-surface),
       container-background-color: map.get($systems, md-sys-color, surface-container-low),
     ),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/bottom-sheet/index.d.ts

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { OnDestroy, EventEmitter, InjectionToken, ViewContainerRef, ComponentRef, TemplateRef } from '@angular/core';
 import * as i1 from '@angular/cdk/dialog';
 import { CdkDialogContainer, DialogRef } from '@angular/cdk/dialog';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
 import * as i3 from '@angular/cdk/portal';
 import { ComponentType } from '@angular/cdk/portal';
 import { Direction } from '@angular/cdk/bidi';
@@ -194,4 +194,5 @@ declare const matBottomSheetAnimations: {
     readonly bottomSheetState: any;
 };
 
-export { type AutoFocusTarget, MAT_BOTTOM_SHEET_DATA, MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, MatBottomSheet, MatBottomSheetConfig, MatBottomSheetContainer, MatBottomSheetModule, MatBottomSheetRef, matBottomSheetAnimations };
+export { MAT_BOTTOM_SHEET_DATA, MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, MatBottomSheet, MatBottomSheetConfig, MatBottomSheetContainer, MatBottomSheetModule, MatBottomSheetRef, matBottomSheetAnimations };
+export type { AutoFocusTarget };

package/bottom-sheet/testing/index.d.ts

@@ -22,4 +22,5 @@ declare class MatBottomSheetHarness extends ContentContainerComponentHarness<str
     dismiss(): Promise<void>;
 }
 
-export { type BottomSheetHarnessFilters, MatBottomSheetHarness };
+export { MatBottomSheetHarness };
+export type { BottomSheetHarnessFilters };