@angular/material 18.1.0-rc.0 → 18.2.0-next.0

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;
       }
     }
   }

package/list/_list-theme.scss

@@ -1,6 +1,4 @@
 @use 'sass:map';
-@use '@material/list/evolution-mixins';
-@use '@material/list/list-theme' as mdc-list-theme;
 
 @use '../core/style/sass-utils';
 @use '../core/theming/theming';
@@ -20,7 +18,8 @@
   }
   @else {
     @include sass-utils.current-selector-or-root() {
-      @include mdc-list-theme.theme(tokens-mdc-list.get-unthemable-tokens());
+      @include token-utils.create-token-values(
+        tokens-mdc-list.$prefix, tokens-mdc-list.get-unthemable-tokens());
       @include token-utils.create-token-values(
         tokens-mat-list.$prefix, tokens-mat-list.get-unthemable-tokens());
     }
@@ -32,11 +31,9 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
   }
   @else {
-    $mdc-list-color-tokens: tokens-mdc-list.get-color-tokens($theme);
-
-    // Add values for MDC list tokens.
     @include sass-utils.current-selector-or-root() {
-      @include mdc-list-theme.theme($mdc-list-color-tokens);
+      @include token-utils.create-token-values(
+        tokens-mdc-list.$prefix, tokens-mdc-list.get-color-tokens($theme));
       @include token-utils.create-token-values(
         tokens-mat-list.$prefix, tokens-mat-list.get-color-tokens($theme));
     }
@@ -79,8 +76,13 @@
     // There is no token for activated color on nav list.
     // TODO(mmalerba): Add a token to MDC or make a custom one.
     .mat-mdc-list-base.mat-mdc-list-base {
-      @include evolution-mixins.list-selected-ink-color(
-          inspection.get-theme-color($theme, primary));
+      .mdc-list-item--selected,
+      .mdc-list-item--activated {
+        .mdc-list-item__primary-text,
+        .mdc-list-item__start {
+          color: inspection.get-theme-color($theme, primary);
+        }
+      }
     }
 
     // TODO(mmalerba): Leaking styles from the old MDC list mixins used in other components can
@@ -102,11 +104,10 @@
   }
   @else {
     $density-scale: inspection.get-theme-density($theme);
-    $mdc-list-density-tokens: tokens-mdc-list.get-density-tokens($theme);
 
-    // Add values for MDC list tokens.
     @include sass-utils.current-selector-or-root() {
-      @include mdc-list-theme.theme($mdc-list-density-tokens);
+      @include token-utils.create-token-values(
+        tokens-mdc-list.$prefix, tokens-mdc-list.get-density-tokens($theme));
       @include token-utils.create-token-values(
         tokens-mat-list.$prefix, tokens-mat-list.get-density-tokens($theme));
     }
@@ -155,11 +156,9 @@
     @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
   }
   @else {
-    $mdc-list-typography-tokens: tokens-mdc-list.get-typography-tokens($theme);
-
-    // Add values for MDC list tokens.
     @include sass-utils.current-selector-or-root() {
-      @include mdc-list-theme.theme($mdc-list-typography-tokens);
+      @include token-utils.create-token-values(
+        tokens-mdc-list.$prefix, tokens-mdc-list.get-typography-tokens($theme));
       @include token-utils.create-token-values(
         tokens-mat-list.$prefix, tokens-mat-list.get-typography-tokens($theme));
     }
@@ -204,8 +203,8 @@
 @mixin _theme-from-tokens($tokens) {
   @include validation.selector-defined(
       'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector');
-  @include mdc-list-theme.theme(token-utils.get-tokens-for($tokens, tokens-mdc-list.$prefix));
-
+  $mdc-list-tokens: token-utils.get-tokens-for($tokens, tokens-mdc-list.$prefix);
   $mat-list-tokens: token-utils.get-tokens-for($tokens, tokens-mat-list.$prefix);
+  @include token-utils.create-token-values(tokens-mdc-list.$prefix, $mdc-list-tokens);
   @include token-utils.create-token-values(tokens-mat-list.$prefix, $mat-list-tokens);
 }

package/list/index.d.ts

@@ -156,6 +156,7 @@ export declare class MatListItem extends MatListItemBase {
      * Otherwise, return `null`. This method is safe to use with server-side rendering.
      */
     _getAriaCurrent(): string | null;
+    protected _hasBothLeadingAndTrailing(): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatListItem, [null, null, { optional: true; }, null, { optional: true; }, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatListItem, "mat-list-item, a[mat-list-item], button[mat-list-item]", ["matListItem"], { "activated": { "alias": "activated"; "required": false; }; }, {}, ["_lines", "_titles", "_meta"], ["[matListItemAvatar],[matListItemIcon]", "[matListItemTitle]", "[matListItemLine]", "*", "[matListItemMeta]", "mat-divider"], true, never>;
 }
@@ -415,6 +416,7 @@ export declare class MatListOption extends MatListItemBase implements ListOption
     _toggleOnInteraction(): void;
     /** Sets the tabindex of the list option. */
     _setTabindex(value: number): void;
+    protected _hasBothLeadingAndTrailing(): boolean;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatListOption, [null, null, null, null, null, { optional: true; }, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MatListOption, "mat-list-option", ["matListOption"], { "togglePosition": { "alias": "togglePosition"; "required": false; }; "checkboxPosition": { "alias": "checkboxPosition"; "required": false; }; "color": { "alias": "color"; "required": false; }; "value": { "alias": "value"; "required": false; }; "selected": { "alias": "selected"; "required": false; }; }, { "selectedChange": "selectedChange"; }, ["_lines", "_titles"], ["[matListItemAvatar],[matListItemIcon]", "[matListItemTitle]", "[matListItemLine]", "*", "mat-divider"], true, never>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/material",
-  "version": "18.1.0-rc.0",
+  "version": "18.2.0-next.0",
   "description": "Angular Material",
   "repository": {
     "type": "git",
@@ -490,7 +490,7 @@
   },
   "peerDependencies": {
     "@angular/animations": "^18.0.0-0 || ^18.1.0-0 || ^18.2.0-0 || ^18.3.0-0 || ^19.0.0-0",
-    "@angular/cdk": "18.1.0-rc.0",
+    "@angular/cdk": "18.2.0-next.0",
     "@angular/core": "^18.0.0-0 || ^18.1.0-0 || ^18.2.0-0 || ^18.3.0-0 || ^19.0.0-0",
     "@angular/common": "^18.0.0-0 || ^18.1.0-0 || ^18.2.0-0 || ^18.3.0-0 || ^19.0.0-0",
     "@angular/forms": "^18.0.0-0 || ^18.1.0-0 || ^18.2.0-0 || ^18.3.0-0 || ^19.0.0-0",