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

package/progress-spinner/_progress-spinner-theme.scss

@@ -1,57 +1,58 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use './m2-progress-spinner';
 @use './m3-progress-spinner';
 @use 'sass:map';
 
-/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
-/// for the mat-progress-spinner.
-/// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-progress-spinner.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-progress-spinner.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-progress-spinner.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-progress-spinner.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-progress-spinner.
 /// @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-progress-spinner.get-color-tokens($theme, primary);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-progress-spinner.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-progress-spinner.get-color-tokens($theme, primary));
+    $tokens: map.get(m3-progress-spinner.get-tokens($theme, $color-variant), color);
+  }
 
-      .mat-accent {
-        @include token-utils.create-token-values-mixed(
-            m2-progress-spinner.get-color-tokens($theme, secondary));
-      }
+  @include token-utils.values($tokens);
 
-      .mat-warn {
-        @include token-utils.create-token-values-mixed(
-            m2-progress-spinner.get-color-tokens($theme, error));
-      }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-accent {
+      $tokens: m2-progress-spinner.get-color-tokens($theme, secondary);
+      @include token-utils.values($tokens);
+    }
+
+    .mat-warn {
+      $tokens: m2-progress-spinner.get-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-progress-spinner.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-progress-spinner.get-typography-tokens($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    $tokens: map.get(m3-progress-spinner.get-tokens($theme), typography);
+  }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-progress-spinner.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-progress-spinner.get-density-tokens($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    $tokens: map.get(m3-progress-spinner.get-tokens($theme), density);
+  }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -74,23 +75,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-progress-spinner') {
-    @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/radio/_m2-radio.scss

@@ -45,12 +45,13 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    radio-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    radio-label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
-    radio-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    radio-label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
-    radio-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
+    radio-label-text-font: map.get($system, body-medium-font),
+    radio-label-text-line-height: map.get($system, body-medium-line-height),
+    radio-label-text-size: map.get($system, body-medium-size),
+    radio-label-text-tracking: map.get($system, body-medium-tracking),
+    radio-label-text-weight: map.get($system, body-medium-weight)
   );
 }
 

package/radio/_radio-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
@@ -11,13 +9,12 @@
 /// for the mat-radio.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-radio.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-radio.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-radio.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-radio.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-radio.
@@ -25,52 +22,44 @@
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin color($theme, $color-variant: null) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-radio.get-tokens($theme, $color-variant), color));
+    $tokens: map.get(m3-radio.get-tokens($theme, $color-variant), color);
+    @include token-utils.values($tokens);
   } @else {
     .mat-mdc-radio-button {
       &.mat-primary {
-        @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 {
-        @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 {
-        @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);
       }
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-radio.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-radio.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-radio.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-radio.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-radio.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs typography theme styles for the mat-radio.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-radio.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-radio.get-tokens($theme), density));
-  } @else {
-    $density-scale: inspection.get-theme-density($theme);
-
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-radio.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-radio.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -93,23 +82,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-radio') {
-    @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/schematics/ng-add/index.js

@@ -19,7 +19,7 @@ const package_config_1 = require("./package-config");
  * Note that the fallback version range does not use caret, but tilde because that is
  * the default for Angular framework dependencies in CLI projects.
  */
-const fallbackMaterialVersionRange = `~20.1.0-next.1`;
+const fallbackMaterialVersionRange = `~20.1.0-next.2`;
 /**
  * Schematic factory entry-point for the `ng-add` schematic. The ng-add schematic will be
  * automatically executed if developers run `ng add @angular/material`.

package/select/_m2-select.scss

@@ -33,12 +33,13 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    select-trigger-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    select-trigger-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    select-trigger-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    select-trigger-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    select-trigger-text-weight: inspection.get-theme-typography($theme, body-1, font-weight)
+    select-trigger-text-font: map.get($system, body-large-font),
+    select-trigger-text-line-height: map.get($system, body-large-line-height),
+    select-trigger-text-size: map.get($system, body-large-size),
+    select-trigger-text-tracking: map.get($system, body-large-tracking),
+    select-trigger-text-weight: map.get($system, body-large-weight)
   );
 }
 

package/select/_select-theme.scss

@@ -1,6 +1,4 @@
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-select';
@@ -11,63 +9,54 @@
 /// for the mat-select.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-select.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      $mat-tokens: m2-select.get-unthemable-tokens();
-      @include token-utils.create-token-values-mixed($mat-tokens);
-    }
+    $tokens: map.get(m3-select.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-select.
 /// @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-select.get-color-tokens($theme, primary);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-select.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-          m2-select.get-color-tokens($theme, primary));
+    $tokens: map.get(m3-select.get-tokens($theme, $color-variant), color);
+  }
 
-      .mat-mdc-form-field.mat-accent {
-        @include token-utils.create-token-values-mixed(
-            m2-select.get-color-tokens($theme, secondary));
-      }
+  @include token-utils.values($tokens);
 
-      .mat-mdc-form-field.mat-warn {
-        @include token-utils.create-token-values-mixed(
-            m2-select.get-color-tokens($theme, error));
-      }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-mdc-form-field.mat-accent {
+      $tokens: m2-select.get-color-tokens($theme, secondary);
+      @include token-utils.values($tokens);
+    }
+
+    .mat-mdc-form-field.mat-warn {
+      $tokens: m2-select.get-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-select.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-select.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-select.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-select.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs typography theme styles for the mat-select.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-select.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-select.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-select.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -90,23 +79,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-select') {
-    @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/sidenav/_sidenav-theme.scss

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