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

package/core/m2/_theming.scss

@@ -3,6 +3,7 @@
 @use 'sass:meta';
 @use 'sass:color';
 @use '../theming/theming';
+@use '../tokens/m2';
 @use './palette';
 
 /// Extracts a color from a palette or throws an error if it doesn't exist.
@@ -113,45 +114,26 @@
   @return $theme;
 }
 
-@function _define-system($primary, $accent, $warn, $is-dark) {
-  $system: (
-    primary: map.get($primary, default),
-    on-primary: map.get($primary, default-contrast),
-    secondary: map.get($accent, default),
-    on-secondary: map.get($accent, default-contrast),
-    error: map.get($warn, default),
-    on-error: map.get($warn, default-contrast),
-    shadow: black,
-    hover-state-layer-opacity: 0.04,
-    focus-state-layer-opacity: 0.12,
-    pressed-state-layer-opacity: 0.12,
+@function _define-system($primary, $accent, $warn, $is-dark, $typography, $density-scale) {
+  $palettes: (
+    primary: $primary,
+    accent: $accent,
+    warn: $warn,
   );
 
-  @if $is-dark {
-    @return map.merge($system, (
-      surface: map.get(palette.$grey-palette, 800),
-      surface-variant: #4a4a4a,
-      on-surface: white,
-      on-surface-variant: rgba(white, 0.7),
-      background: #303030,
-      inverse-surface: white,
-      inverse-on-surface: rgba(black, 0.87),
-      outline: rgba(white, 0.12),
-      outline-variant: rgba(white, 0.38),
-    ));
-  } @else {
-    @return map.merge($system, (
-      surface: white,
-      surface-variant: #f6f6f6,
-      on-surface: rgba(black, 0.87),
-      on-surface-variant: rgba(black, 0.54),
-      background: map.get(palette.$grey-palette, 50),
-      inverse-surface: map.get(palette.$grey-palette, 800),
-      inverse-on-surface: white,
-      outline: rgba(black, 0.12),
-      outline-variant: rgba(black, 0.38),
-    ));
+  $sys-color: if(
+      $is-dark,
+      m2.md-sys-color-values-dark($palettes),
+      m2.md-sys-color-values-light($palettes));
+  $sys-state: m2.md-sys-state-values();
+  $sys-typography: m2.md-sys-typescale-values($typography);
+
+  $system: (density-scale: $density-scale);
+  @each $map in ($sys-color, $sys-state, $sys-typography) {
+    $system: map.merge($system, $map);
   }
+
+  @return $system;
 }
 
 // Creates a color configuration from the specified
@@ -201,7 +183,15 @@
     );
 
     $theme: _internalize-theme(theming.private-create-backwards-compatibility-theme($theme));
-    $theme: map.set($theme, _mat-system, _define-system($primary, $accent, $warn, $is-dark));
+    $system: _define-system(
+        $primary: $primary,
+        $accent: $accent,
+        $warn: $warn,
+        $is-dark: $is-dark,
+        $typography: (),
+        $density-scale: 0
+    );
+    $theme: map.set($theme, _mat-system, $system);
     @return $theme;
   }
   // If the map pattern is used (1), we just pass-through the configurations for individual
@@ -223,10 +213,15 @@
   $theme: _internalize-theme(
       theming.private-create-backwards-compatibility-theme(_mat-validate-theme($result))
   );
-  $primary: map.get($result, primary) or map.get($result, color, primary) or ();
-  $accent: map.get($result, accent) or map.get($result, color, accent) or ();
-  $warn: map.get($result, warn) or map.get($result, color, warn) or ();
-  $theme: map.set($theme, _mat-system, _define-system($primary, $accent, $warn, $is-dark));
+  $system: _define-system(
+      $primary: map.get($result, primary) or map.get($result, color, primary) or (),
+      $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 (),
+      $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 '../theming/inspection';
 @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) {
   @return (
-    optgroup-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    optgroup-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    optgroup-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    optgroup-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    optgroup-label-text-weight: inspection.get-theme-typography($theme, body-1, font-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,18 +36,3 @@
   );
 }
 
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    option-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    option-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    option-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    option-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    option-label-text-weight: inspection.get-theme-typography($theme, body-1, font-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

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

package/core/option/_option-theme.scss

@@ -1,8 +1,6 @@
 @use './m2-option';
 @use './m3-option';
 @use '../tokens/token-utils';
-@use '../style/sass-utils';
-@use '../theming/theming';
 @use '../theming/inspection';
 @use '../typography/typography';
 @use 'sass:map';
@@ -11,30 +9,34 @@
 /// for the mat-option.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-option.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), base));
-  } @else {
+    $tokens: map.get(m3-option.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-option.
 /// @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: map.get(m2-option.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-option.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-option.get-color-tokens($theme, primary));
-    }
+    $tokens: map.get(m3-option.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-accent {
-      @include token-utils.create-token-values-mixed(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 {
-      @include token-utils.create-token-values-mixed(m2-option.get-color-tokens($theme, error));
+      $tokens: m2-option.private-get-color-palette-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
   }
 }
@@ -42,22 +44,23 @@
 /// Outputs typography theme styles for the mat-option.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: map.get(m2-option.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-option.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-option.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-option.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-option.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), density));
-  } @else {
+    $tokens: map.get(m3-option.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -80,23 +83,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-option') {
-    @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/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

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

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 ();
-}