@angular/material 18.1.0-next.4 → 18.1.0

package/form-field/_form-field-subscript.scss

@@ -1,7 +1,7 @@
-@use '@material/typography' as mdc-typography;
 @use '@material/textfield/variables' as mdc-textfield-variables;
 
 @use '../core/tokens/m2/mat/form-field' as tokens-mat-form-field;
+@use '../core/style/vendor-prefixes';
 @use '../core/tokens/token-utils';
 
 @mixin private-form-field-subscript() {
@@ -68,7 +68,7 @@
   .mat-mdc-form-field-bottom-align::before {
     @include token-utils.use-tokens(tokens-mat-form-field.$prefix,
       tokens-mat-form-field.get-token-slots()) {
-      @include mdc-typography.smooth-font();
+      @include vendor-prefixes.smooth-font();
       @include token-utils.create-token-slot(font-family, subscript-text-font);
       @include token-utils.create-token-slot(line-height, subscript-text-line-height);
       @include token-utils.create-token-slot(font-size, subscript-text-size);

package/form-field/_mdc-text-field-structure-overrides.scss

@@ -1,5 +1,4 @@
 @use '@material/textfield/variables' as mdc-textfield-variables;
-@use '@material/typography/typography' as mdc-typography;
 @use '../core/tokens/m2/mat/form-field' as tokens-mat-form-field;
 @use '../core/tokens/token-utils';
 @use '../core/style/vendor-prefixes';
@@ -25,7 +24,7 @@ $_enable-form-field-will-change-reset: true;
   // Note: We increase specificity here because the MDC textfield seems to override this,
   // depending on the CSS order, with an affix selector joint with the input.
   .mat-mdc-form-field-input-control.mat-mdc-form-field-input-control {
-    @include mdc-typography.smooth-font();
+    @include vendor-prefixes.smooth-font();
     font: inherit;
     letter-spacing: inherit;
     text-decoration: inherit;
@@ -34,7 +33,7 @@ $_enable-form-field-will-change-reset: true;
   }
 
   .mat-mdc-form-field .mat-mdc-floating-label.mdc-floating-label {
-    @include mdc-typography.smooth-font();
+    @include vendor-prefixes.smooth-font();
 
     // In order to ensure proper alignment of the floating label, we reset its line-height.
     // The line-height is not important as the element is absolutely positioned and only has one

package/form-field/index.d.ts

@@ -18,6 +18,7 @@ import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
 import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
+import { Signal } from '@angular/core';
 import { ThemePalette } from '@angular/material/core';
 
 /** An interface that the parent form-field should implement to receive resize events. */
@@ -139,13 +140,12 @@ export declare class MatFormField implements FloatingLabelParent, AfterContentIn
     _floatingLabel: MatFormFieldFloatingLabel | undefined;
     _notchedOutline: MatFormFieldNotchedOutline | undefined;
     _lineRipple: MatFormFieldLineRipple | undefined;
-    _labelChildNonStatic: MatLabel | undefined;
-    _labelChildStatic: MatLabel | undefined;
     _formFieldControl: MatFormFieldControl_2<any>;
     _prefixChildren: QueryList<MatPrefix>;
     _suffixChildren: QueryList<MatSuffix>;
     _errorChildren: QueryList<MatError>;
     _hintChildren: QueryList<MatHint>;
+    private readonly _labelChild;
     /** Whether the required marker should be hidden. */
     get hideRequiredMarker(): boolean;
     set hideRequiredMarker(value: BooleanInput);
@@ -212,7 +212,7 @@ export declare class MatFormField implements FloatingLabelParent, AfterContentIn
     /**
      * Gets the id of the label element. If no label is present, returns `null`.
      */
-    getLabelId(): string | null;
+    getLabelId: Signal<string | null>;
     /**
      * Gets an ElementRef for the element that a overlay attached to the form field
      * should be positioned relative to.
@@ -253,7 +253,7 @@ export declare class MatFormField implements FloatingLabelParent, AfterContentIn
      * the label is part of the infix, the label cannot overflow the prefix content.
      */
     _forceDisplayInfixLabel(): boolean | 0;
-    _hasFloatingLabel(): boolean;
+    _hasFloatingLabel: Signal<boolean>;
     _shouldLabelFloat(): boolean;
     /**
      * Determines whether a class from the AbstractControlDirective
@@ -293,7 +293,7 @@ export declare class MatFormField implements FloatingLabelParent, AfterContentIn
     /** Checks whether the form field is attached to the DOM. */
     private _isAttachedToDom;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatFormField, [null, null, null, null, null, { optional: true; }, { optional: true; }, null]>;
-    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; }; }, {}, ["_labelChildNonStatic", "_labelChildStatic", "_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>;
+    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>;
 }
 
 /**
@@ -383,8 +383,10 @@ export declare interface MatFormFieldDefaultOptions {
     /** Default form field appearance style. */
     appearance?: MatFormFieldAppearance;
     /**
-     * Default color of the form field. This API is supported in M2 themes only, it has no effect in
-     * M3 themes. For information on applying color variants in M3, see
+     * Default theme color of the form field. This API is supported in M2 themes only, it has no
+     * effect in M3 themes.
+     *
+     * For information on applying color variants in M3, see
      * https://material.angular.io/guide/theming#using-component-color-variants
      */
     color?: ThemePalette;

package/list/_list-inherited-structure.scss

@@ -0,0 +1,516 @@
+@use '@angular/cdk';
+@use '../core/style/vendor-prefixes';
+@use '../core/tokens/m2/mdc/list' as tokens-mdc-list;
+@use '../core/tokens/token-utils';
+
+// Includes the structural styles for the list that were inherited from MDC.
+@mixin private-list-inherited-structural-styles {
+  $tokens: (tokens-mdc-list.$prefix, tokens-mdc-list.get-token-slots());
+
+  .mdc-list {
+    margin: 0;
+    padding: 8px 0;
+    list-style-type: none;
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  .mdc-list-item {
+    display: flex;
+    position: relative;
+    justify-content: flex-start;
+    overflow: hidden;
+    padding: 0;
+    align-items: stretch;
+    cursor: pointer;
+    padding-left: 16px;
+    padding-right: 16px;
+
+    @include token-utils.use-tokens($tokens...) {
+      @include token-utils.create-token-slot(background-color, list-item-container-color);
+      @include token-utils.create-token-slot(border-radius, list-item-container-shape);
+
+      &.mdc-list-item--selected {
+        @include token-utils.create-token-slot(background-color,
+          list-item-selected-container-color);
+      }
+    }
+
+    &:focus {
+      outline: 0;
+    }
+
+    &.mdc-list-item--disabled {
+      cursor: auto;
+    }
+
+    &.mdc-list-item--with-one-line {
+      @include token-utils.use-tokens($tokens...) {
+        @include token-utils.create-token-slot(height, list-item-one-line-container-height);
+      }
+
+      .mdc-list-item__start {
+        align-self: center;
+        margin-top: 0;
+      }
+
+      .mdc-list-item__end {
+        align-self: center;
+        margin-top: 0;
+      }
+    }
+
+    &.mdc-list-item--with-two-lines {
+      @include token-utils.use-tokens($tokens...) {
+        @include token-utils.create-token-slot(height, list-item-two-line-container-height);
+      }
+
+      .mdc-list-item__start {
+        align-self: flex-start;
+        margin-top: 16px;
+      }
+
+      .mdc-list-item__end {
+        align-self: center;
+        margin-top: 0;
+      }
+    }
+
+    &.mdc-list-item--with-three-lines {
+      @include token-utils.use-tokens($tokens...) {
+        @include token-utils.create-token-slot(height, list-item-three-line-container-height);
+      }
+
+      .mdc-list-item__start {
+        align-self: flex-start;
+        margin-top: 16px;
+      }
+
+      .mdc-list-item__end {
+        align-self: flex-start;
+        margin-top: 16px;
+      }
+    }
+
+    &.mdc-list-item--selected::before,
+    &.mdc-list-item--selected:focus::before,
+    &:not(.mdc-list-item--selected):focus::before {
+      position: absolute;
+      box-sizing: border-box;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      left: 0;
+      border: 1px solid transparent;
+      border-radius: inherit;
+      content: '';
+      pointer-events: none;
+
+      @include cdk.high-contrast(active, off) {
+        border-color: CanvasText;
+      }
+    }
+
+    &.mdc-list-item--selected:focus::before,
+    &.mdc-list-item--selected::before {
+      border-width: 3px;
+      border-style: double;
+    }
+  }
+
+  a.mdc-list-item {
+    color: inherit;
+    text-decoration: none;
+  }
+
+  .mdc-list-item__start {
+    fill: currentColor;
+    flex-shrink: 0;
+    pointer-events: none;
+
+    @include token-utils.use-tokens($tokens...) {
+      .mdc-list-item--with-leading-icon & {
+        @include token-utils.create-token-slot(color, list-item-leading-icon-color);
+        @include token-utils.create-token-slot(width, list-item-leading-icon-size);
+        @include token-utils.create-token-slot(height, list-item-leading-icon-size);
+        margin-left: 16px;
+        margin-right: 32px;
+      }
+
+      [dir='rtl'] .mdc-list-item--with-leading-icon & {
+        margin-left: 32px;
+        margin-right: 16px;
+      }
+
+      .mdc-list-item--with-leading-icon:hover & {
+        @include token-utils.create-token-slot(color, list-item-hover-leading-icon-color);
+      }
+
+      // This is the same in RTL, but we need the specificity.
+      .mdc-list-item--with-leading-avatar & {
+        @include token-utils.create-token-slot(width, list-item-leading-avatar-size);
+        @include token-utils.create-token-slot(height, list-item-leading-avatar-size);
+        margin-left: 16px;
+        margin-right: 16px;
+        border-radius: 50%;
+      }
+
+      .mdc-list-item--with-leading-avatar &,
+      [dir='rtl'] .mdc-list-item--with-leading-avatar & {
+        margin-left: 16px;
+        margin-right: 16px;
+        border-radius: 50%;
+      }
+    }
+  }
+
+  .mdc-list-item__end {
+    flex-shrink: 0;
+    pointer-events: none;
+
+    @include token-utils.use-tokens($tokens...) {
+      .mdc-list-item--with-trailing-meta & {
+        @include token-utils.create-token-slot(font-family,
+          list-item-trailing-supporting-text-font);
+        @include token-utils.create-token-slot(line-height,
+          list-item-trailing-supporting-text-line-height);
+        @include token-utils.create-token-slot(font-size,
+          list-item-trailing-supporting-text-size);
+        @include token-utils.create-token-slot(font-weight,
+          list-item-trailing-supporting-text-weight);
+        @include token-utils.create-token-slot(letter-spacing,
+          list-item-trailing-supporting-text-tracking);
+      }
+
+      .mdc-list-item--with-trailing-icon & {
+        @include token-utils.create-token-slot(color, list-item-trailing-icon-color);
+        @include token-utils.create-token-slot(width, list-item-trailing-icon-size);
+        @include token-utils.create-token-slot(height, list-item-trailing-icon-size);
+      }
+
+      .mdc-list-item--with-trailing-icon:hover & {
+        @include token-utils.create-token-slot(color, list-item-hover-trailing-icon-color);
+      }
+
+      // For some reason this has an increased specificity just for the `color`.
+      // Keeping it in place for now to reduce the amount of screenshot diffs.
+      .mdc-list-item.mdc-list-item--with-trailing-meta & {
+        @include token-utils.create-token-slot(color, list-item-trailing-supporting-text-color);
+      }
+
+      .mdc-list-item--selected.mdc-list-item--with-trailing-icon & {
+        @include token-utils.create-token-slot(color, list-item-selected-trailing-icon-color);
+      }
+    }
+  }
+
+  .mdc-list-item__content {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    align-self: center;
+    flex: 1;
+    pointer-events: none;
+
+    .mdc-list-item--with-two-lines &,
+    .mdc-list-item--with-three-lines & {
+      align-self: stretch;
+    }
+  }
+
+  .mdc-list-item__primary-text {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+
+    @include token-utils.use-tokens($tokens...) {
+      @include token-utils.create-token-slot(color, list-item-label-text-color);
+      @include token-utils.create-token-slot(font-family, list-item-label-text-font);
+      @include token-utils.create-token-slot(line-height, list-item-label-text-line-height);
+      @include token-utils.create-token-slot(font-size, list-item-label-text-size);
+      @include token-utils.create-token-slot(font-weight, list-item-label-text-weight);
+      @include token-utils.create-token-slot(letter-spacing, list-item-label-text-tracking);
+
+      .mdc-list-item:hover & {
+        @include token-utils.create-token-slot(color, list-item-hover-label-text-color);
+      }
+
+      .mdc-list-item:focus & {
+        @include token-utils.create-token-slot(color, list-item-focus-label-text-color);
+      }
+    }
+
+    .mdc-list-item--with-two-lines &,
+    .mdc-list-item--with-three-lines & {
+      display: block;
+      margin-top: 0;
+      line-height: normal;
+      margin-bottom: -20px;
+    }
+
+    .mdc-list-item--with-two-lines &::before,
+    .mdc-list-item--with-three-lines &::before {
+      display: inline-block;
+      width: 0;
+      height: 28px;
+      content: '';
+      vertical-align: 0;
+    }
+
+    .mdc-list-item--with-two-lines &::after,
+    .mdc-list-item--with-three-lines &::after {
+      display: inline-block;
+      width: 0;
+      height: 20px;
+      content: '';
+      vertical-align: -20px;
+    }
+  }
+
+  .mdc-list-item__secondary-text {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    display: block;
+    margin-top: 0;
+
+    @include token-utils.use-tokens($tokens...) {
+      @include token-utils.create-token-slot(color, list-item-supporting-text-color);
+      @include token-utils.create-token-slot(font-family, list-item-supporting-text-font);
+      @include token-utils.create-token-slot(line-height, list-item-supporting-text-line-height);
+      @include token-utils.create-token-slot(font-size, list-item-supporting-text-size);
+      @include token-utils.create-token-slot(font-weight, list-item-supporting-text-weight);
+      @include token-utils.create-token-slot(letter-spacing, list-item-supporting-text-tracking);
+    }
+
+    &::before {
+      display: inline-block;
+      width: 0;
+      height: 20px;
+      content: '';
+      vertical-align: 0;
+    }
+
+    .mdc-list-item--with-three-lines & {
+      white-space: normal;
+      line-height: 20px;
+    }
+
+    .mdc-list-item--with-overline & {
+      white-space: nowrap;
+      line-height: auto;
+    }
+  }
+
+  .mdc-list-item--with-leading-radio,
+  .mdc-list-item--with-leading-checkbox,
+  .mdc-list-item--with-leading-icon,
+  .mdc-list-item--with-leading-avatar {
+    &.mdc-list-item {
+      padding-left: 0;
+      padding-right: 16px;
+
+      [dir='rtl'] & {
+        padding-left: 16px;
+        padding-right: 0;
+      }
+    }
+
+    &.mdc-list-item--with-two-lines {
+      .mdc-list-item__primary-text {
+        display: block;
+        margin-top: 0;
+        line-height: normal;
+        margin-bottom: -20px;
+
+        // This was used by MDC to set the text baseline. We should figure out a way to
+        // remove it, because it can introduce unnecessary whitespace at the beginning
+        // of the element.
+        &::before {
+          display: inline-block;
+          width: 0;
+          height: 32px;
+          content: '';
+          vertical-align: 0;
+        }
+
+        &::after {
+          display: inline-block;
+          width: 0;
+          height: 20px;
+          content: '';
+          vertical-align: -20px;
+        }
+      }
+
+      &.mdc-list-item--with-trailing-meta {
+        .mdc-list-item__end {
+          display: block;
+          margin-top: 0;
+          line-height: normal;
+
+          &::before {
+            display: inline-block;
+            width: 0;
+            height: 32px;
+            content: '';
+            vertical-align: 0;
+          }
+        }
+      }
+    }
+  }
+
+  .mdc-list-item--with-trailing-icon {
+    &.mdc-list-item {
+      // This is the same in RTL, but we need the specificity.
+      &, [dir='rtl'] & {
+        padding-left: 0;
+        padding-right: 0;
+      }
+    }
+
+    .mdc-list-item__end {
+      margin-left: 16px;
+      margin-right: 16px;
+    }
+  }
+
+  .mdc-list-item--with-trailing-meta {
+    &.mdc-list-item {
+      padding-left: 16px;
+      padding-right: 0;
+
+      [dir='rtl'] & {
+        padding-left: 0;
+        padding-right: 16px;
+      }
+    }
+
+    .mdc-list-item__end {
+      @include vendor-prefixes.user-select(none);
+      margin-left: 28px;
+      margin-right: 16px;
+
+      [dir='rtl'] & {
+        margin-left: 16px;
+        margin-right: 28px;
+      }
+    }
+
+    &.mdc-list-item--with-three-lines .mdc-list-item__end,
+    &.mdc-list-item--with-two-lines .mdc-list-item__end {
+      display: block;
+      line-height: normal;
+      align-self: flex-start;
+      margin-top: 0;
+
+      &::before {
+        display: inline-block;
+        width: 0;
+        height: 28px;
+        content: '';
+        vertical-align: 0;
+      }
+    }
+  }
+
+  .mdc-list-item--with-leading-radio,
+  .mdc-list-item--with-leading-checkbox {
+    .mdc-list-item__start {
+      margin-left: 8px;
+      margin-right: 24px;
+
+      [dir='rtl'] & {
+        margin-left: 24px;
+        margin-right: 8px;
+      }
+    }
+
+    &.mdc-list-item--with-two-lines {
+      .mdc-list-item__start {
+        align-self: flex-start;
+        margin-top: 8px;
+      }
+    }
+  }
+
+  .mdc-list-item--with-trailing-radio,
+  .mdc-list-item--with-trailing-checkbox {
+    &.mdc-list-item {
+      padding-left: 16px;
+      padding-right: 0;
+
+      [dir='rtl'] & {
+        padding-left: 0;
+        padding-right: 16px;
+      }
+    }
+
+    &.mdc-list-item--with-leading-icon,
+    &.mdc-list-item--with-leading-avatar {
+      padding-left: 0;
+
+      [dir='rtl'] & {
+        padding-right: 0;
+      }
+    }
+
+    .mdc-list-item__end {
+      margin-left: 24px;
+      margin-right: 8px;
+
+      [dir='rtl'] & {
+        margin-left: 8px;
+        margin-right: 24px;
+      }
+    }
+
+    &.mdc-list-item--with-three-lines .mdc-list-item__end {
+      align-self: flex-start;
+      margin-top: 8px;
+    }
+  }
+
+  .mdc-list-group__subheader {
+    margin: 0.75rem 16px;
+  }
+
+  .mdc-list-item--disabled {
+    .mdc-list-item__start,
+    .mdc-list-item__content,
+    .mdc-list-item__end {
+      opacity: 1;
+    }
+
+    .mdc-list-item__primary-text,
+    .mdc-list-item__secondary-text {
+      @include token-utils.use-tokens($tokens...) {
+        @include token-utils.create-token-slot(opacity, list-item-disabled-label-text-opacity);
+      }
+    }
+
+    &.mdc-list-item--with-leading-icon .mdc-list-item__start {
+      @include token-utils.use-tokens($tokens...) {
+        @include token-utils.create-token-slot(color, list-item-disabled-leading-icon-color);
+        @include token-utils.create-token-slot(opacity, list-item-disabled-leading-icon-opacity);
+      }
+    }
+
+    &.mdc-list-item--with-trailing-icon .mdc-list-item__end {
+      @include token-utils.use-tokens($tokens...) {
+        @include token-utils.create-token-slot(color, list-item-disabled-trailing-icon-color);
+        @include token-utils.create-token-slot(opacity, list-item-disabled-trailing-icon-opacity);
+      }
+    }
+  }
+
+  .mat-mdc-list-item.mat-mdc-list-item-both-leading-and-trailing {
+    &, [dir='rtl'] & {
+      padding-left: 0;
+      padding-right: 0;
+    }
+  }
+}

package/list/_list-item-hcm-indicator.scss

@@ -1,5 +1,4 @@
 @use '@angular/cdk';
-@use '@material/list/evolution-variables' as mdc-list-variables;
 
 // Renders a circle indicator when Windows Hich Constrast mode (HCM) is enabled. In some
 // situations, such as a selected option, the list item communicates the selected state by changing
@@ -12,7 +11,7 @@
       content: '';
       position: absolute;
       top: 50%;
-      right: mdc-list-variables.$side-padding;
+      right: 16px;
       transform: translateY(-50%);
       width: $size;
       height: 0;
@@ -23,7 +22,7 @@
     [dir='rtl'] {
       &::after {
         right: auto;
-        left: mdc-list-variables.$side-padding;
+        left: 16px;
       }
     }
   }