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

package/core/_core-theme.scss

@@ -14,7 +14,7 @@
 @use 'sass:map';
 
 @mixin base($theme) {
-  $tokens: m2-app.get-unthemable-tokens();
+  $tokens: map.get(m2-app.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-app.get-tokens($theme), base);
   }
@@ -28,7 +28,7 @@
 }
 
 @mixin color($theme) {
-  $tokens: m2-app.get-color-tokens($theme);
+  $tokens: map.get(m2-app.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-app.get-tokens($theme), color);
   }
@@ -42,7 +42,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-app.get-typography-tokens($theme);
+  $tokens: map.get(m2-app.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-app.get-tokens($theme), typography);
   }
@@ -56,7 +56,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-app.get-density-tokens($theme);
+  $tokens: map.get(m2-app.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-app.get-tokens($theme), density);
   }

package/core/_m2-app.scss

@@ -2,35 +2,23 @@
 @use './style/elevation';
 @use '../core/tokens/m2-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 ();
-}
-
-// 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);
 
-  $tokens: (
+  $color-tokens: (
     app-background-color: map.get($system, background),
-    app-text-color: map.get($system, on-surface),
+    app-text-color: map.get($system, on-surface)
   );
-
   @for $zValue from 0 through 24 {
-    $shadow: elevation.get-box-shadow($zValue, map.get($system, shadow));
-    $tokens: map.set($tokens, 'app-elevation-shadow-level-#{$zValue}', $shadow);
+    $color-tokens: map.set($color-tokens, 'app-elevation-shadow-level-#{$zValue}',
+        elevation.get-box-shadow($zValue, map.get($system, shadow)));
   }
 
-  @return $tokens;
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return ();
+  @return (
+    base: (),
+    color: $color-tokens,
+    typography: (),
+    density: (),
+  );
 }
 
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/core/m2/_theming.scss

@@ -114,7 +114,7 @@
   @return $theme;
 }
 
-@function _define-system($primary, $accent, $warn, $is-dark, $typography) {
+@function _define-system($primary, $accent, $warn, $is-dark, $typography, $density-scale) {
   $palettes: (
     primary: $primary,
     accent: $accent,
@@ -128,7 +128,7 @@
   $sys-state: m2.md-sys-state-values();
   $sys-typography: m2.md-sys-typescale-values($typography);
 
-  $system: ();
+  $system: (density-scale: $density-scale);
   @each $map in ($sys-color, $sys-state, $sys-typography) {
     $system: map.merge($system, $map);
   }
@@ -188,7 +188,9 @@
         $accent: $accent,
         $warn: $warn,
         $is-dark: $is-dark,
-        $typography: ());
+        $typography: (),
+        $density-scale: 0
+    );
     $theme: map.set($theme, _mat-system, $system);
     @return $theme;
   }
@@ -216,7 +218,9 @@
       $accent: map.get($result, accent) or map.get($result, color, accent) or (),
       $warn: map.get($result, warn) or map.get($result, color, warn) or (),
       $is-dark: $is-dark,
-      $typography: map.get($result, typography) or ());
+      $typography: map.get($result, typography) or (),
+      $density-scale: map.get($result, density),
+  );
   $theme: map.set($theme, _mat-system, $system);
   @return $theme;
 }

package/core/option/_m2-optgroup.scss

@@ -1,33 +1,21 @@
 @use '../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) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
-  @return (
-    optgroup-label-text-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 (
-    optgroup-label-text-font: map.get($system, body-large-font),
-    optgroup-label-text-line-height: map.get($system, body-large-line-height),
-    optgroup-label-text-size: map.get($system, body-large-size),
-    optgroup-label-text-tracking: map.get($system, body-large-tracking),
-    optgroup-label-text-weight: map.get($system, body-large-weight)
+    base: (),
+    color: (
+      optgroup-label-text-color: map.get($system, on-surface),
+    ),
+    typography: (
+      optgroup-label-text-font: map.get($system, body-large-font),
+      optgroup-label-text-line-height: map.get($system, body-large-line-height),
+      optgroup-label-text-size: map.get($system, body-large-size),
+      optgroup-label-text-tracking: map.get($system, body-large-tracking),
+      optgroup-label-text-weight: map.get($system, body-large-weight)
+    ),
+    density: (),
   );
 }
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/core/option/_m2-option.scss

@@ -1,17 +1,26 @@
-@use '../theming/inspection';
 @use 'sass:map';
 @use '../tokens/m2-utils';
 @use '../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 ();
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+
+  @return (
+    base: (),
+    color: private-get-color-palette-color-tokens($theme, primary),
+    typography: (
+      option-label-text-font: map.get($system, body-large-font),
+      option-label-text-line-height: map.get($system, body-large-line-height),
+      option-label-text-size: map.get($system, body-large-size),
+      option-label-text-tracking: map.get($system, body-large-tracking),
+      option-label-text-weight: map.get($system, body-large-weight)
+    ),
+    density: (),
+  );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant) {
-  $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, primary, $color-variant);
 
@@ -27,19 +36,3 @@
   );
 }
 
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-  @return (
-    option-label-text-font: map.get($system, body-large-font),
-    option-label-text-line-height: map.get($system, body-large-line-height),
-    option-label-text-size: map.get($system, body-large-size),
-    option-label-text-tracking: map.get($system, body-large-tracking),
-    option-label-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) {
-  @return ();
-}

package/core/option/_optgroup-theme.scss

@@ -6,7 +6,7 @@
 @use '../typography/typography';
 
 @mixin base($theme) {
-  $tokens: m2-optgroup.get-unthemable-tokens();
+  $tokens: map.get(m2-optgroup.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-optgroup.get-tokens($theme), base);
   }
@@ -15,7 +15,7 @@
 }
 
 @mixin color($theme) {
-  $tokens: m2-optgroup.get-color-tokens($theme);
+  $tokens: map.get(m2-optgroup.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-optgroup.get-tokens($theme), color);
   }
@@ -24,7 +24,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-optgroup.get-typography-tokens($theme);
+  $tokens: map.get(m2-optgroup.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-optgroup.get-tokens($theme), typography);
   }
@@ -33,7 +33,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-optgroup.get-density-tokens($theme);
+  $tokens: map.get(m2-optgroup.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-optgroup.get-tokens($theme), density);
   }

package/core/option/_option-theme.scss

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

package/core/ripple/_m2-ripple.scss

@@ -2,28 +2,16 @@
 @use '../tokens/m2-utils';
 @use '../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 ();
-}
-
-// 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);
 
   @return (
-    ripple-color: m3-utils.color-with-opacity(
-        map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    base: (),
+    color: (
+      ripple-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface), map.get($system, pressed-state-layer-opacity)),
+    ),
+    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/core/ripple/_ripple-theme.scss

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

package/core/selection/pseudo-checkbox/_m2-pseudo-checkbox.scss

@@ -1,18 +1,18 @@
-@use '../../theming/inspection';
 @use 'sass:map';
 @use '../../tokens/m2-utils';
 @use '../../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 ();
+@function get-tokens($theme) {
+  @return (
+    base: (),
+    color: private-get-color-palette-color-tokens($theme, secondary),
+    typography: (),
+    density: (),
+  );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant) {
-  $is-dark: inspection.get-theme-type($theme) == dark;
-  $disabled-color: if($is-dark, #686868, #b0b0b0);
+@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);
 
@@ -21,19 +21,12 @@
     pseudo-checkbox-full-selected-checkmark-color: map.get($system, background),
     pseudo-checkbox-full-unselected-icon-color: map.get($system, on-surface-variant),
     pseudo-checkbox-full-disabled-selected-checkmark-color: map.get($system, background),
-    pseudo-checkbox-full-disabled-unselected-icon-color: $disabled-color,
-    pseudo-checkbox-full-disabled-selected-icon-color: $disabled-color,
+    pseudo-checkbox-full-disabled-unselected-icon-color:
+        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+    pseudo-checkbox-full-disabled-selected-icon-color:
+        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
     pseudo-checkbox-minimal-selected-checkmark-color: map.get($system, secondary),
-    pseudo-checkbox-minimal-disabled-selected-checkmark-color: if($is-dark, #686868, #b0b0b0),
+    pseudo-checkbox-minimal-disabled-selected-checkmark-color:
+        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
   );
 }
-
-// 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/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss

@@ -5,12 +5,12 @@
 @use 'sass:map';
 
 @mixin _palette-styles($theme, $palette-name) {
-  $tokens: m2-pseudo-checkbox.get-color-tokens($theme, $palette-name);
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), color);
   @include token-utils.values($tokens);
 }
 
 @mixin base($theme) {
-  $tokens: m2-pseudo-checkbox.get-unthemable-tokens();
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme), base);
   }
@@ -28,7 +28,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-pseudo-checkbox.get-color-tokens($theme, secondary);
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme, $color-variant), color);
   }
@@ -42,24 +42,24 @@
     // in order to allow for the color to be overwritten if the checkbox is inside a parent that
     // has `mat-accent` and is placed inside another parent that has `mat-primary`.
     .mat-primary {
-      $tokens: m2-pseudo-checkbox.get-color-tokens($theme, primary);
+      $tokens: m2-pseudo-checkbox.private-get-color-palette-color-tokens($theme, primary);
       @include token-utils.values($tokens);
     }
 
     .mat-accent {
-      $tokens: m2-pseudo-checkbox.get-color-tokens($theme, secondary);
+      $tokens: m2-pseudo-checkbox.private-get-color-palette-color-tokens($theme, secondary);
       @include token-utils.values($tokens);
     }
 
     .mat-warn {
-      $tokens: m2-pseudo-checkbox.get-color-tokens($theme, error);
+      $tokens: m2-pseudo-checkbox.private-get-color-palette-color-tokens($theme, error);
       @include token-utils.values($tokens);
     }
   }
 }
 
 @mixin typography($theme) {
-  $tokens: m2-pseudo-checkbox.get-typography-tokens($theme);
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme), typography);
   }
@@ -68,7 +68,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-pseudo-checkbox.get-density-tokens($theme);
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme), density);
   }

package/core/theming/_definition.scss

@@ -90,7 +90,9 @@ $theme-version: 1;
     ),
     m3-tokens.get-sys-typeface($typography, $typography-system-variables-prefix),
   );
-  $system: ();
+  $system: (
+    density-scale: $density-scale,
+  );
   @each $sys-map in $system-maps {
     $system: map.merge($system, $sys-map);
   }

package/core/tokens/_m2-utils.scss

@@ -1,16 +1,24 @@
 @use 'sass:map';
+@use 'sass:meta';
 @use './m2';
 
 // Gets the theme's system values as a flat map.
 @function get-system($theme) {
-  $system: map.get($theme, _mat-system);
-  @if $system {
-    @return $system;
+  @if meta.type-of($theme) == map {
+    $system: map.get($theme, _mat-system);
+    @if $system {
+      @return $system;
+    }
+
+    // If the $theme is a typography-config, convert it to a system map.
+    @if map.has-key($theme, body-1) {
+      @return m2.md-sys-typescale-values($theme);
+    }
   }
 
-  // If the $theme is a typography-config, convert it to a system map.
-  @if map.has-key($theme, body-1) {
-    @return m2.md-sys-typescale-values($theme);
+  // If the $theme is a density scale, convert it to a system map.
+  @if meta.type-of($theme) == 'number' or $theme == minimum or $theme == maximum {
+    @return (density-scale: $theme);
   }
 
   @return ();

package/core/tokens/m3/_theme.scss

@@ -28,7 +28,7 @@ $_sys-maps: (
   ),
 );
 
-$_system: ();
+$_system: (density-scale: 0);
 @each $sys-map in $_sys-maps {
   $_system: map.merge($_system, _create-system-app-vars-map($sys-map));
 }

package/datepicker/_datepicker-theme.scss

@@ -11,7 +11,7 @@
 /// for the mat-datepicker.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-  $tokens: m2-datepicker.get-unthemable-tokens();
+  $tokens: map.get(m2-datepicker.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-datepicker.get-tokens($theme), base);
   }
@@ -23,7 +23,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-datepicker.get-color-tokens($theme, primary);
+  $tokens: map.get(m2-datepicker.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-datepicker.get-tokens($theme, $color-variant), color);
   }
@@ -33,12 +33,12 @@
   @if inspection.get-theme-version($theme) != 1 {
     .mat-datepicker-content, .mat-datepicker-toggle-active {
       &.mat-accent {
-        $tokens: m2-datepicker.get-color-tokens($theme, secondary);
+        $tokens: m2-datepicker.private-get-color-palette-color-tokens($theme, secondary);
         @include token-utils.values($tokens);
       }
 
       &.mat-warn {
-        $tokens: m2-datepicker.get-color-tokens($theme, error);
+        $tokens: m2-datepicker.private-get-color-palette-color-tokens($theme, error);
         @include token-utils.values($tokens);
       }
     }
@@ -48,7 +48,7 @@
 /// Outputs typography theme styles for the mat-datepicker.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
-  $tokens: m2-datepicker.get-typography-tokens($theme);
+  $tokens: map.get(m2-datepicker.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-datepicker.get-tokens($theme), typography);
   }
@@ -73,7 +73,7 @@
 /// Outputs density theme styles for the mat-datepicker.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
-  $tokens: m2-datepicker.get-density-tokens($theme);
+  $tokens: map.get(m2-datepicker.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-datepicker.get-tokens($theme), density);
   }