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

package/timepicker/testing/index.d.ts

@@ -1,11 +1,21 @@
-import { BaseHarnessFilters } from '@angular/cdk/testing';
-import { ComponentHarness } from '@angular/cdk/testing';
-import { ComponentHarnessConstructor } from '@angular/cdk/testing';
-import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatOptionHarness } from '@angular/material/core/testing';
-import { OptionHarnessFilters } from '@angular/material/core/testing';
+import { BaseHarnessFilters, ComponentHarness, ComponentHarnessConstructor, HarnessPredicate } from '@angular/cdk/testing';
+import { O as OptionHarnessFilters, M as MatOptionHarness } from '../../option-harness.d-IqsW95GR.js';
 
-export declare class MatTimepickerHarness extends ComponentHarness {
+/** A set of criteria that can be used to filter a list of `MatTimepickerHarness` instances. */
+interface TimepickerHarnessFilters extends BaseHarnessFilters {
+}
+/** A set of criteria that can be used to filter a list of timepicker input instances. */
+interface TimepickerInputHarnessFilters extends BaseHarnessFilters {
+    /** Filters based on the value of the input. */
+    value?: string | RegExp;
+    /** Filters based on the placeholder text of the input. */
+    placeholder?: string | RegExp;
+}
+/** A set of criteria that can be used to filter a list of timepicker toggle instances. */
+interface TimepickerToggleHarnessFilters extends BaseHarnessFilters {
+}
+
+declare class MatTimepickerHarness extends ComponentHarness {
     private _documentRootLocator;
     static hostSelector: string;
     /**
@@ -26,7 +36,7 @@ export declare class MatTimepickerHarness extends ComponentHarness {
 }
 
 /** Harness for interacting with a standard Material timepicker inputs in tests. */
-export declare class MatTimepickerInputHarness extends ComponentHarness {
+declare class MatTimepickerInputHarness extends ComponentHarness {
     private _documentRootLocator;
     static hostSelector: string;
     /**
@@ -75,7 +85,7 @@ export declare class MatTimepickerInputHarness extends ComponentHarness {
 }
 
 /** Harness for interacting with a standard Material timepicker toggle in tests. */
-export declare class MatTimepickerToggleHarness extends ComponentHarness {
+declare class MatTimepickerToggleHarness extends ComponentHarness {
     static hostSelector: string;
     /** The clickable button inside the toggle. */
     private _button;
@@ -94,20 +104,5 @@ export declare class MatTimepickerToggleHarness extends ComponentHarness {
     isDisabled(): Promise<boolean>;
 }
 
-/** A set of criteria that can be used to filter a list of `MatTimepickerHarness` instances. */
-export declare interface TimepickerHarnessFilters extends BaseHarnessFilters {
-}
-
-/** A set of criteria that can be used to filter a list of timepicker input instances. */
-export declare interface TimepickerInputHarnessFilters extends BaseHarnessFilters {
-    /** Filters based on the value of the input. */
-    value?: string | RegExp;
-    /** Filters based on the placeholder text of the input. */
-    placeholder?: string | RegExp;
-}
-
-/** A set of criteria that can be used to filter a list of timepicker toggle instances. */
-export declare interface TimepickerToggleHarnessFilters extends BaseHarnessFilters {
-}
-
-export { }
+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(
-    tokens-mat-toolbar.$prefix,
-    tokens-mat-toolbar.private-get-color-palette-color-tokens(
+  @include token-utils.create-token-values-mixed(
+    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)
     )
@@ -25,9 +26,9 @@
     @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-toolbar.$prefix,
-        tokens-mat-toolbar.get-color-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-toolbar.$prefix,
+        m2-toolbar.get-color-tokens($theme)
       );
     }
 
@@ -55,9 +56,9 @@
     $theme: inspection.private-get-typography-back-compat-theme($theme);
 
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mat-toolbar.$prefix,
-        tokens-mat-toolbar.get-typography-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        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(
-        tokens-mat-toolbar.$prefix,
-        tokens-mat-toolbar.get-density-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        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,18 +1,13 @@
-import { AfterViewInit } from '@angular/core';
-import { ElementRef } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
-import { QueryList } from '@angular/core';
+import { AfterViewInit, ElementRef, QueryList } from '@angular/core';
+import { M as MatCommonModule } from '../common-module.d-C8xzHJDr.js';
+import '@angular/cdk/bidi';
 
-declare namespace i2 {
-    export {
-        throwToolbarMixedModesError,
-        MatToolbarRow,
-        MatToolbar
-    }
+declare class MatToolbarRow {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatToolbarRow, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatToolbarRow, "mat-toolbar-row", ["matToolbarRow"], {}, {}, never, never, true, never>;
 }
-
-export declare class MatToolbar implements AfterViewInit {
+declare class MatToolbar implements AfterViewInit {
     protected _elementRef: ElementRef<any>;
     private _platform;
     private _document;
@@ -35,22 +30,16 @@ export declare class MatToolbar implements AfterViewInit {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatToolbar, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatToolbar, "mat-toolbar", ["matToolbar"], { "color": { "alias": "color"; "required": false; }; }, {}, ["_toolbarRows"], ["*", "mat-toolbar-row"], true, never>;
 }
-
-export declare class MatToolbarModule {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatToolbarModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatToolbarModule, never, [typeof i1.MatCommonModule, typeof i2.MatToolbar, typeof i2.MatToolbarRow], [typeof i2.MatToolbar, typeof i2.MatToolbarRow, typeof i1.MatCommonModule]>;
-    static ɵinj: i0.ɵɵInjectorDeclaration<MatToolbarModule>;
-}
-
-export declare class MatToolbarRow {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatToolbarRow, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatToolbarRow, "mat-toolbar-row", ["matToolbarRow"], {}, {}, never, never, true, never>;
-}
-
 /**
  * Throws an exception when attempting to combine the different toolbar row modes.
  * @docs-private
  */
-export declare function throwToolbarMixedModesError(): void;
+declare function throwToolbarMixedModesError(): void;
+
+declare class MatToolbarModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatToolbarModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatToolbarModule, never, [typeof MatCommonModule, typeof MatToolbar, typeof MatToolbarRow], [typeof MatToolbar, typeof MatToolbarRow, typeof MatCommonModule]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<MatToolbarModule>;
+}
 
-export { }
+export { MatToolbar, MatToolbarModule, MatToolbarRow, throwToolbarMixedModesError };

package/toolbar/testing/index.d.ts

@@ -1,9 +1,17 @@
-import { BaseHarnessFilters } from '@angular/cdk/testing';
-import { ContentContainerComponentHarness } from '@angular/cdk/testing';
-import { HarnessPredicate } from '@angular/cdk/testing';
+import { BaseHarnessFilters, ContentContainerComponentHarness, HarnessPredicate } from '@angular/cdk/testing';
 
+/** A set of criteria that can be used to filter a list of `MatToolbarHarness` instances. */
+interface ToolbarHarnessFilters extends BaseHarnessFilters {
+    /** Only find instances whose text matches the given value. */
+    text?: string | RegExp;
+}
+
+/** Selectors for different sections of the mat-toolbar that contain user content. */
+declare enum MatToolbarSection {
+    ROW = ".mat-toolbar-row"
+}
 /** Harness for interacting with a standard mat-toolbar in tests. */
-export declare class MatToolbarHarness extends ContentContainerComponentHarness<MatToolbarSection> {
+declare class MatToolbarHarness extends ContentContainerComponentHarness<MatToolbarSection> {
     static hostSelector: string;
     private _getRows;
     /**
@@ -21,15 +29,5 @@ export declare class MatToolbarHarness extends ContentContainerComponentHarness<
     getRowsAsText(): Promise<string[]>;
 }
 
-/** Selectors for different sections of the mat-toolbar that contain user content. */
-export declare enum MatToolbarSection {
-    ROW = ".mat-toolbar-row"
-}
-
-/** A set of criteria that can be used to filter a list of `MatToolbarHarness` instances. */
-export declare interface ToolbarHarnessFilters extends BaseHarnessFilters {
-    /** Only find instances whose text matches the given value. */
-    text?: string | RegExp;
-}
-
-export { }
+export { MatToolbarHarness, MatToolbarSection };
+export type { ToolbarHarnessFilters };

package/{core/tokens/m2/mdc/_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: (mdc, 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.
@@ -13,12 +13,8 @@ $prefix: (mdc, plain-tooltip);
 // our CSS.
 @function get-unthemable-tokens() {
   @return (
-    // Border radius for the tooltip container.
     container-shape: 4px,
-    // Line height of the tooltip text.
     supporting-text-line-height: 16px,
-    // MDC does not seem to use these token.
-    supporting-text-type: null,
   );
 }
 
@@ -26,9 +22,7 @@ $prefix: (mdc, plain-tooltip);
 @function get-color-tokens($theme) {
 
   @return (
-    // Color of the tooltip container.
     container-color: inspection.get-theme-color($theme, background, tooltip),
-    // Color of the tooltip text.
     supporting-text-color: #fff,
   );
 }
@@ -36,13 +30,9 @@ $prefix: (mdc, plain-tooltip);
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    // Font for the tooltip text.
     supporting-text-font: inspection.get-theme-typography($theme, caption, font-family),
-    // Font size for the tooltip text.
     supporting-text-size: inspection.get-theme-typography($theme, caption, font-size),
-    // Font weight of the tooltip text.
     supporting-text-weight: inspection.get-theme-typography($theme, caption, font-weight),
-    // Tracking (space between letters) of the tooltip text.
     supporting-text-tracking: inspection.get-theme-typography($theme, caption, letter-spacing),
   );
 }
@@ -57,8 +47,8 @@ $prefix: (mdc, 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/tooltip/_m3-tooltip.scss

@@ -0,0 +1,25 @@
+@use '../core/tokens/m3-utils';
+@use 'sass:map';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, tooltip);
+
+/// Generates the tokens for MDC plain-tooltip
+/// @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 tokens for the MDC plain-tooltip
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  $tokens: (
+    container-color: map.get($systems, md-sys-color, inverse-surface),
+    container-shape: map.get($systems, md-sys-shape, corner-extra-small),
+    supporting-text-color: map.get($systems, md-sys-color, inverse-on-surface),
+    supporting-text-font: map.get($systems, md-sys-typescale, body-small-font),
+    supporting-text-line-height: map.get($systems, md-sys-typescale, body-small-line-height),
+    supporting-text-size: map.get($systems, md-sys-typescale, body-small-size),
+    supporting-text-tracking: map.get($systems, md-sys-typescale, body-small-tracking),
+    supporting-text-weight: map.get($systems, md-sys-typescale, body-small-weight)
+  );
+
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+}

package/tooltip/_tooltip-theme.scss

@@ -4,7 +4,7 @@
 @use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mdc/plain-tooltip' as tokens-mdc-plain-tooltip;
+@use './m2-tooltip';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -12,9 +12,9 @@
   } @else {
     // Add default values for tokens not related to color, typography, or density.
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-unthemable-tokens()
+      @include token-utils.create-token-values-mixed(
+        m2-tooltip.$prefix,
+        m2-tooltip.get-unthemable-tokens()
       );
     }
   }
@@ -25,9 +25,9 @@
     @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-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-color-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-tooltip.$prefix,
+        m2-tooltip.get-color-tokens($theme)
       );
     }
   }
@@ -38,9 +38,9 @@
     @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-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-typography-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-tooltip.$prefix,
+        m2-tooltip.get-typography-tokens($theme)
       );
     }
   }
@@ -48,12 +48,12 @@
 
 @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(
-        tokens-mdc-plain-tooltip.$prefix,
-        tokens-mdc-plain-tooltip.get-density-tokens($theme)
+      @include token-utils.create-token-values-mixed(
+        m2-tooltip.$prefix,
+        m2-tooltip.get-density-tokens($theme)
       );
     }
   }
@@ -63,8 +63,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mdc-plain-tooltip.$prefix,
-      tokens: tokens-mdc-plain-tooltip.get-token-slots(),
+      namespace: m2-tooltip.$prefix,
+      tokens: m2-tooltip.get-token-slots(),
     ),
   );
 }
@@ -97,7 +97,7 @@
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
   @if $tokens != () {
-    $tokens: token-utils.get-tokens-for($tokens, tokens-mdc-plain-tooltip.$prefix);
-    @include token-utils.create-token-values(tokens-mdc-plain-tooltip.$prefix, $tokens);
+    $tokens: token-utils.get-tokens-for($tokens, m2-tooltip.$prefix);
+    @include token-utils.create-token-values(m2-tooltip.$prefix, $tokens);
   }
 }