@angular/material 20.1.0-next.2 → 20.1.0

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

@@ -5,7 +5,7 @@
 @use 'sass:map';
 
 @mixin base($theme) {
-  $tokens: m2-progress-spinner.get-unthemable-tokens();
+  $tokens: map.get(m2-progress-spinner.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-progress-spinner.get-tokens($theme), base);
   }
@@ -17,7 +17,7 @@
 /// @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);
+  $tokens: map.get(m2-progress-spinner.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-progress-spinner.get-tokens($theme, $color-variant), color);
   }
@@ -26,19 +26,19 @@
 
   @if inspection.get-theme-version($theme) != 1 {
     .mat-accent {
-      $tokens: m2-progress-spinner.get-color-tokens($theme, secondary);
+      $tokens: m2-progress-spinner.private-get-color-palette-color-tokens($theme, secondary);
       @include token-utils.values($tokens);
     }
 
     .mat-warn {
-      $tokens: m2-progress-spinner.get-color-tokens($theme, error);
+      $tokens: m2-progress-spinner.private-get-color-palette-color-tokens($theme, error);
       @include token-utils.values($tokens);
     }
   }
 }
 
 @mixin typography($theme) {
-  $tokens: m2-progress-spinner.get-typography-tokens($theme);
+  $tokens: map.get(m2-progress-spinner.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-progress-spinner.get-tokens($theme), typography);
   }
@@ -47,7 +47,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-progress-spinner.get-density-tokens($theme);
+  $tokens: map.get(m2-progress-spinner.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-progress-spinner.get-tokens($theme), density);
   }

package/radio/_m2-radio.scss

@@ -1,26 +1,43 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @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.
-@function get-unthemable-tokens() {
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
+
   @return (
-    radio-disabled-selected-icon-opacity: 0.38,
-    radio-disabled-unselected-icon-opacity: 0.38,
-    // This is specified both here and in the density tokens, because it
-    // determines the size of the radio button itself and there are internal
-    // tests who don't configure the theme correctly.
-    radio-state-layer-size: 40px,
+    base: (
+      radio-disabled-selected-icon-opacity: 0.38,
+      radio-disabled-unselected-icon-opacity: 0.38,
+      // This is specified both here and in the density tokens, because it
+      // determines the size of the radio button itself and there are internal
+      // tests who don't configure the theme correctly.
+      radio-state-layer-size: 40px,
+    ),
+    color: private-get-color-palette-color-tokens($theme, secondary),
+    typography: (
+      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)
+    ),
+    density: (
+      radio-state-layer-size: map.get((
+        0: 40px,
+        -1: 36px,
+        -2: 32px,
+        -3: 28px,
+      ), $density-scale),
+      radio-touch-target-display: if($density-scale < -1, none, block)
+    ),
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant) {
-  $system: m2-utils.get-system($theme);
-  $is-dark: inspection.get-theme-type($theme) == dark;
+@function private-get-color-palette-color-tokens($theme, $color-variant) {
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, secondary, $color-variant);
   $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%);
@@ -42,31 +59,3 @@
     radio-unselected-pressed-icon-color: map.get($system, on-surface),
   );
 }
-
-// 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: 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)
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
-
-  @return (
-    // The diameter of the radio's ripple.
-    radio-state-layer-size: map.get((
-      0: 40px,
-      -1: 36px,
-      -2: 32px,
-      -3: 28px,
-    ), $scale),
-    radio-touch-target-display: if($scale < -1, none, block)
-  );
-}

package/radio/_m3-radio.scss

@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-radio.
@@ -41,7 +40,7 @@
       radio-label-text-tracking: map.get($system, body-medium-tracking),
       radio-label-text-weight: map.get($system, body-medium-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 
   // Temporary removal where color variants previously did not include the

package/radio/_radio-theme.scss

@@ -9,7 +9,7 @@
 /// for the mat-radio.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-  $tokens: m2-radio.get-unthemable-tokens();
+  $tokens: map.get(m2-radio.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-radio.get-tokens($theme), base);
   }
@@ -27,17 +27,17 @@
   } @else {
     .mat-mdc-radio-button {
       &.mat-primary {
-        $tokens: 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 {
-        $tokens: 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 {
-        $tokens: m2-radio.get-color-tokens($theme, error);
+        $tokens: m2-radio.private-get-color-palette-color-tokens($theme, error);
         @include token-utils.values($tokens);
       }
     }
@@ -45,7 +45,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-radio.get-typography-tokens($theme);
+  $tokens: map.get(m2-radio.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-radio.get-tokens($theme), typography);
   }
@@ -54,7 +54,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-radio.get-density-tokens($theme);
+  $tokens: map.get(m2-radio.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-radio.get-tokens($theme), density);
   }

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.2`;
+const fallbackMaterialVersionRange = `~20.1.0`;
 /**
  * Schematic factory entry-point for the `ng-add` schematic. The ng-add schematic will be
  * automatically executed if developers run `ng add @angular/material`.
@@ -34,7 +34,7 @@ function default_1(options) {
         // have the same version tag if possible.
         const ngCoreVersionTag = (0, package_config_1.getPackageVersionFromPackageJson)(host, '@angular/core');
         const materialVersionRange = (0, package_config_1.getPackageVersionFromPackageJson)(host, '@angular/material');
-        const angularDependencyVersion = ngCoreVersionTag || `^20.0.0-0 || ^20.1.0-0 || ^20.2.0-0 || ^20.3.0-0 || ^21.0.0-0`;
+        const angularDependencyVersion = ngCoreVersionTag || `^20.0.0 || ^21.0.0`;
         // The CLI inserts `@angular/material` into the `package.json` before this schematic runs.
         // This means that we do not need to insert Angular Material into `package.json` files again.
         // In some cases though, it could happen that this schematic runs outside of the CLI `ng add`

package/schematics/ng-generate/theme-color/schema.json

@@ -49,7 +49,7 @@
       "type": "boolean",
       "default": true,
       "description": "Whether to generate output file in scss or CSS",
-      "x-prompt": "Do you want to generated file to be a scss file? This is the recommended way of setting up theming in your application. If not, a CSS file will be generated with all the system variables defined. (Leave blank to generate a scss file)"
+      "x-prompt": "Do you want the generated file to be a scss file? This is the recommended way of setting up theming in your application. If not, a CSS file will be generated with all the system variables defined. (Leave blank to generate a scss file)"
     }
   }
 }

package/select/_m2-select.scss

@@ -1,20 +1,37 @@
 @use 'sass:map';
-@use '../core/theming/inspection';
 @use '../core/theming/theming';
 @use '../core/style/elevation';
 @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.
-@function get-unthemable-tokens() {
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -2);
+
   @return (
-    select-container-elevation-shadow: elevation.get-box-shadow(8),
+    base: (
+      select-container-elevation-shadow: elevation.get-box-shadow(8),
+    ),
+    color: private-get-color-palette-color-tokens($theme, primary),
+    typography: (
+      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)
+    ),
+    density: (
+      select-arrow-transform: map.get((
+        0: translateY(-8px),
+        -1: translateY(-8px),
+        -2: none,
+      ), $density-scale),
+    ),
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant) {
+@function private-get-color-palette-color-tokens($theme, $color-variant) {
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
   $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%);
@@ -30,28 +47,3 @@
     select-invalid-arrow-color: map.get($system, error),
   );
 }
-
-// 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: 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)
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
-
-  @return (
-    select-arrow-transform: map.get((
-      0: translateY(-8px),
-      -1: translateY(-8px),
-      -2: none,
-    ), $density-scale),
-  );
-}

package/select/_m3-select.scss

@@ -3,7 +3,6 @@
 @use '../core/style/elevation';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -40,7 +39,7 @@ $prefix: (mat, select);
       select-trigger-text-tracking: map.get($system, body-large-tracking),
       select-trigger-text-weight: map.get($system, body-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/select/_select-theme.scss

@@ -9,7 +9,7 @@
 /// for the mat-select.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-  $tokens: m2-select.get-unthemable-tokens();
+  $tokens: map.get(m2-select.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-select.get-tokens($theme), base);
   }
@@ -21,7 +21,7 @@
 /// @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);
+  $tokens: map.get(m2-select.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-select.get-tokens($theme, $color-variant), color);
   }
@@ -30,19 +30,19 @@
 
   @if inspection.get-theme-version($theme) != 1 {
     .mat-mdc-form-field.mat-accent {
-      $tokens: m2-select.get-color-tokens($theme, secondary);
+      $tokens: m2-select.private-get-color-palette-color-tokens($theme, secondary);
       @include token-utils.values($tokens);
     }
 
     .mat-mdc-form-field.mat-warn {
-      $tokens: m2-select.get-color-tokens($theme, error);
+      $tokens: m2-select.private-get-color-palette-color-tokens($theme, error);
       @include token-utils.values($tokens);
     }
   }
 }
 
 @mixin typography($theme) {
-  $tokens: m2-select.get-typography-tokens($theme);
+  $tokens: map.get(m2-select.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-select.get-tokens($theme), typography);
   }
@@ -51,7 +51,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-select.get-density-tokens($theme);
+  $tokens: map.get(m2-select.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-select.get-tokens($theme), density);
   }

package/sidenav/_m2-sidenav.scss

@@ -6,48 +6,38 @@
 @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.
-@function get-unthemable-tokens() {
-  @return (
-    // Currently zero, but it appears to be relevant for M3.
-    // See: https://m3.material.io/components/navigation-drawer/overview
-    sidenav-container-shape: 0,
-    sidenav-container-elevation-shadow: elevation.get-box-shadow(16),
-    sidenav-container-width: auto,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
-  $is-dark: inspection.get-theme-type($theme) ==  dark;
+  // TODO: Use system colors instead of checking theme type
+  $is-dark: false;
+  @if (meta.type-of($theme) == map and map.get($theme, color)) {
+    $is-dark: inspection.get-theme-type($theme) ==  dark;
+  }
   $scrim-opacity: 0.6;
   $scrim-color: m3-utils.color-with-opacity(map.get($system, surface), 60%);
   $fallback-scrim-color: if($is-dark, rgba(#fff, $scrim-opacity), rgba(#000, $scrim-opacity));
 
   @return (
-    sidenav-container-divider-color: map.get($system, outline),
-    sidenav-container-background-color: map.get($system, surface),
-    sidenav-container-text-color: map.get($system, on-surface),
-    sidenav-content-background-color: map.get($system, background),
-    sidenav-content-text-color: map.get($system, on-surface),
+    base: (
+      sidenav-container-shape: 0,
+      sidenav-container-elevation-shadow: elevation.get-box-shadow(16),
+      sidenav-container-width: auto,
+    ),
+    color: (
+      sidenav-container-divider-color: map.get($system, outline),
+      sidenav-container-background-color: map.get($system, surface),
+      sidenav-container-text-color: map.get($system, on-surface),
+      sidenav-content-background-color: map.get($system, background),
+      sidenav-content-text-color: map.get($system, on-surface),
 
-    // We use invert() here to have the darken the background color expected to be used.
-    // If the background is light, we use a dark backdrop. If the background is dark, we
-    // use a light backdrop. If the value isn't a color, Sass will throw an error so we
-    // fall back to something generic.
-    sidenav-scrim-color: if(meta.type-of($scrim-color) == color,
-      color.invert($scrim-color), $fallback-scrim-color),
+      // We use invert() here to have the darken the background color expected to be used.
+      // If the background is light, we use a dark backdrop. If the background is dark, we
+      // use a light backdrop. If the value isn't a color, Sass will throw an error so we
+      // fall back to something generic.
+      sidenav-scrim-color: if(meta.type-of($scrim-color) == color,
+        color.invert($scrim-color), $fallback-scrim-color),
+    ),
+    typography: (),
+    density: (),
   );
 }
-
-// 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 ();
-}

package/sidenav/_sidenav-theme.scss

@@ -5,7 +5,7 @@
 @use './m3-sidenav';
 
 @mixin base($theme) {
-  $tokens: m2-sidenav.get-unthemable-tokens();
+  $tokens: map.get(m2-sidenav.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sidenav.get-tokens($theme), base);
   }
@@ -14,7 +14,7 @@
 }
 
 @mixin color($theme) {
-  $tokens: m2-sidenav.get-color-tokens($theme);
+  $tokens: map.get(m2-sidenav.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sidenav.get-tokens($theme), color);
   }
@@ -23,7 +23,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-sidenav.get-typography-tokens($theme);
+  $tokens: map.get(m2-sidenav.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sidenav.get-tokens($theme), typography);
   }
@@ -32,7 +32,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-sidenav.get-density-tokens($theme);
+  $tokens: map.get(m2-sidenav.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sidenav.get-tokens($theme), density);
   }