@angular/material 20.0.0-rc.1 → 20.0.0-rc.2

package/menu/_m3-menu.scss

@@ -1,45 +1,42 @@
 @use 'sass:map';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/style/elevation';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, menu);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-menu.
-/// @param {Map} $systems The MDC system tokens
-/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
-/// @param {Map} $token-slots Possible token slots
-/// @return {Map} A set of custom tokens for the mat-menu
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: sass-utils.merge-all(
-    m3-utils.generate-typography-tokens($systems, item-label-text, label-large),
-    (
-      container-shape: map.get($systems, md-sys-shape, corner-extra-small),
-      divider-color: map.get($systems, md-sys-color, surface-variant),
-      divider-bottom-spacing: m3-utils.hardcode(8px, $exclude-hardcoded),
-      divider-top-spacing: m3-utils.hardcode(8px, $exclude-hardcoded),
-      item-label-text-color: map.get($systems, md-sys-color, on-surface),
-      item-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-      item-icon-size: m3-utils.hardcode(24px, $exclude-hardcoded),
-      item-hover-state-layer-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface),
-        $alpha: map.get($systems, md-sys-state, hover-state-layer-opacity)
-      ),
-      item-focus-state-layer-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface),
-        $alpha: map.get($systems, md-sys-state, focus-state-layer-opacity)
-      ),
-      item-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
-      item-leading-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
-      item-trailing-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
-      item-with-icon-leading-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
-      item-with-icon-trailing-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
-      container-color: map.get($systems, md-sys-color, surface-container),
-      container-elevation-shadow: m3-utils.hardcode(
-        elevation.get-box-shadow(2), $exclude-hardcoded),
-    )
-  );
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
 
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+  @return (
+    base: (
+      menu-divider-bottom-spacing: 8px,
+      menu-divider-top-spacing: 8px,
+      menu-item-icon-size: 24px,
+      menu-item-spacing: 12px,
+      menu-item-leading-spacing: 12px,
+      menu-item-trailing-spacing: 12px,
+      menu-item-with-icon-leading-spacing: 12px,
+      menu-item-with-icon-trailing-spacing: 12px,
+    ),
+    color: (
+      menu-container-shape: map.get($system, corner-extra-small),
+      menu-divider-color: map.get($system, surface-variant),
+      menu-item-label-text-color: map.get($system, on-surface),
+      menu-item-icon-color: map.get($system, on-surface-variant),
+      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-container),
+      menu-container-elevation-shadow: elevation.get-box-shadow(2),
+    ),
+    typography: (
+      menu-item-label-text-font: map.get($system, label-large-font),
+      menu-item-label-text-line-height: map.get($system, label-large-line-height),
+      menu-item-label-text-size: map.get($system, label-large-size),
+      menu-item-label-text-tracking: map.get($system, label-large-tracking),
+      menu-item-label-text-weight: map.get($system, label-large-weight),
+    ),
+    density: (),
+  );
 }

package/menu/_menu-theme.scss

@@ -1,48 +1,45 @@
 @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/theming/validation';
 @use '../core/typography/typography';
 
 @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-menu.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-menu.$prefix, m2-menu.get-unthemable-tokens());
+      @include token-utils.create-token-values-mixed(m2-menu.get-unthemable-tokens());
     }
   }
 }
 
 @mixin color($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+    @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.$prefix, m2-menu.get-color-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-menu.get-color-tokens($theme));
     }
   }
 }
 
 @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-menu.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-menu.$prefix, m2-menu.get-typography-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-menu.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
+    @include token-utils.create-token-values(map.get(m3-menu.get-tokens($theme), density));
   } @else {
   }
 }
@@ -51,20 +48,23 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-menu.$prefix,
-      tokens: m2-menu.get-token-slots(),
+      namespace: menu,
+      tokens: token-utils.get-overrides(m3-menu.get-tokens(), menu)
     ),
   );
 }
 
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-menu') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -79,15 +79,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  @if ($tokens != ()) {
-    @include token-utils.create-token-values(
-      m2-menu.$prefix,
-      map.get($tokens, m2-menu.$prefix)
-    );
-  }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/material",
-  "version": "20.0.0-rc.1",
+  "version": "20.0.0-rc.2",
   "description": "Angular Material",
   "repository": {
     "type": "git",
@@ -353,7 +353,7 @@
     }
   },
   "peerDependencies": {
-    "@angular/cdk": "20.0.0-rc.1",
+    "@angular/cdk": "20.0.0-rc.2",
     "@angular/core": "^20.0.0-0 || ^20.1.0-0 || ^20.2.0-0 || ^20.3.0-0 || ^21.0.0-0",
     "@angular/common": "^20.0.0-0 || ^20.1.0-0 || ^20.2.0-0 || ^20.3.0-0 || ^21.0.0-0",
     "@angular/forms": "^20.0.0-0 || ^20.1.0-0 || ^20.2.0-0 || ^20.3.0-0 || ^21.0.0-0",

package/paginator/_m2-paginator.scss

@@ -5,9 +5,6 @@
 @use '../core/theming/inspection';
 @use '../core/style/sass-utils';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, paginator);
-
 // 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() {
@@ -19,22 +16,24 @@ $prefix: (mat, paginator);
   $foreground-base: inspection.get-theme-color($theme, foreground, base);
 
   @return (
-    container-text-color: sass-utils.safe-color-change($foreground-base, $alpha: 0.87),
-    container-background-color: inspection.get-theme-color($theme, background, card),
-    enabled-icon-color: sass-utils.safe-color-change($foreground-base, $alpha: 0.54),
-    disabled-icon-color: sass-utils.safe-color-change($foreground-base, $alpha: 0.12),
+    paginator-container-text-color: sass-utils.safe-color-change($foreground-base, $alpha: 0.87),
+    paginator-container-background-color: inspection.get-theme-color($theme, background, card),
+    paginator-enabled-icon-color: sass-utils.safe-color-change($foreground-base, $alpha: 0.54),
+    paginator-disabled-icon-color: sass-utils.safe-color-change($foreground-base, $alpha: 0.12),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    container-text-font: inspection.get-theme-typography($theme, caption, font-family),
-    container-text-line-height: inspection.get-theme-typography($theme, caption, line-height),
-    container-text-size: inspection.get-theme-typography($theme, caption, font-size),
-    container-text-tracking: inspection.get-theme-typography($theme, caption, letter-spacing),
-    container-text-weight: inspection.get-theme-typography($theme, caption, font-weight),
-    select-trigger-text-size: inspection.get-theme-typography($theme, caption, font-size),
+    paginator-container-text-font: inspection.get-theme-typography($theme, caption, font-family),
+    paginator-container-text-line-height:
+        inspection.get-theme-typography($theme, caption, line-height),
+    paginator-container-text-size: inspection.get-theme-typography($theme, caption, font-size),
+    paginator-container-text-tracking:
+        inspection.get-theme-typography($theme, caption, letter-spacing),
+    paginator-container-text-weight: inspection.get-theme-typography($theme, caption, font-weight),
+    paginator-select-trigger-text-size: inspection.get-theme-typography($theme, caption, font-size),
   );
 }
 
@@ -69,10 +68,10 @@ $prefix: (mat, paginator);
   $form-field-vertical-padding: 16px - $form-field-vertical-deduction;
 
   @return (
-    container-size: map.get($size-scale, $density-scale),
-    form-field-container-height: $form-field-height,
-    form-field-container-vertical-padding: $form-field-vertical-padding,
-    touch-target-display: if($density-scale < -2, none, block),
+    paginator-container-size: map.get($size-scale, $density-scale),
+    paginator-form-field-container-height: $form-field-height,
+    paginator-form-field-container-vertical-padding: $form-field-vertical-padding,
+    paginator-touch-target-display: if($density-scale < -2, none, block),
   );
 }
 

package/paginator/_m3-paginator.scss

@@ -1,43 +1,44 @@
 @use 'sass:map';
 @use 'sass:list';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, paginator);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-paginator.
-/// @param {Map} $systems The MDC system tokens
-/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
-/// @param {Map} $token-slots Possible token slots
-/// @return {Map} A set of custom tokens for the mat-paginator
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: sass-utils.merge-all(
-    m3-utils.generate-typography-tokens($systems, container-text, body-small),
-    (
-      container-text-color: map.get($systems, md-sys-color, on-surface),
-      container-background-color: map.get($systems, md-sys-color, surface),
-      enabled-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-      disabled-icon-color: sass-utils.safe-color-change(
-          map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-      select-trigger-text-size: map.get($systems, md-sys-typescale, body-small-size),
-    )
-  );
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
 
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+  @return (
+    base: (),
+    color: (
+      paginator-container-text-color: map.get($system, on-surface),
+      paginator-container-background-color: map.get($system, surface),
+      paginator-disabled-icon-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      paginator-enabled-icon-color: map.get($system, on-surface-variant),
+    ),
+    typography: (
+      paginator-container-text-font: map.get($system, body-small-font),
+      paginator-container-text-line-height: map.get($system, body-small-line-height),
+      paginator-container-text-size: map.get($system, body-small-size),
+      paginator-container-text-tracking: map.get($system, body-small-tracking),
+      paginator-container-text-weight: map.get($system, body-small-weight),
+      paginator-select-trigger-text-size: map.get($system, body-small-size),
+    ),
+    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+  );
 }
 
 // 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), -5);
+@function get-density-tokens($scale) {
+  $scale: theming.clamp-density($scale, -5);
   $index: ($scale * -1) + 1;
 
   @return (
-    container-size: list.nth((56px, 52px, 48px, 40px, 40px, 40px), $index),
-    form-field-container-height: list.nth((40px, 40px, 40px, 40px, 40px, 36px), $index),
-    form-field-container-vertical-padding: list.nth((8px, 8px, 8px, 8px, 8px, 6px), $index),
-    touch-target-display: list.nth((block, block, none, none, none, none), $index),
+    paginator-container-size: list.nth((56px, 52px, 48px, 40px, 40px, 40px), $index),
+    paginator-form-field-container-height: list.nth((40px, 40px, 40px, 40px, 40px, 36px), $index),
+    paginator-form-field-container-vertical-padding:
+        list.nth((8px, 8px, 8px, 8px, 8px, 6px), $index),
+    paginator-touch-target-display: list.nth((block, block, none, none, none, none), $index),
   );
 }

package/paginator/_paginator-theme.scss

@@ -1,59 +1,45 @@
 @use 'sass:map';
-@use 'sass:meta';
 @use './m2-paginator';
 @use './m3-paginator';
 @use '../core/style/sass-utils';
 @use '../core/typography/typography';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 
 @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-paginator.get-tokens($theme), base));
   } @else {
   }
 }
 
 @mixin color($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+    @include token-utils.create-token-values(map.get(m3-paginator.get-tokens($theme), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-paginator.$prefix, m2-paginator.get-color-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-paginator.get-color-tokens($theme));
     }
   }
 }
 
 @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-paginator.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-paginator.$prefix, m2-paginator.get-typography-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-paginator.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
-  $density-scale: inspection.get-theme-density($theme);
-  $form-field-density: if(
-    (meta.type-of($density-scale) == 'number' and $density-scale >= -4) or
-      ($density-scale == maximum),
-    -4,
-    $density-scale
-  );
-
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        m3-paginator.$prefix, m3-paginator.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-paginator.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-paginator.$prefix, m2-paginator.get-density-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-paginator.get-density-tokens($theme));
     }
   }
 }
@@ -62,23 +48,23 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-paginator.$prefix,
-      tokens: m2-paginator.get-token-slots(),
+      namespace: paginator,
+      tokens: token-utils.get-overrides(m3-paginator.get-tokens(), paginator)
     ),
   );
 }
 
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-paginator') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -93,15 +79,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  @if ($tokens != ()) {
-    @include token-utils.create-token-values(
-      m2-paginator.$prefix,
-      map.get($tokens, m2-paginator.$prefix)
-    );
-  }
-}