@angular/material 20.1.0-next.1 → 20.1.0-rc.0

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

@@ -1,42 +1,44 @@
 @use 'sass:map';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use './m2-grid-list';
 @use './m3-grid-list';
-@use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-grid-list.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-grid-list.get-tokens($theme), base));
-  } @else {
+    $tokens: map.get(m3-grid-list.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
-// Include this empty mixin for consistency with the other components.
 @mixin color($theme) {
+  $tokens: map.get(m2-grid-list.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-grid-list.get-tokens($theme), color));
-  } @else {
+    $tokens: map.get(m3-grid-list.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-grid-list.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-grid-list.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-grid-list.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-grid-list.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-grid-list.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-grid-list.get-tokens($theme), density));
-  } @else {
+    $tokens: map.get(m3-grid-list.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -54,23 +56,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-grid-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/grid-list/_m2-grid-list.scss

@@ -1,34 +1,21 @@
-@use '../core/theming/inspection';
+@use '../core/tokens/m2-utils';
+@use 'sass:map';
 
-// 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 ();
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  @return ();
-}
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
 
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
   @return (
-    // TODO(crisbeto): other components have tokens for all typography dimensions.
-    // Here we only set the font size to maintain the same appearance as the pre-tokens
-    // theming API. Consider adding more tokens for letter spacing, font weight etc.
-    grid-list-tile-header-primary-text-size:
-        inspection.get-theme-typography($theme, body-2, font-size),
-    grid-list-tile-header-secondary-text-size:
-        inspection.get-theme-typography($theme, caption, font-size),
-    grid-list-tile-footer-primary-text-size:
-        inspection.get-theme-typography($theme, body-2, font-size),
-    grid-list-tile-footer-secondary-text-size:
-        inspection.get-theme-typography($theme, caption, font-size),
+    base: (),
+    color: (),
+    typography: (
+      // TODO(crisbeto): other components have tokens for all typography dimensions.
+      // Here we only set the font size to maintain the same appearance as the pre-tokens
+      // theming API. Consider adding more tokens for letter spacing, font weight etc.
+      grid-list-tile-header-primary-text-size: map.get($system, body-medium-size),
+      grid-list-tile-header-secondary-text-size: map.get($system, body-small-size),
+      grid-list-tile-footer-primary-text-size: map.get($system, body-medium-size),
+      grid-list-tile-footer-secondary-text-size: map.get($system, body-small-size),
+    ),
+    density: (),
   );
 }
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

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: map.get(m2-icon.get-tokens($theme), base);
   @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: map.get(m2-icon.get-tokens($theme), color);
   @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: map.get(m2-icon.get-tokens($theme), typography);
   @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: map.get(m2-icon.get-tokens($theme), density);
   @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/icon/_m2-icon.scss

@@ -1,24 +1,10 @@
-
-// 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 ();
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  // Default the icon to `inherit` so it matches the text around it.
-  @return private-get-icon-color-tokens(inherit);
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
+@function get-tokens($theme) {
+  @return (
+    base: (),
+    color: private-get-icon-color-tokens(inherit),
+    typography: (),
+    density: (),
+  );
 }
 
 // Mixin used to set a specific color on an icon.

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,68 @@
 @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';
+@use '../core/theming/theming';
 
 @mixin base($theme) {
-  // Add default values for tokens not related to color, typography, or density.
+  $tokens: map.get(m2-list.get-tokens($theme), base);
   @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: map.get(m2-list.get-tokens($theme), color);
   @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.private-get-color-palette-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.private-get-color-palette-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.private-get-color-palette-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.private-get-color-palette-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.private-get-color-palette-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.private-get-color-palette-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
 
     // There is no token for activated color on nav list.
@@ -89,19 +91,21 @@
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-list.get-tokens($theme), density);
   @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 {
+    $system: m2-utils.get-system($theme);
+    $density-scale: theming.clamp-density(map.get($system, density-scale), -5);
 
     .mdc-list-item__start,
     .mdc-list-item__end {
-      @include token-utils.create-token-values-mixed(m2-radio.get-density-tokens($theme));
+      $tokens: map.get(m2-radio.get-tokens($theme), density);
+      @include token-utils.values($tokens);
     }
 
     // TODO(mmalerba): This is added to maintain the same style MDC used prior to the token-based
@@ -144,18 +148,20 @@
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-list.get-tokens($theme), typography);
   @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 +181,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);
-      }
     }
   }
 }