@angular/material 20.0.0-rc.1 → 20.0.0

package/radio/_radio-theme.scss

@@ -1,55 +1,44 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-radio';
 @use './m3-radio';
+@use 'sass:map';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-radio.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+    @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.$prefix, m2-radio.get-unthemable-tokens());
+      @include token-utils.create-token-values-mixed(m2-radio.get-unthemable-tokens());
     }
   }
 }
 
 /// Outputs color theme styles for the mat-radio.
 /// @param {Map} $theme The theme to generate color styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the radio button: primary, secondary, tertiary,
-///     or error (If not specified, default primary color will be used).
-@mixin color($theme, $options...) {
+/// @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 _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
+    @include token-utils.create-token-values(
+        map.get(m3-radio.get-tokens($theme, $color-variant), color));
   } @else {
     .mat-mdc-radio-button {
       &.mat-primary {
-        @include token-utils.create-token-values-mixed(
-          m2-radio.$prefix,
-          m2-radio.get-color-tokens($theme, primary)
-        );
+        @include token-utils.create-token-values-mixed(m2-radio.get-color-tokens($theme, primary));
       }
 
       &.mat-accent {
-        @include token-utils.create-token-values-mixed(
-          m2-radio.$prefix,
-          m2-radio.get-color-tokens($theme)
-        );
+        @include token-utils.create-token-values-mixed(m2-radio.get-color-tokens($theme));
       }
 
       &.mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-radio.$prefix,
-          m2-radio.get-color-tokens($theme, warn)
-        );
+        @include token-utils.create-token-values-mixed(m2-radio.get-color-tokens($theme, warn));
       }
     }
   }
@@ -59,13 +48,10 @@
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+    @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.$prefix,
-        m2-radio.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-radio.get-typography-tokens($theme));
     }
   }
 }
@@ -74,15 +60,12 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(m3-radio.$prefix, m3-radio.get-density-tokens($theme));
+    @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.$prefix,
-        m2-radio.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-radio.get-density-tokens($theme));
     }
   }
 }
@@ -91,8 +74,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-radio.$prefix,
-      tokens: m2-radio.get-token-slots(),
+      namespace: radio,
+      tokens: token-utils.get-overrides(m3-radio.get-tokens(), radio)
     ),
   );
 }
@@ -100,21 +83,19 @@
 /// Outputs the CSS variable values for the given tokens.
 /// @param {Map} $tokens The token values to emit.
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 /// Outputs all (base, color, typography, and density) theme styles for the mat-radio.
 /// @param {Map} $theme The theme to generate styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the radio button: primary, secondary, tertiary,
-///     or error (If not specified, default primary color will be used).
-@mixin theme($theme, $options...) {
+/// @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 _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
+      @include base($theme);
+      @include color($theme, $color-variant);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -129,11 +110,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens, $options...) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  $mat-radio-tokens: token-utils.get-tokens-for($tokens, m2-radio.$prefix, $options...);
-  @include token-utils.create-token-values(m2-radio.$prefix, $mat-radio-tokens);
-}

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.0.0-rc.1`;
+const fallbackMaterialVersionRange = `~20.0.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-update/index_bundled.js

@@ -6187,10 +6187,12 @@ var require_scss_tokenize = __commonJS({
             currentToken = [controlChar, controlChar, pos];
             break;
           }
+          // SCSS PATCH {
           case COMMA: {
             currentToken = ["word", ",", pos, pos + 1];
             break;
           }
+          // } SCSS PATCH
           case OPEN_PARENTHESES: {
             prev = buffer.length ? buffer.pop()[1] : "";
             n = css.charCodeAt(pos + 1);