@angular/material 20.0.0-next.5 → 20.0.0-next.7

package/tabs/_tabs-theme.scss

@@ -1,13 +1,12 @@
 @use '../core/style/sass-utils';
-@use '../core/tokens/m2/mat/secondary-navigation-tab' as tokens-mat-secondary-navigation-tab;
-@use '../core/tokens/m2/mat/tab-indicator' as tokens-mat-tab-indicator;
-@use '../core/tokens/m2/mat/tab-header' as tokens-mat-tab-header;
-@use '../core/tokens/m2/mat/tab-header-with-background' as tokens-mat-tab-header-with-background;
+@use './m2-tabs';
+@use './m3-tabs';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/theming/validation';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
+@use 'sass:map';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-tab.
@@ -18,21 +17,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-secondary-navigation-tab.$prefix,
-        tokens-mat-secondary-navigation-tab.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-indicator.$prefix,
-        tokens-mat-tab-indicator.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-header.$prefix,
-        tokens-mat-tab-header.get-unthemable-tokens()
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-header-with-background.$prefix,
-        tokens-mat-tab-header-with-background.get-unthemable-tokens()
-      );
+          m2-tabs.$prefix, m2-tabs.get-unthemable-tokens());
     }
   }
 }
@@ -48,53 +33,52 @@
   } @else {
     .mat-mdc-tab-group,
     .mat-mdc-tab-nav-bar {
-      @include _palette-styles($theme, primary);
+      @include token-utils.create-token-values-mixed(
+          m2-tabs.$prefix, m2-tabs.get-color-tokens($theme, primary,
+            $exclude: (background-color, foreground-color)));
 
       &.mat-accent {
-        @include _palette-styles($theme, accent);
+        @include token-utils.create-token-values-mixed(
+          m2-tabs.$prefix, m2-tabs.get-color-tokens($theme, accent,
+            $exclude: (background-color, foreground-color)));
       }
 
       &.mat-warn {
-        @include _palette-styles($theme, warn);
+        @include token-utils.create-token-values-mixed(
+          m2-tabs.$prefix, m2-tabs.get-color-tokens($theme, warn,
+            $exclude: (background-color, foreground-color)));
       }
 
       &.mat-background-primary {
-        @include _background-styles($theme, primary);
+        $tokens: m2-tabs.get-color-tokens($theme, primary);
+        @include token-utils.create-token-values-mixed(
+            m2-tabs.$prefix, (
+              background-color: map.get($tokens, background-color),
+              foreground-color: map.get($tokens, foreground-color),
+            ));
       }
 
       &.mat-background-accent {
-        @include _background-styles($theme, accent);
+        $tokens: m2-tabs.get-color-tokens($theme, accent);
+        @include token-utils.create-token-values-mixed(
+            m2-tabs.$prefix, (
+            background-color: map.get($tokens, background-color),
+            foreground-color: map.get($tokens, foreground-color),
+          ));
       }
 
       &.mat-background-warn {
-        @include _background-styles($theme, warn);
+        $tokens: m2-tabs.get-color-tokens($theme, warn);
+        @include token-utils.create-token-values-mixed(
+            m2-tabs.$prefix, (
+            background-color: map.get($tokens, background-color),
+            foreground-color: map.get($tokens, foreground-color),
+          ));
       }
     }
   }
 }
 
-@mixin _background-styles($theme, $palette-name) {
-  @include token-utils.create-token-values-mixed(
-    tokens-mat-tab-header-with-background.$prefix,
-    tokens-mat-tab-header-with-background.get-color-tokens($theme, $palette-name)
-  );
-}
-
-@mixin _palette-styles($theme, $palette-name) {
-  @include token-utils.create-token-values-mixed(
-    tokens-mat-secondary-navigation-tab.$prefix,
-    tokens-mat-secondary-navigation-tab.get-color-tokens($theme, $palette-name)
-  );
-  @include token-utils.create-token-values-mixed(
-    tokens-mat-tab-indicator.$prefix,
-    tokens-mat-tab-indicator.get-color-tokens($theme, $palette-name)
-  );
-  @include token-utils.create-token-values-mixed(
-    tokens-mat-tab-header.$prefix,
-    tokens-mat-tab-header.get-color-tokens($theme, $palette-name)
-  );
-}
-
 /// Outputs typography theme styles for the mat-tab.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
@@ -103,21 +87,7 @@
   } @else {
     .mat-mdc-tab-header {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-secondary-navigation-tab.$prefix,
-        tokens-mat-secondary-navigation-tab.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-indicator.$prefix,
-        tokens-mat-tab-indicator.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-header.$prefix,
-        tokens-mat-tab-header.get-typography-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-header-with-background.$prefix,
-        tokens-mat-tab-header-with-background.get-typography-tokens($theme)
-      );
+        m2-tabs.$prefix, m2-tabs.get-typography-tokens($theme));
     }
   }
 }
@@ -126,52 +96,21 @@
 /// @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));
+    @include token-utils.create-token-values(m3-tabs.$prefix, m3-tabs.get-density-tokens($theme));
   } @else {
     .mat-mdc-tab-header {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-secondary-navigation-tab.$prefix,
-        tokens-mat-secondary-navigation-tab.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-indicator.$prefix,
-        tokens-mat-tab-indicator.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-header.$prefix,
-        tokens-mat-tab-header.get-density-tokens($theme)
-      );
-      @include token-utils.create-token-values-mixed(
-        tokens-mat-tab-header-with-background.$prefix,
-        tokens-mat-tab-header-with-background.get-density-tokens($theme)
-      );
+        m2-tabs.$prefix, m2-tabs.get-density-tokens($theme));
     }
   }
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
 @function _define-overrides() {
-  $tab-tokens: tokens-mat-secondary-navigation-tab.get-token-slots();
-  $tab-indicator-tokens: tokens-mat-tab-indicator.get-token-slots();
-  $tab-header-tokens: tokens-mat-tab-header.get-token-slots();
-  $tab-header-with-background-tokens: tokens-mat-tab-header-with-background.get-token-slots();
-
   @return (
     (
-      namespace: tokens-mat-secondary-navigation-tab.$prefix,
-      tokens: $tab-tokens,
-    ),
-    (
-      namespace: tokens-mat-tab-indicator.$prefix,
-      tokens: $tab-indicator-tokens,
-    ),
-    (
-      namespace: tokens-mat-tab-header.$prefix,
-      tokens: $tab-header-tokens,
-    ),
-    (
-      namespace: tokens-mat-tab-header-with-background.$prefix,
-      tokens: $tab-header-with-background-tokens,
+      namespace: m2-tabs.$prefix,
+      tokens: m2-tabs.get-token-slots(),
     ),
   );
 }
@@ -191,6 +130,9 @@
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-tabs') {
     @if inspection.get-theme-version($theme) == 1 {
       @include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
+      @if inspection.theme-has($theme, density) {
+        @include density($theme);
+      }
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -210,29 +152,9 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mdc-tab-indicator-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-tab-indicator.$prefix,
-    $options...
-  );
-  $mat-tab-header-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-tab-header.$prefix,
-    $options...
-  );
-  // Don't pass $options here, because the mdc-tab doesn't have color variants,
-  // only the mdc-tab-indicator and mat-tab-header do.
-  $mdc-secondary-navigation-tab-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-secondary-navigation-tab.$prefix
-  );
-  @include token-utils.create-token-values(
-    tokens-mat-secondary-navigation-tab.$prefix,
-    $mdc-secondary-navigation-tab-tokens
-  );
-  @include token-utils.create-token-values(
-    tokens-mat-tab-indicator.$prefix,
-    $mdc-tab-indicator-tokens
-  );
-  @include token-utils.create-token-values(tokens-mat-tab-header.$prefix, $mat-tab-header-tokens);
+  $tabs-tokens: token-utils.get-tokens-for($tokens, m2-tabs.$prefix, $options...);
+  $tabs-tokens-without-options: token-utils.get-tokens-for($tokens, m2-tabs.$prefix);
+
+  @include token-utils.create-token-values(m2-tabs.$prefix, $tabs-tokens-without-options);
+  @include token-utils.create-token-values(m2-tabs.$prefix, $tabs-tokens);
 }

package/tabs/index.d.ts

@@ -1,12 +1,12 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, TemplateRef, OnInit, OnChanges, OnDestroy, SimpleChanges, QueryList, ElementRef, AfterContentChecked, AfterContentInit, AfterViewInit, ChangeDetectorRef, EventEmitter } from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
+import { TemplateRef, InjectionToken, OnInit, OnChanges, OnDestroy, SimpleChanges, QueryList, ElementRef, AfterContentChecked, AfterContentInit, AfterViewInit, ChangeDetectorRef, EventEmitter } from '@angular/core';
+import { MatCommonModule } from '../common-module.d-CUT8AqiB.js';
 import { CdkPortal, TemplatePortal, CdkPortalOutlet } from '@angular/cdk/portal';
 import { Subject, BehaviorSubject } from 'rxjs';
 import { FocusableOption, FocusOrigin } from '@angular/cdk/a11y';
 import { Direction } from '@angular/cdk/bidi';
-import { T as ThemePalette } from '../palette.d-f5ca9a2b.js';
-import { a as RippleTarget, f as RippleConfig, b as RippleGlobalOptions } from '../ripple.d-838c5cd6.js';
+import { ThemePalette } from '../palette.d-fF1us9u8.js';
+import { RippleTarget, RippleConfig, RippleGlobalOptions } from '../ripple.d-DBFnJ3Aa.js';
 import '@angular/cdk/platform';
 
 /**
@@ -895,4 +895,5 @@ declare const matTabsAnimations: {
     readonly translateTab: any;
 };
 
-export { MAT_TAB, MAT_TABS_CONFIG, MAT_TAB_CONTENT, MAT_TAB_GROUP, MAT_TAB_LABEL, MatInkBar, MatPaginatedTabHeader, MatTab, MatTabBody, type MatTabBodyOriginState, MatTabBodyPortal, type MatTabBodyPositionState, MatTabChangeEvent, MatTabContent, MatTabGroup, type MatTabGroupBaseHeader, MatTabHeader, type MatTabHeaderPosition, MatTabLabel, MatTabLabelWrapper, MatTabLink, MatTabNav, MatTabNavPanel, type MatTabsConfig, MatTabsModule, type ScrollDirection, _MAT_INK_BAR_POSITIONER, _MAT_INK_BAR_POSITIONER_FACTORY, type _MatInkBarPositioner, matTabsAnimations };
+export { MAT_TAB, MAT_TABS_CONFIG, MAT_TAB_CONTENT, MAT_TAB_GROUP, MAT_TAB_LABEL, MatInkBar, MatPaginatedTabHeader, MatTab, MatTabBody, MatTabBodyPortal, MatTabChangeEvent, MatTabContent, MatTabGroup, MatTabHeader, MatTabLabel, MatTabLabelWrapper, MatTabLink, MatTabNav, MatTabNavPanel, MatTabsModule, _MAT_INK_BAR_POSITIONER, _MAT_INK_BAR_POSITIONER_FACTORY, matTabsAnimations };
+export type { MatTabBodyOriginState, MatTabBodyPositionState, MatTabGroupBaseHeader, MatTabHeaderPosition, MatTabsConfig, ScrollDirection, _MatInkBarPositioner };

package/tabs/testing/index.d.ts

@@ -141,4 +141,5 @@ declare class MatTabNavBarHarness extends ComponentHarness {
     getPanel(): Promise<MatTabNavPanelHarness>;
 }
 
-export { MatTabGroupHarness, MatTabHarness, MatTabLinkHarness, MatTabNavBarHarness, type TabGroupHarnessFilters, type TabHarnessFilters, type TabLinkHarnessFilters, type TabNavBarHarnessFilters, type TabNavPanelHarnessFilters };
+export { MatTabGroupHarness, MatTabHarness, MatTabLinkHarness, MatTabNavBarHarness };
+export type { TabGroupHarnessFilters, TabHarnessFilters, TabLinkHarnessFilters, TabNavBarHarnessFilters, TabNavPanelHarnessFilters };

package/{core/tokens/m2/mat/_timepicker.scss → timepicker/_m2-timepicker.scss}

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

@@ -4,7 +4,7 @@
 @use '../core/theming/validation';
 @use '../core/typography/typography';
 @use '../core/style/sass-utils';
-@use '../core/tokens/m2/mat/timepicker' as tokens-mat-timepicker;
+@use './m2-timepicker';
 @use '../core/tokens/token-utils';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -16,8 +16,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-timepicker.$prefix,
-        tokens-mat-timepicker.get-unthemable-tokens()
+        m2-timepicker.$prefix,
+        m2-timepicker.get-unthemable-tokens()
       );
     }
   }
@@ -34,8 +34,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-timepicker.$prefix,
-        tokens-mat-timepicker.get-color-tokens($theme)
+        m2-timepicker.$prefix,
+        m2-timepicker.get-color-tokens($theme)
       );
     }
   }
@@ -49,8 +49,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-timepicker.$prefix,
-        tokens-mat-timepicker.get-typography-tokens($theme)
+        m2-timepicker.$prefix,
+        m2-timepicker.get-typography-tokens($theme)
       );
     }
   }
@@ -60,12 +60,12 @@
 /// @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 {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-timepicker.$prefix,
-        tokens-mat-timepicker.get-density-tokens($theme)
+        m2-timepicker.$prefix,
+        m2-timepicker.get-density-tokens($theme)
       );
     }
   }
@@ -75,8 +75,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-timepicker.$prefix,
-      tokens: tokens-mat-timepicker.get-token-slots(),
+      namespace: m2-timepicker.$prefix,
+      tokens: m2-timepicker.get-token-slots(),
     ),
   );
 }
@@ -117,8 +117,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-timepicker.$prefix,
-      map.get($tokens, tokens-mat-timepicker.$prefix)
+      m2-timepicker.$prefix,
+      map.get($tokens, m2-timepicker.$prefix)
     );
   }
 }

package/timepicker/index.d.ts

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { OnDestroy, Signal, ModelSignal, InputSignal, InputSignalWithTransform, ElementRef, InjectionToken, TemplateRef, OutputEmitterRef } from '@angular/core';
-import { M as MatOption } from '../option.d-be9de0a8.js';
-import { M as MatOptionParentComponent } from '../option-parent.d-f2c0c7de.js';
+import { MatOption } from '../option.d-ef4idHSb.js';
+import { MatOptionParentComponent } from '../option-parent.d-CvnRKBST.js';
 import { ScrollStrategy } from '@angular/cdk/overlay';
 import { ControlValueAccessor, Validator, AbstractControl, ValidationErrors } from '@angular/forms';
 import * as i5 from '@angular/cdk/scrolling';
@@ -285,4 +285,5 @@ declare class MatTimepickerModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatTimepickerModule>;
 }
 
-export { MAT_TIMEPICKER_CONFIG, MAT_TIMEPICKER_SCROLL_STRATEGY, MatTimepicker, type MatTimepickerConfig, MatTimepickerInput, MatTimepickerModule, type MatTimepickerOption, type MatTimepickerSelected, MatTimepickerToggle };
+export { MAT_TIMEPICKER_CONFIG, MAT_TIMEPICKER_SCROLL_STRATEGY, MatTimepicker, MatTimepickerInput, MatTimepickerModule, MatTimepickerToggle };
+export type { MatTimepickerConfig, MatTimepickerOption, MatTimepickerSelected };

package/timepicker/testing/index.d.ts

@@ -1,5 +1,5 @@
 import { BaseHarnessFilters, ComponentHarness, ComponentHarnessConstructor, HarnessPredicate } from '@angular/cdk/testing';
-import { O as OptionHarnessFilters, M as MatOptionHarness } from '../../option-harness.d-047df5c5.js';
+import { OptionHarnessFilters, MatOptionHarness } from '../../option-harness.d-BpYClwei.js';
 
 /** A set of criteria that can be used to filter a list of `MatTimepickerHarness` instances. */
 interface TimepickerHarnessFilters extends BaseHarnessFilters {
@@ -104,4 +104,5 @@ declare class MatTimepickerToggleHarness extends ComponentHarness {
     isDisabled(): Promise<boolean>;
 }
 
-export { MatTimepickerHarness, MatTimepickerInputHarness, MatTimepickerToggleHarness, type TimepickerHarnessFilters, type TimepickerInputHarnessFilters, type TimepickerToggleHarnessFilters };
+export { MatTimepickerHarness, MatTimepickerInputHarness, MatTimepickerToggleHarness };
+export type { TimepickerHarnessFilters, TimepickerInputHarnessFilters, TimepickerToggleHarnessFilters };

package/{core/tokens/m2/mat/_toolbar.scss → toolbar/_m2-toolbar.scss}

@@ -1,8 +1,8 @@
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../theming/theming';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/theming';
+@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, toolbar);
@@ -68,8 +68,8 @@ $prefix: (mat, toolbar);
 @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/_toolbar.scss → toolbar/_m3-toolbar.scss}

@@ -1,6 +1,9 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use 'sass:list';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
+@use '../core/theming/theming';
+@use '../core/theming/inspection';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, toolbar);
@@ -12,12 +15,23 @@ $prefix: (mat, toolbar);
 /// @return {Map} A set of custom tokens for the mat-toolbar
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: sass-utils.merge-all(
-    token-definition.generate-typography-tokens($systems, title-text, title-large),
+    m3-utils.generate-typography-tokens($systems, title-text, title-large),
     (
       container-background-color: map.get($systems, md-sys-color, surface),
       container-text-color: map.get($systems, md-sys-color, on-surface),
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+}
+
+// Tokens that can be configured through Angular Material's density theming API.
+@function get-density-tokens($theme) {
+  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $index: ($scale * -1) + 1;
+
+  @return (
+    standard-height: list.nth((64px, 60px, 56px, 52px), $index),
+    mobile-height: list.nth((56px, 52px, 48px, 44px), $index),
+  );
 }

package/toolbar/_toolbar-theme.scss

@@ -1,16 +1,17 @@
 @use 'sass:map';
-@use '../core/theming/theming';
+@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
-@use '../core/typography/typography';
-@use '../core/tokens/m2/mat/toolbar' as tokens-mat-toolbar;
 @use '../core/tokens/token-utils';
-@use '../core/style/sass-utils';
+@use '../core/typography/typography';
+@use './m2-toolbar';
+@use './m3-toolbar';
 
 @mixin _palette-styles($theme, $palette-name) {
   @include token-utils.create-token-values-mixed(
-    tokens-mat-toolbar.$prefix,
-    tokens-mat-toolbar.private-get-color-palette-color-tokens(
+    m2-toolbar.$prefix,
+    m2-toolbar.private-get-color-palette-color-tokens(
       $background-color: inspection.get-theme-color($theme, $palette-name),
       $text-color: inspection.get-theme-color($theme, $palette-name, default-contrast)
     )
@@ -26,8 +27,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-toolbar.$prefix,
-        tokens-mat-toolbar.get-color-tokens($theme)
+        m2-toolbar.$prefix,
+        m2-toolbar.get-color-tokens($theme)
       );
     }
 
@@ -56,8 +57,8 @@
 
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-toolbar.$prefix,
-        tokens-mat-toolbar.get-typography-tokens($theme)
+        m2-toolbar.$prefix,
+        m2-toolbar.get-typography-tokens($theme)
       );
     }
   }
@@ -65,12 +66,13 @@
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    @include token-utils.create-token-values(
+        m3-toolbar.$prefix, m3-toolbar.get-density-tokens($theme));
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-toolbar.$prefix,
-        tokens-mat-toolbar.get-density-tokens($theme)
+        m2-toolbar.$prefix,
+        m2-toolbar.get-density-tokens($theme)
       );
     }
   }
@@ -80,8 +82,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-toolbar.$prefix,
-      tokens: tokens-mat-toolbar.get-token-slots(),
+      namespace: m2-toolbar.$prefix,
+      tokens: m2-toolbar.get-token-slots(),
     ),
   );
 }
@@ -96,6 +98,9 @@
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-toolbar') {
     @if inspection.get-theme-version($theme) == 1 {
       @include _theme-from-tokens(inspection.get-theme-tokens($theme));
+      @if inspection.theme-has($theme, density) {
+        @include density($theme);
+      }
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -117,8 +122,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-toolbar.$prefix,
-      map.get($tokens, tokens-mat-toolbar.$prefix)
+      m2-toolbar.$prefix,
+      map.get($tokens, m2-toolbar.$prefix)
     );
   }
 }

package/toolbar/index.d.ts

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { AfterViewInit, ElementRef, QueryList } from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
+import { MatCommonModule } from '../common-module.d-CUT8AqiB.js';
 import '@angular/cdk/bidi';
 
 declare class MatToolbarRow {

package/toolbar/testing/index.d.ts

@@ -29,4 +29,5 @@ declare class MatToolbarHarness extends ContentContainerComponentHarness<MatTool
     getRowsAsText(): Promise<string[]>;
 }
 
-export { MatToolbarHarness, MatToolbarSection, type ToolbarHarnessFilters };
+export { MatToolbarHarness, MatToolbarSection };
+export type { ToolbarHarnessFilters };

package/{core/tokens/m2/mat/_plain-tooltip.scss → tooltip/_m2-tooltip.scss}

@@ -1,9 +1,9 @@
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m2-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, plain-tooltip);
+$prefix: (mat, tooltip);
 
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
@@ -47,8 +47,8 @@ $prefix: (mat, plain-tooltip);
 @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/_plain-tooltip.scss → tooltip/_m3-tooltip.scss}

@@ -1,8 +1,8 @@
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 @use 'sass:map';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, plain-tooltip);
+$prefix: (mat, tooltip);
 
 /// Generates the tokens for MDC plain-tooltip
 /// @param {Map} $systems The MDC system tokens
@@ -21,5 +21,5 @@ $prefix: (mat, plain-tooltip);
     supporting-text-weight: map.get($systems, md-sys-typescale, body-small-weight)
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }