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

package/{core/tokens/m2/mat/_form-field.scss → form-field/_m2-form-field.scss}

@@ -1,10 +1,12 @@
-@use 'sass:math';
+@use '../core/m2/palette' as m2-palette;
+@use '../core/style/sass-utils';
+@use '../core/theming/inspection';
+@use '../core/theming/theming';
+@use '../core/tokens/m2-utils';
+@use 'sass:color';
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../style/sass-utils';
-@use '../../../theming/theming';
-@use '../../../theming/inspection';
-@use '../../../m2/palette' as m2-palette;
+@use 'sass:math';
+@use 'sass:meta';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, form-field);
@@ -12,13 +14,33 @@ $prefix: (mat, form-field);
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
 @function get-unthemable-tokens() {
-  @return ();
+  @return (
+    filled-active-indicator-height: 1px,
+    filled-focus-active-indicator-height: 2px,
+    filled-container-shape: 4px,
+    outlined-outline-width: 1px,
+    outlined-focus-outline-width: 2px,
+    outlined-container-shape: 4px,
+  );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
   $is-dark: inspection.get-theme-type($theme) == dark;
+  $surface: inspection.get-theme-color($theme, background, card);
+  $warn-color: inspection.get-theme-color($theme, warn);
   $color-tokens: private-get-color-palette-color-tokens($theme, primary);
+  $on-surface: if($is-dark, #fff, #000);
+
+  // Ideally we would derive all values directly from the theme, but it causes a lot of regressions
+  // internally. For now we fall back to the old hardcoded behavior only for internal apps.
+  $on-surface: if($is-dark, #fff, #000);
+  $text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
+    inspection.get-theme-color($theme, foreground, text, 1));
+  $disabled-text-color-base: if(m2-utils.$private-is-internal-build, $on-surface,
+    inspection.get-theme-color($theme, foreground, disabled-text, 1));
+  $divider-base: if(m2-utils.$private-is-internal-build, $on-surface,
+    inspection.get-theme-color($theme, foreground, divider, 1));
 
   @return map.merge($color-tokens, (
     // MDC has a token for the enabled placeholder, but not for the disabled one.
@@ -45,27 +67,78 @@ $prefix: (mat, form-field);
     // are the same).
     leading-icon-color: unset,
     disabled-leading-icon-color: unset,
-
     trailing-icon-color: unset,
     disabled-trailing-icon-color: unset,
     error-focus-trailing-icon-color: unset,
     error-hover-trailing-icon-color: unset,
     error-trailing-icon-color: unset,
-
     enabled-select-arrow-color: inspection.get-theme-color($theme, foreground, icon, 0.54),
     disabled-select-arrow-color: inspection.get-theme-color($theme, foreground, icon, 0.38),
-
     hover-state-layer-opacity: if($is-dark, 0.08, 0.04),
     focus-state-layer-opacity: if($is-dark, 0.24, 0.08),
+    filled-container-color: _variable-safe-mix($on-surface, $surface, 4%),
+    filled-disabled-container-color: _variable-safe-mix($on-surface, $surface, 2%),
+    filled-label-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    filled-hover-label-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    filled-disabled-label-text-color:
+        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+    filled-input-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.87),
+    filled-disabled-input-text-color:
+        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+    filled-input-text-placeholder-color:
+        sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    filled-error-hover-label-text-color: $warn-color,
+    filled-error-focus-label-text-color: $warn-color,
+    filled-error-label-text-color: $warn-color,
+    filled-error-caret-color: $warn-color,
+    filled-active-indicator-color: sass-utils.safe-color-change($divider-base, $alpha: 0.42),
+    filled-disabled-active-indicator-color:
+        sass-utils.safe-color-change($divider-base, $alpha: 0.06),
+    filled-hover-active-indicator-color: sass-utils.safe-color-change($divider-base, $alpha: 0.87),
+    filled-error-active-indicator-color: $warn-color,
+    filled-error-focus-active-indicator-color: $warn-color,
+    filled-error-hover-active-indicator-color: $warn-color,
+    outlined-label-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    outlined-hover-label-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    outlined-disabled-label-text-color:
+        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+    outlined-input-text-color: sass-utils.safe-color-change($text-color-base, $alpha: 0.87),
+    outlined-disabled-input-text-color:
+        sass-utils.safe-color-change($disabled-text-color-base, $alpha: 0.38),
+    outlined-input-text-placeholder-color:
+        sass-utils.safe-color-change($text-color-base, $alpha: 0.6),
+    outlined-error-caret-color: $warn-color,
+    outlined-error-focus-label-text-color: $warn-color,
+    outlined-error-label-text-color: $warn-color,
+    outlined-error-hover-label-text-color: $warn-color,
+    outlined-outline-color: sass-utils.safe-color-change($divider-base, $alpha: 0.38),
+    outlined-disabled-outline-color: sass-utils.safe-color-change($divider-base, $alpha: 0.06),
+    outlined-hover-outline-color: sass-utils.safe-color-change($divider-base, $alpha: 0.87),
+    outlined-error-focus-outline-color: $warn-color,
+    outlined-error-hover-outline-color: $warn-color,
+    outlined-error-outline-color: $warn-color,
   ));
 }
 
+@function _variable-safe-mix($first-color, $second-color, $amount) {
+  @if (meta.type-of($first-color) == color and meta.type-of($second-color) == color) {
+    @return color.mix($first-color, $second-color, $amount);
+  }
+  @return $first-color;
+}
+
 // Generates the mapping for the properties that change based on the form field color.
 @function private-get-color-palette-color-tokens($theme, $palette-name) {
   $palette-color: inspection.get-theme-color($theme, $palette-name);
 
   @return (
     focus-select-arrow-color: sass-utils.safe-color-change($palette-color, $alpha: 0.87),
+    filled-caret-color: $palette-color,
+    filled-focus-active-indicator-color: $palette-color,
+    filled-focus-label-text-color: sass-utils.safe-color-change($palette-color, $alpha: 0.87),
+    outlined-caret-color: $palette-color,
+    outlined-focus-outline-color: $palette-color,
+    outlined-focus-label-text-color: sass-utils.safe-color-change($palette-color, $alpha: 0.87),
   );
 }
 
@@ -96,6 +169,14 @@ $prefix: (mat, form-field);
     subscript-text-size: inspection.get-theme-typography($theme, caption, font-size),
     subscript-text-tracking: inspection.get-theme-typography($theme, caption, letter-spacing),
     subscript-text-weight: inspection.get-theme-typography($theme, caption, font-weight),
+    filled-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    filled-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    filled-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
+    filled-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    outlined-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
+    outlined-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
+    outlined-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
+    outlined-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
   );
 }
 
@@ -158,8 +239,8 @@ $prefix: (mat, form-field);
 @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/form-field/_m3-form-field.scss

@@ -0,0 +1,153 @@
+@use 'sass:map';
+@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, form-field);
+
+/// Generates custom tokens for the mat-form-field.
+/// @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-form-field
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  $tokens: sass-utils.merge-all(
+    m3-utils.generate-typography-tokens($systems, container-text, body-large),
+    m3-utils.generate-typography-tokens($systems, subscript-text, body-small),
+    (
+      disabled-input-text-placeholder-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      state-layer-color: map.get($systems, md-sys-color, on-surface),
+      error-text-color: map.get($systems, md-sys-color, error),
+      select-option-text-color: map.get($systems, md-ref-palette, neutral10),
+      select-disabled-option-text-color:
+          sass-utils.safe-color-change(map.get($systems, md-ref-palette, neutral10), $alpha: 0.38),
+      enabled-select-arrow-color: map.get($systems, md-sys-color, on-surface-variant),
+      disabled-select-arrow-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
+      focus-state-layer-opacity: m3-utils.hardcode(0, $exclude-hardcoded),
+      focus-select-arrow-color: map.get($systems, md-sys-color, primary),
+      leading-icon-color: map.get($systems, md-sys-color, on-surface-variant),
+      disabled-leading-icon-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      trailing-icon-color: map.get($systems, md-sys-color, on-surface-variant),
+      disabled-trailing-icon-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      error-focus-trailing-icon-color: map.get($systems, md-sys-color, error),
+      error-hover-trailing-icon-color: map.get($systems, md-sys-color, on-error-container),
+      error-trailing-icon-color: map.get($systems, md-sys-color, error),
+      filled-active-indicator-color: map.get($systems, md-sys-color, on-surface-variant),
+      filled-active-indicator-height: if($exclude-hardcoded, null, 1px),
+      filled-caret-color: map.get($systems, md-sys-color, primary),
+      filled-container-color: map.get($systems, md-sys-color, surface-variant),
+      filled-container-shape: map.get($systems, md-sys-shape, corner-extra-small),
+      filled-disabled-active-indicator-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      filled-disabled-container-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.04),
+      filled-disabled-input-text-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      filled-disabled-label-text-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      filled-error-active-indicator-color: map.get($systems, md-sys-color, error),
+      filled-error-focus-active-indicator-color: map.get($systems, md-sys-color, error),
+      filled-error-focus-label-text-color: map.get($systems, md-sys-color, error),
+      filled-error-hover-active-indicator-color:
+          map.get($systems, md-sys-color, on-error-container),
+      filled-error-hover-label-text-color: map.get($systems, md-sys-color, on-error-container),
+      filled-error-label-text-color: map.get($systems, md-sys-color, error),
+      filled-focus-active-indicator-color: map.get($systems, md-sys-color, primary),
+      filled-focus-active-indicator-height: if($exclude-hardcoded, null, 2px),
+      filled-focus-label-text-color: map.get($systems, md-sys-color, primary),
+      filled-hover-active-indicator-color: map.get($systems, md-sys-color, on-surface),
+      filled-hover-label-text-color: map.get($systems, md-sys-color, on-surface-variant),
+      filled-input-text-color: map.get($systems, md-sys-color, on-surface),
+      filled-input-text-placeholder-color: map.get($systems, md-sys-color, on-surface-variant),
+      filled-label-text-color: map.get($systems, md-sys-color, on-surface-variant),
+      filled-label-text-font: map.get($systems, md-sys-typescale, body-large-font),
+      filled-label-text-size: map.get($systems, md-sys-typescale, body-large-size),
+      filled-label-text-tracking: map.get($systems, md-sys-typescale, body-large-tracking),
+      filled-label-text-weight: map.get($systems, md-sys-typescale, body-large-weight),
+      outlined-caret-color: map.get($systems, md-sys-color, primary),
+      outlined-container-shape: map.get($systems, md-sys-shape, corner-extra-small),
+      outlined-disabled-input-text-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      outlined-disabled-label-text-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+      outlined-disabled-outline-color:
+          sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.12),
+      outlined-error-focus-label-text-color: map.get($systems, md-sys-color, error),
+      outlined-error-focus-outline-color: map.get($systems, md-sys-color, error),
+      outlined-error-hover-label-text-color: map.get($systems, md-sys-color, on-error-container),
+      outlined-error-hover-outline-color: map.get($systems, md-sys-color, on-error-container),
+      outlined-error-label-text-color: map.get($systems, md-sys-color, error),
+      outlined-error-outline-color: map.get($systems, md-sys-color, error),
+      outlined-focus-label-text-color: map.get($systems, md-sys-color, primary),
+      outlined-focus-outline-color: map.get($systems, md-sys-color, primary),
+      outlined-focus-outline-width: if($exclude-hardcoded, null, 2px),
+      outlined-hover-label-text-color: map.get($systems, md-sys-color, on-surface),
+      outlined-hover-outline-color: map.get($systems, md-sys-color, on-surface),
+      outlined-input-text-color: map.get($systems, md-sys-color, on-surface),
+      outlined-input-text-placeholder-color: map.get($systems, md-sys-color, on-surface-variant),
+      outlined-label-text-color: map.get($systems, md-sys-color, on-surface-variant),
+      outlined-label-text-font: map.get($systems, md-sys-typescale, body-large-font),
+      outlined-label-text-size: map.get($systems, md-sys-typescale, body-large-size),
+      outlined-label-text-tracking: map.get($systems, md-sys-typescale, body-large-tracking),
+      outlined-label-text-weight: map.get($systems, md-sys-typescale, body-large-weight),
+      outlined-outline-color: map.get($systems, md-sys-color, outline),
+      outlined-outline-width: if($exclude-hardcoded, null, 1px),
+    )
+  );
+
+  $variant-tokens: (
+    // Color variants:
+    primary: (), // Default, no overrides needed.
+    secondary: (
+      focus-select-arrow-color: map.get($systems, md-sys-color, secondary),
+      filled-caret-color: map.get($systems, md-sys-color, secondary),
+      filled-focus-active-indicator-color: map.get($systems, md-sys-color, secondary),
+      filled-focus-label-text-color: map.get($systems, md-sys-color, secondary),
+      outlined-caret-color: map.get($systems, md-sys-color, secondary),
+      outlined-focus-label-text-color: map.get($systems, md-sys-color, secondary),
+      outlined-focus-outline-color: map.get($systems, md-sys-color, secondary),
+    ),
+    tertiary: (
+      focus-select-arrow-color: map.get($systems, md-sys-color, tertiary),
+      filled-caret-color: map.get($systems, md-sys-color, tertiary),
+      filled-focus-active-indicator-color: map.get($systems, md-sys-color, tertiary),
+      filled-focus-label-text-color: map.get($systems, md-sys-color, tertiary),
+      outlined-caret-color: map.get($systems, md-sys-color, tertiary),
+      outlined-focus-label-text-color: map.get($systems, md-sys-color, tertiary),
+      outlined-focus-outline-color: map.get($systems, md-sys-color, tertiary),
+    ),
+    error: (
+      focus-select-arrow-color: map.get($systems, md-sys-color, error),
+      filled-caret-color: map.get($systems, md-sys-color, error),
+      filled-focus-active-indicator-color: map.get($systems, md-sys-color, error),
+      filled-focus-label-text-color: map.get($systems, md-sys-color, error),
+      outlined-caret-color: map.get($systems, md-sys-color, error),
+      outlined-focus-label-text-color: map.get($systems, md-sys-color, error),
+      outlined-focus-outline-color: map.get($systems, md-sys-color, error),
+    )
+  );
+
+  @return m3-utils.namespace($prefix, ($tokens, $variant-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), -5);
+  $index: ($scale * -1) + 1;
+
+  @return (
+    container-height: list.nth((56px, 52px, 48px, 44px, 40px, 36px), $index),
+    filled-label-display: list.nth((block, block, none, none, none, none), $index),
+    container-vertical-padding: list.nth((16px, 14px, 12px, 10px, 8px, 6px), $index),
+    filled-with-label-container-padding-top: list.nth((24px, 22px, 12px, 10px, 8px, 6px), $index),
+    filled-with-label-container-padding-bottom: list.nth((8px, 6px, 12px, 10px, 8px, 6px), $index),
+  );
+}

package/form-field/index.d.ts

@@ -1,13 +1,13 @@
-export { a as MatFormFieldModule, M as MatLabel } from '../module.d-c17c834e.js';
-export { F as FloatLabelType, M as MAT_ERROR, i as MAT_FORM_FIELD, j as MAT_FORM_FIELD_DEFAULT_OPTIONS, c as MAT_PREFIX, e as MAT_SUFFIX, a as MatError, k as MatFormField, g as MatFormFieldAppearance, h as MatFormFieldDefaultOptions, b as MatHint, d as MatPrefix, f as MatSuffix, S as SubscriptSizing } from '../form-field.d-2edbc094.js';
-export { M as MatFormFieldControl } from '../form-field-control.d-eb86711c.js';
+export { a as MatFormFieldModule, M as MatLabel } from '../module.d-BGzxQfCs.js';
+export { F as FloatLabelType, e as MAT_ERROR, j as MAT_FORM_FIELD, k as MAT_FORM_FIELD_DEFAULT_OPTIONS, f as MAT_PREFIX, g as MAT_SUFFIX, b as MatError, M as MatFormField, h as MatFormFieldAppearance, i as MatFormFieldDefaultOptions, a as MatHint, c as MatPrefix, d as MatSuffix, S as SubscriptSizing } from '../form-field.d-b9aHrR4I.js';
+export { M as MatFormFieldControl } from '../form-field-control.d-DvB4ZVlf.js';
 import '@angular/core';
-import '../common-module.d-0e6515ae.js';
+import '../common-module.d-C8xzHJDr.js';
 import '@angular/cdk/bidi';
 import '@angular/cdk/observers';
 import '@angular/cdk/coercion';
 import '@angular/forms';
-import '../palette.d-ec4a617c.js';
+import '../palette.d-BSSFKjO6.js';
 import 'rxjs';
 
 /** @docs-private */

package/form-field/testing/control/index.d.ts

@@ -1,2 +1,10 @@
-export { M as MatFormFieldControlHarness } from '../../../form-field-control-harness.d-2d91f25a.js';
-import '@angular/cdk/testing';
+import { ComponentHarness } from '@angular/cdk/testing';
+
+/**
+ * Base class for custom form-field control harnesses. Harnesses for
+ * custom controls with form-fields need to implement this interface.
+ */
+declare abstract class MatFormFieldControlHarness extends ComponentHarness {
+}
+
+export { MatFormFieldControlHarness };

package/form-field/testing/index.d.ts

@@ -1,11 +1,10 @@
-import { M as MatFormFieldControlHarness } from '../../form-field-control-harness.d-2d91f25a.js';
-export { M as MatFormFieldControlHarness } from '../../form-field-control-harness.d-2d91f25a.js';
+import { MatFormFieldControlHarness } from './control/index.js';
 import { BaseHarnessFilters, ComponentHarness, ComponentHarnessConstructor, HarnessPredicate } from '@angular/cdk/testing';
-import { M as MatInputHarness } from '../../input-harness.d-4eecd1d3.js';
-import { M as MatSelectHarness } from '../../select-harness.d-7441a7ac.js';
-import { M as MatDatepickerInputHarness, g as MatDateRangeInputHarness } from '../../date-range-input-harness.d-549a9f7e.js';
-import '../../option-harness.d-3d33fc9a.js';
-import '../../optgroup-harness.d-7f741f69.js';
+import { M as MatInputHarness } from '../../input-harness.d-8fkAAbu2.js';
+import { MatSelectHarness } from '../../select/testing/index.js';
+import { M as MatDatepickerInputHarness, g as MatDateRangeInputHarness } from '../../date-range-input-harness.d-CaEyN8dT.js';
+import '../../option-harness.d-IqsW95GR.js';
+import '../../core/testing/index.js';
 
 /** A set of criteria that can be used to filter a list of `MatFormFieldHarness` instances. */
 interface FormFieldHarnessFilters extends BaseHarnessFilters {
@@ -124,4 +123,5 @@ declare class MatFormFieldHarness extends ComponentHarness {
     private _hasFormControl;
 }
 
-export { type ErrorHarnessFilters, type FormFieldControlHarness, type FormFieldHarnessFilters, MatErrorHarness, MatFormFieldHarness };
+export { MatErrorHarness, MatFormFieldControlHarness, MatFormFieldHarness };
+export type { ErrorHarnessFilters, FormFieldControlHarness, FormFieldHarnessFilters };

package/{form-field-control.d-eb86711c.d.ts → form-field-control.d-DvB4ZVlf.d.ts}

@@ -51,6 +51,8 @@ declare abstract class MatFormFieldControl<T> {
      * field from associating the label with non-native elements.
      */
     readonly disableAutomaticLabeling?: boolean;
+    /** Gets the list of element IDs that currently describe this control. */
+    readonly describedByIds?: string[];
     /** Sets the list of element IDs that currently describe this control. */
     abstract setDescribedByIds(ids: string[]): void;
     /** Handles a click on the control's container. */

package/{form-field.d-2edbc094.d.ts → form-field.d-b9aHrR4I.d.ts}

@@ -2,8 +2,8 @@ import * as i0 from '@angular/core';
 import { InjectionToken, OnDestroy, AfterViewInit, ElementRef, AfterContentInit, AfterContentChecked, QueryList } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { AbstractControlDirective } from '@angular/forms';
-import { T as ThemePalette } from './palette.d-ec4a617c.js';
-import { M as MatFormFieldControl$1 } from './form-field-control.d-eb86711c.js';
+import { T as ThemePalette } from './palette.d-BSSFKjO6.js';
+import { M as MatFormFieldControl$1 } from './form-field-control.d-DvB4ZVlf.js';
 
 /**
  * Injection token that can be used to reference instances of `MatError`. It serves as
@@ -137,10 +137,10 @@ declare class MatFormFieldNotchedOutline implements AfterViewInit {
     private _ngZone;
     /** Whether the notch should be opened. */
     open: boolean;
-    _notch: ElementRef;
-    constructor(...args: unknown[]);
+    _notch: ElementRef<HTMLElement>;
     ngAfterViewInit(): void;
     _setNotchWidth(labelWidth: number): void;
+    _setMaxWidth(prefixAndSuffixWidth: number): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatFormFieldNotchedOutline, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatFormFieldNotchedOutline, "div[matFormFieldNotchedOutline]", never, { "open": { "alias": "matFormFieldNotchedOutlineOpen"; "required": false; }; }, {}, never, ["*"], true, never>;
 }
@@ -205,7 +205,6 @@ declare class MatFormField implements FloatingLabelParent, AfterContentInit, Aft
     private _platform;
     private _idGenerator;
     private _ngZone;
-    private _injector;
     private _defaults;
     _textField: ElementRef<HTMLElement>;
     _iconPrefixContainer: ElementRef<HTMLElement>;
@@ -215,6 +214,11 @@ declare class MatFormField implements FloatingLabelParent, AfterContentInit, Aft
     _floatingLabel: MatFormFieldFloatingLabel | undefined;
     _notchedOutline: MatFormFieldNotchedOutline | undefined;
     _lineRipple: MatFormFieldLineRipple | undefined;
+    private _iconPrefixContainerSignal;
+    private _textPrefixContainerSignal;
+    private _iconSuffixContainerSignal;
+    private _textSuffixContainerSignal;
+    private _prefixSuffixContainers;
     _formFieldControl: MatFormFieldControl<any>;
     _prefixChildren: QueryList<MatPrefix>;
     _suffixChildren: QueryList<MatSuffix>;
@@ -240,7 +244,7 @@ declare class MatFormField implements FloatingLabelParent, AfterContentInit, Aft
     /** The form field appearance style. */
     get appearance(): MatFormFieldAppearance;
     set appearance(value: MatFormFieldAppearance);
-    private _appearance;
+    private _appearanceSignal;
     /**
      * Whether the form field should reserve space for one line of hint/error text (default)
      * or to have the spacing grow from 0px as needed based on the size of the hint/error content.
@@ -259,13 +263,13 @@ declare class MatFormField implements FloatingLabelParent, AfterContentInit, Aft
     _hasTextSuffix: boolean;
     readonly _labelId: string;
     readonly _hintLabelId: string;
+    private _describedByIds;
     /** Gets the current form field control */
     get _control(): MatFormFieldControl<any>;
     set _control(value: MatFormFieldControl<any>);
     private _destroyed;
     private _isFocused;
     private _explicitFormFieldControl;
-    private _needsOutlineLabelOffsetUpdate;
     private _previousControl;
     private _previousControlValidatorFn;
     private _stateChanges;
@@ -302,13 +306,14 @@ declare class MatFormField implements FloatingLabelParent, AfterContentInit, Aft
     /** Throws an error if the form field's control is missing. */
     private _assertFormFieldControl;
     private _updateFocusState;
+    private _outlineLabelOffsetResizeObserver;
     /**
      * The floating label in the docked state needs to account for prefixes. The horizontal offset
      * is calculated whenever the appearance changes to `outline`, the prefixes change, or when the
      * form field is added to the DOM. This method sets up all subscriptions which are needed to
      * trigger the label offset update.
      */
-    private _initializeOutlineLabelOffsetSubscriptions;
+    private _syncOutlineLabelOffset;
     /** Whether the floating label should always float or not. */
     _shouldAlwaysFloat(): boolean;
     _hasOutline(): boolean;
@@ -328,8 +333,8 @@ declare class MatFormField implements FloatingLabelParent, AfterContentInit, Aft
      * should be forwarded to the host element.
      */
     _shouldForward(prop: keyof AbstractControlDirective): boolean;
-    /** Determines whether to display hints or errors. */
-    _getDisplayedMessages(): 'error' | 'hint';
+    /** Gets the type of subscript message to render (error or hint). */
+    _getSubscriptMessageType(): 'error' | 'hint';
     /** Handle label resize events. */
     _handleLabelResized(): void;
     /** Refreshes the width of the outline-notch, if present. */
@@ -364,4 +369,5 @@ declare class MatFormField implements FloatingLabelParent, AfterContentInit, Aft
     static ɵcmp: i0.ɵɵComponentDeclaration<MatFormField, "mat-form-field", ["matFormField"], { "hideRequiredMarker": { "alias": "hideRequiredMarker"; "required": false; }; "color": { "alias": "color"; "required": false; }; "floatLabel": { "alias": "floatLabel"; "required": false; }; "appearance": { "alias": "appearance"; "required": false; }; "subscriptSizing": { "alias": "subscriptSizing"; "required": false; }; "hintLabel": { "alias": "hintLabel"; "required": false; }; }, {}, ["_labelChild", "_formFieldControl", "_prefixChildren", "_suffixChildren", "_errorChildren", "_hintChildren"], ["mat-label", "[matPrefix], [matIconPrefix]", "[matTextPrefix]", "*", "[matTextSuffix]", "[matSuffix], [matIconSuffix]", "mat-error, [matError]", "mat-hint:not([align='end'])", "mat-hint[align='end']"], true, never>;
 }
 
-export { type FloatLabelType as F, MAT_ERROR as M, type SubscriptSizing as S, MatError as a, MatHint as b, MAT_PREFIX as c, MatPrefix as d, MAT_SUFFIX as e, MatSuffix as f, type MatFormFieldAppearance as g, type MatFormFieldDefaultOptions as h, MAT_FORM_FIELD as i, MAT_FORM_FIELD_DEFAULT_OPTIONS as j, MatFormField as k };
+export { MatFormField as M, MatHint as a, MatError as b, MatPrefix as c, MatSuffix as d, MAT_ERROR as e, MAT_PREFIX as f, MAT_SUFFIX as g, MAT_FORM_FIELD as j, MAT_FORM_FIELD_DEFAULT_OPTIONS as k };
+export type { FloatLabelType as F, SubscriptSizing as S, MatFormFieldAppearance as h, MatFormFieldDefaultOptions as i };

package/grid-list/_grid-list-theme.scss

@@ -3,7 +3,7 @@
 @use '../core/theming/inspection';
 @use '../core/theming/validation';
 @use '../core/typography/typography';
-@use '../core/tokens/m2/mat/grid-list' as tokens-mat-grid-list;
+@use './m2-grid-list';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 
@@ -27,17 +27,15 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mat-grid-list.$prefix,
-        tokens-mat-grid-list.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-grid-list.$prefix, m2-grid-list.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @else {
   }
 }
@@ -46,8 +44,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-grid-list.$prefix,
-      tokens: tokens-mat-grid-list.get-token-slots(),
+      namespace: m2-grid-list.$prefix,
+      tokens: m2-grid-list.get-token-slots(),
     ),
   );
 }
@@ -81,8 +79,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-grid-list.$prefix,
-      map.get($tokens, tokens-mat-grid-list.$prefix)
+      m2-grid-list.$prefix,
+      map.get($tokens, m2-grid-list.$prefix)
     );
   }
 }

package/{core/tokens/m2/mat/_grid-list.scss → grid-list/_m2-grid-list.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, grid-list);
@@ -39,8 +39,8 @@ $prefix: (mat, grid-list);
 @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/_grid-list.scss → grid-list/_m3-grid-list.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, grid-list);
@@ -17,5 +17,5 @@ $prefix: (mat, grid-list);
     tile-footer-secondary-text-size: map.get($systems, md-sys-typescale, body-medium),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/grid-list/index.d.ts

@@ -1,8 +1,7 @@
-import { M as MatLine, a as MatLineModule } from '../line.d-570a2537.js';
-export { M as MatLine } from '../line.d-570a2537.js';
+import { M as MatLine, a as MatLineModule } from '../line.d-C-QdueRc.js';
 import * as i0 from '@angular/core';
 import { AfterContentInit, QueryList, OnInit, AfterContentChecked } from '@angular/core';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
+import { M as MatCommonModule } from '../common-module.d-C8xzHJDr.js';
 import { NumberInput } from '@angular/cdk/coercion';
 import '@angular/cdk/bidi';
 
@@ -206,4 +205,4 @@ declare class MatGridListModule {
 
 declare const ɵTileCoordinator: typeof TileCoordinator;
 
-export { MatGridAvatarCssMatStyler, MatGridList, MatGridListModule, MatGridTile, MatGridTileFooterCssMatStyler, MatGridTileHeaderCssMatStyler, MatGridTileText, ɵTileCoordinator };
+export { MatGridAvatarCssMatStyler, MatGridList, MatGridListModule, MatGridTile, MatGridTileFooterCssMatStyler, MatGridTileHeaderCssMatStyler, MatGridTileText, MatLine, ɵTileCoordinator };

package/grid-list/testing/index.d.ts

@@ -78,4 +78,5 @@ declare class MatGridListHarness extends ComponentHarness {
     }): Promise<MatGridTileHarness>;
 }
 
-export { type GridListHarnessFilters, type GridTileHarnessFilters, MatGridListHarness, MatGridTileHarness, MatGridTileSection };
+export { MatGridListHarness, MatGridTileHarness, MatGridTileSection };
+export type { GridListHarnessFilters, GridTileHarnessFilters };