@angular/material 20.1.0-next.0 → 20.1.0-next.2

package/icon/_icon-theme.scss

@@ -1,50 +1,47 @@
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use './m2-icon';
 @use './m3-icon';
 @use 'sass:map';
 
-@mixin _palette-colors($theme, $palette-name) {
-  $color: inspection.get-theme-color($theme, $palette-name, text);
-  $tokens: m2-icon.private-get-icon-color-tokens($color);
-  @include token-utils.create-token-values-mixed($tokens);
-}
-
-/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
-/// for the mat-icon.
-/// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-icon.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-icon.get-tokens($theme), base));
-  } @else {
+    $tokens: map.get(m3-icon.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-icon.
 /// @param {Map} $theme The theme to generate color styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-icon.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-icon.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-icon.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-icon.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-icon {
       &.mat-primary {
-        @include _palette-colors($theme, primary);
+        $color: inspection.get-theme-color($theme, primary, text);
+        $tokens: m2-icon.private-get-icon-color-tokens($color);
+        @include token-utils.values($tokens);
       }
 
       &.mat-accent {
-        @include _palette-colors($theme, accent);
+        $color: inspection.get-theme-color($theme, accent, text);
+        $tokens: m2-icon.private-get-icon-color-tokens($color);
+        @include token-utils.values($tokens);
       }
 
       &.mat-warn {
-        @include _palette-colors($theme, warn);
+        $color: inspection.get-theme-color($theme, warn, text);
+        $tokens: m2-icon.private-get-icon-color-tokens($color);
+        @include token-utils.values($tokens);
       }
     }
   }
@@ -53,19 +50,23 @@
 /// Outputs typography theme styles for the mat-icon.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-icon.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-icon.get-tokens($theme), typography));
-  } @else {
+    $tokens: map.get(m3-icon.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-icon.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-icon.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-icon.get-tokens($theme), density));
-  } @else {
+    $tokens: map.get(m3-icon.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -88,23 +89,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-icon') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
-      @include color($theme, $color-variant);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme, $color-variant);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/input/_input-theme.scss

@@ -1,4 +1,3 @@
-@use '../core/theming/theming';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 
@@ -33,7 +32,5 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-input') {
-    // No-op
-  }
+  // No-op
 }

package/input/index.d.ts

@@ -179,17 +179,6 @@ declare class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy
     /** Whether the form control is a native select that is displayed inline. */
     _isInlineSelect(): boolean;
     private _iOSKeyupListener;
-    private _webkitBlinkWheelListener;
-    /**
-     * In blink and webkit browsers a focused number input does not increment or decrement its value
-     * on mouse wheel interaction unless a wheel event listener is attached to it or one of its
-     * ancestors or a passive wheel listener is attached somewhere in the DOM. For example: Hitting
-     * a tooltip once enables the mouse wheel input for all number inputs as long as it exists. In
-     * order to get reliable and intuitive behavior we apply a wheel event on our own thus making
-     * sure increment and decrement by mouse wheel works every time.
-     * @docs-private
-     */
-    private _ensureWheelDefaultBehavior;
     /** Gets the value to set on the `readonly` attribute. */
     protected _getReadonlyAttribute(): string | null;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatInput, never>;

package/list/_list-theme.scss

@@ -1,66 +1,67 @@
 @use 'sass:map';
 
 @use '../checkbox/m2-checkbox';
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use '../radio/m2-radio';
 @use './m2-list';
 @use './m3-list';
+@use '../core/tokens/m2-utils';
 
 @mixin base($theme) {
-  // Add default values for tokens not related to color, typography, or density.
+  $tokens: m2-list.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-list.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-list.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: m2-list.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-list.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-list.get-tokens($theme), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mdc-list-item__start,
     .mdc-list-item__end {
-      @include token-utils.create-token-values-mixed(m2-radio.get-color-tokens($theme, primary));
+      $tokens: m2-radio.get-color-tokens($theme, primary);
+      @include token-utils.values($tokens);
     }
 
     .mat-accent {
       .mdc-list-item__start,
       .mdc-list-item__end {
-        @include token-utils.create-token-values-mixed(
-            m2-radio.get-color-tokens($theme, secondary));
+        $tokens: m2-radio.get-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
       }
     }
 
     .mat-warn {
       .mdc-list-item__start,
       .mdc-list-item__end {
-        @include token-utils.create-token-values-mixed(
-            m2-radio.get-color-tokens($theme, error));
+        $tokens: m2-radio.get-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
 
     .mat-mdc-list-option {
-      @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, primary));
+      $tokens: m2-checkbox.get-color-tokens($theme, primary);
+      @include token-utils.values($tokens);
     }
+
     .mat-mdc-list-option.mat-accent {
-      @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, secondary));
+      $tokens: m2-checkbox.get-color-tokens($theme, secondary);
+      @include token-utils.values($tokens);
     }
+
     .mat-mdc-list-option.mat-warn {
-      @include token-utils.create-token-values-mixed(
-          m2-checkbox.get-color-tokens($theme, error));
+      $tokens: m2-checkbox.get-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
 
     // There is no token for activated color on nav list.
@@ -89,19 +90,20 @@
 }
 
 @mixin density($theme) {
+  $tokens: m2-list.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), density));
-  } @else {
-    $density-scale: inspection.get-theme-density($theme);
+    $tokens: map.get(m3-list.get-tokens($theme), density);
+  }
 
-    @include sass-utils.current-selector-or-root() {
-      // TODO: See if this can be removed
-      @include token-utils.create-token-values-mixed(m2-list.get-density-tokens($theme));
-    }
+  @include token-utils.values($tokens);
+
+  @if inspection.get-theme-version($theme) != 1 {
+    $density-scale: inspection.get-theme-density($theme);
 
     .mdc-list-item__start,
     .mdc-list-item__end {
-      @include token-utils.create-token-values-mixed(m2-radio.get-density-tokens($theme));
+      $tokens: m2-radio.get-density-tokens($theme);
+      @include token-utils.values($tokens);
     }
 
     // TODO(mmalerba): This is added to maintain the same style MDC used prior to the token-based
@@ -144,18 +146,20 @@
 }
 
 @mixin typography($theme) {
+  $tokens: m2-list.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-list.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-list.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-list.get-tokens($theme), typography);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     // MDC does not have tokens for the subheader.
     // TODO(mmalerba): Discuss with MDC about adding them, or create custom tokens.
     .mdc-list-group__subheader {
-      font: inspection.get-theme-typography($theme, subtitle-1, font);
-      letter-spacing: inspection.get-theme-typography($theme, subtitle-1, letter-spacing);
+      $system: m2-utils.get-system($theme);
+      font: map.get($system, label-large);
+      letter-spacing: map.get($system, label-large-tracking);
     }
   }
 }
@@ -175,23 +179,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-list') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
       @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }

package/list/_m2-list.scss

@@ -28,25 +28,21 @@
 @function get-color-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
-  $is-dark: inspection.get-theme-type($theme) == dark;
-  $text-icon-on-background:
-      inspection.get-theme-color($theme, foreground, base, if($is-dark, 0.5, 0.38));
-
   @return (
     list-list-item-label-text-color: map.get($system, on-surface),
     list-list-item-supporting-text-color: map.get($system, on-surface-variant),
-    list-list-item-leading-icon-color: $text-icon-on-background,
+    list-list-item-leading-icon-color: map.get($system, on-surface-variant),
     list-list-item-trailing-supporting-text-color: map.get($system, on-surface-variant),
-    list-list-item-trailing-icon-color: $text-icon-on-background,
-    list-list-item-selected-trailing-icon-color: $text-icon-on-background,
+    list-list-item-trailing-icon-color: map.get($system, on-surface-variant),
+    list-list-item-selected-trailing-icon-color: map.get($system, on-surface-variant),
     list-list-item-disabled-label-text-color: map.get($system, on-surface),
     list-list-item-disabled-leading-icon-color: map.get($system, on-surface),
     list-list-item-disabled-trailing-icon-color: map.get($system, on-surface),
     list-list-item-hover-label-text-color: map.get($system, on-surface),
-    list-list-item-hover-leading-icon-color: $text-icon-on-background,
+    list-list-item-hover-leading-icon-color: map.get($system, on-surface-variant),
     list-list-item-hover-state-layer-color: map.get($system, on-surface),
     list-list-item-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    list-list-item-hover-trailing-icon-color: $text-icon-on-background,
+    list-list-item-hover-trailing-icon-color: map.get($system, on-surface-variant),
     list-list-item-focus-label-text-color: map.get($system, on-surface),
     list-list-item-focus-state-layer-color: map.get($system, on-surface),
     list-list-item-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
@@ -55,33 +51,23 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    list-list-item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    list-list-item-label-text-line-height:
-        inspection.get-theme-typography($theme, body-1, line-height),
-    list-list-item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    list-list-item-label-text-tracking:
-        inspection.get-theme-typography($theme, body-1, letter-spacing),
-    list-list-item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
-    list-list-item-supporting-text-font:
-        inspection.get-theme-typography($theme, body-2, font-family),
-    list-list-item-supporting-text-line-height:inspection.get-theme-typography(
-        $theme, body-2, line-height),
-    list-list-item-supporting-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    list-list-item-supporting-text-tracking: inspection.get-theme-typography(
-        $theme, body-2, letter-spacing),
-    list-list-item-supporting-text-weight:
-        inspection.get-theme-typography($theme, body-2, font-weight),
-    list-list-item-trailing-supporting-text-font: inspection.get-theme-typography(
-        $theme, caption, font-family),
-    list-list-item-trailing-supporting-text-line-height: inspection.get-theme-typography(
-        $theme, caption, line-height),
-    list-list-item-trailing-supporting-text-size: inspection.get-theme-typography(
-        $theme, caption, font-size),
-    list-list-item-trailing-supporting-text-tracking: inspection.get-theme-typography(
-        $theme, caption, letter-spacing),
-    list-list-item-trailing-supporting-text-weight: inspection.get-theme-typography(
-        $theme, caption, font-weight),
+    list-list-item-label-text-font: map.get($system, body-large-font),
+    list-list-item-label-text-line-height: map.get($system, body-large-line-height),
+    list-list-item-label-text-size: map.get($system, body-large-size),
+    list-list-item-label-text-tracking: map.get($system, body-large-tracking),
+    list-list-item-label-text-weight: map.get($system, body-large-weight),
+    list-list-item-supporting-text-font: map.get($system, body-medium-font),
+    list-list-item-supporting-text-line-height: map.get($system, body-medium-line-height),
+    list-list-item-supporting-text-size: map.get($system, body-medium-size),
+    list-list-item-supporting-text-tracking: map.get($system, body-medium-tracking),
+    list-list-item-supporting-text-weight: map.get($system, body-medium-weight),
+    list-list-item-trailing-supporting-text-font: map.get($system, body-small-font),
+    list-list-item-trailing-supporting-text-line-height: map.get($system, body-small-line-height),
+    list-list-item-trailing-supporting-text-size: map.get($system, body-small-size),
+    list-list-item-trailing-supporting-text-tracking: map.get($system, body-small-tracking),
+    list-list-item-trailing-supporting-text-weight: map.get($system, body-small-weight),
   );
 }
 

package/menu/_m2-menu.scss

@@ -1,5 +1,7 @@
-@use '../core/theming/inspection';
 @use '../core/style/elevation';
+@use 'sass:map';
+@use '../core/tokens/m2-utils';
+@use '../core/tokens/m3-utils';
 
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
@@ -23,28 +25,29 @@
 
 // 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;
-  $active-state-layer-color: inspection.get-theme-color($theme, foreground, base,
-    if($is-dark, 0.08, 0.04));
+  $system: m2-utils.get-system($theme);
 
   @return (
-    menu-item-label-text-color: inspection.get-theme-color($theme, system, on-surface),
-    menu-item-icon-color: inspection.get-theme-color($theme, system, on-surface),
-    menu-item-hover-state-layer-color: $active-state-layer-color,
-    menu-item-focus-state-layer-color: $active-state-layer-color,
-    menu-container-color: inspection.get-theme-color($theme, system, surface),
-    menu-divider-color: inspection.get-theme-color($theme, system, outline),
+    menu-item-label-text-color: map.get($system, on-surface),
+    menu-item-icon-color: map.get($system, on-surface),
+    menu-item-hover-state-layer-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
+    menu-item-focus-state-layer-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
+    menu-container-color: map.get($system, surface),
+    menu-divider-color: map.get($system, outline),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    menu-item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    menu-item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    menu-item-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    menu-item-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    menu-item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+    menu-item-label-text-font: map.get($system, body-large-font),
+    menu-item-label-text-size: map.get($system, body-large-size),
+    menu-item-label-text-tracking: map.get($system, body-large-tracking),
+    menu-item-label-text-line-height: map.get($system, body-large-line-height),
+    menu-item-label-text-weight: map.get($system, body-large-weight),
   );
 }
 

package/menu/_menu-theme.scss

@@ -1,47 +1,44 @@
 @use 'sass:map';
 @use './m2-menu';
 @use './m3-menu';
-@use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 
 @mixin base($theme) {
+  $tokens: m2-menu.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-menu.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-menu.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-menu.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: m2-menu.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-menu.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-menu.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-menu.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: m2-menu.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-menu.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-menu.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-menu.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: m2-menu.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-menu.get-tokens($theme), density));
-  } @else {
+    $tokens: map.get(m3-menu.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -59,23 +56,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-menu') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @include density($theme);
+    @include typography($theme);
+  } @else {
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
       @include color($theme);
+    }
+    @if inspection.theme-has($theme, density) {
       @include density($theme);
+    }
+    @if inspection.theme-has($theme, typography) {
       @include typography($theme);
-    } @else {
-      @include base($theme);
-      @if inspection.theme-has($theme, color) {
-        @include color($theme);
-      }
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
-      @if inspection.theme-has($theme, typography) {
-        @include typography($theme);
-      }
     }
   }
 }