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

package/checkbox/_m2-checkbox.scss

@@ -2,29 +2,45 @@
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 
-// 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($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
   @return (
-    checkbox-disabled-selected-checkmark-color: map.get($system, surface),
-    checkbox-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    checkbox-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    checkbox-selected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    checkbox-unselected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    checkbox-unselected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    checkbox-unselected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+    base: (
+      checkbox-disabled-selected-checkmark-color: map.get($system, surface),
+      checkbox-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      checkbox-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      checkbox-selected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+      checkbox-unselected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      checkbox-unselected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      checkbox-unselected-pressed-state-layer-opacity:
+          map.get($system, pressed-state-layer-opacity),
+    ),
+    color: private-get-color-palette-color-tokens($theme, secondary),
+    typography: (
+      checkbox-label-text-font: map.get($system, body-medium-font),
+      checkbox-label-text-line-height: map.get($system, body-medium-line-height),
+      checkbox-label-text-size: map.get($system, body-medium-size),
+      checkbox-label-text-tracking: map.get($system, body-medium-tracking),
+      checkbox-label-text-weight: map.get($system, body-medium-weight)
+    ),
+    density: (
+      checkbox-touch-target-display: if($density-scale < -1, none, block),
+      checkbox-state-layer-size: map.get((
+        0: 40px,
+        -1: 36px,
+        -2: 32px,
+        -3: 28px,
+      ), $density-scale)
+    ),
   );
 }
 
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant, $exclude: ()) {
+@function private-get-color-palette-color-tokens($theme, $color-variant, $exclude: ()) {
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, secondary, $color-variant);
-  $is-dark: inspection.get-theme-type($theme) == dark;
   $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%);
 
   $tokens: (
@@ -54,29 +70,3 @@
 
   @return $tokens;
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    checkbox-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    checkbox-label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
-    checkbox-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    checkbox-label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
-    checkbox-label-text-weight: inspection.get-theme-typography($theme, body-2, font-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 (
-    checkbox-touch-target-display: if($scale < -1, none, block),
-    checkbox-state-layer-size: map.get((
-      0: 40px,
-      -1: 36px,
-      -2: 32px,
-      -3: 28px,
-    ), $scale)
-  );
-}

package/checkbox/_m3-checkbox.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 mat-checkbox.
@@ -52,7 +51,7 @@
       checkbox-label-text-tracking: map.get($system, body-medium-tracking),
       checkbox-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)),
   );
 }
 

package/chips/_chips-theme.scss

@@ -2,7 +2,6 @@
 @use './m2-chip';
 @use './m3-chip';
 @use '../core/tokens/token-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use 'sass:map';
@@ -12,10 +11,10 @@
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), base));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), base));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-unthemable-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), base));
     }
   }
 }
@@ -25,27 +24,27 @@
 /// @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 token-utils.create-token-values(
+    @include token-utils.values(
         map.get(m3-chip.get-tokens($theme, $color-variant), color));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-color-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), color));
 
       &.mat-mdc-chip-selected,
       &.mat-mdc-chip-highlighted {
         &.mat-primary {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, primary));
+          @include token-utils.values(
+              m2-chip.private-get-color-palette-color-tokens($theme, primary));
         }
 
         &.mat-accent {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, secondary));
+          @include token-utils.values(
+              m2-chip.private-get-color-palette-color-tokens($theme, secondary));
         }
 
         &.mat-warn {
-          @include token-utils.create-token-values-mixed(
-              m2-chip.get-color-tokens($theme, error));
+          @include token-utils.values(
+              m2-chip.private-get-color-palette-color-tokens($theme, error));
         }
       }
     }
@@ -56,10 +55,10 @@
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), typography));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), typography));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-typography-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), typography));
     }
   }
 }
@@ -68,10 +67,10 @@
 /// @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(map.get(m3-chip.get-tokens($theme), density));
+    @include token-utils.values(map.get(m3-chip.get-tokens($theme), density));
   } @else {
     .mat-mdc-chip.mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(m2-chip.get-density-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), density));
     }
   }
 }
@@ -96,23 +95,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-chips') {
-    @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/chips/_m2-chip.scss

@@ -1,41 +1,55 @@
 @use 'sass:map';
-@use '../core/theming/inspection';
 @use '../core/theming/theming';
 @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($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -2);
 
   @return (
-    chip-container-shape-radius: 16px,
-    chip-disabled-container-opacity: 0.4,
-    chip-disabled-outline-color: transparent,
-    chip-flat-selected-outline-width: 0,
-    chip-focus-outline-color: transparent,
-    chip-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    chip-outline-color: transparent,
-    chip-outline-width: 0,
-    chip-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    chip-selected-trailing-action-state-layer-color: transparent,
-    chip-trailing-action-focus-opacity: 1,
-    chip-trailing-action-focus-state-layer-opacity: 0,
-    chip-trailing-action-hover-state-layer-opacity: 0,
-    chip-trailing-action-opacity: 0.54,
-    chip-trailing-action-state-layer-color: transparent,
-    chip-with-avatar-avatar-shape-radius: 14px,
-    chip-with-avatar-avatar-size: 28px,
-    chip-with-avatar-disabled-avatar-opacity: 1,
-    chip-with-icon-disabled-icon-opacity: 1,
-    chip-with-icon-icon-size: 18px,
-    chip-with-trailing-icon-disabled-trailing-icon-opacity: 1,
+    base: (
+      chip-container-shape-radius: 16px,
+      chip-disabled-container-opacity: 0.4,
+      chip-disabled-outline-color: transparent,
+      chip-flat-selected-outline-width: 0,
+      chip-focus-outline-color: transparent,
+      chip-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      chip-outline-color: transparent,
+      chip-outline-width: 0,
+      chip-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      chip-selected-trailing-action-state-layer-color: transparent,
+      chip-trailing-action-focus-opacity: 1,
+      chip-trailing-action-focus-state-layer-opacity: 0,
+      chip-trailing-action-hover-state-layer-opacity: 0,
+      chip-trailing-action-opacity: 0.54,
+      chip-trailing-action-state-layer-color: transparent,
+      chip-with-avatar-avatar-shape-radius: 14px,
+      chip-with-avatar-avatar-size: 28px,
+      chip-with-avatar-disabled-avatar-opacity: 1,
+      chip-with-icon-disabled-icon-opacity: 1,
+      chip-with-icon-icon-size: 18px,
+      chip-with-trailing-icon-disabled-trailing-icon-opacity: 1,
+    ),
+    color: private-get-color-palette-color-tokens($theme, null),
+    typography: (
+      chip-label-text-font: map.get($system, body-medium-font),
+      chip-label-text-line-height: map.get($system, body-medium-line-height),
+      chip-label-text-size: map.get($system, body-medium-size),
+      chip-label-text-tracking: map.get($system, body-medium-tracking),
+      chip-label-text-weight: map.get($system, body-medium-weight)
+    ),
+    density: (
+      chip-container-height: map.get((
+        0: 32px,
+        -1: 28px,
+        -2: 24px), $density-scale)
+    ),
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant: null) {
+@function private-get-color-palette-color-tokens($theme, $color-variant: null) {
   $system: m2-utils.get-system($theme);
   $background: m3-utils.color-with-opacity(map.get($system, on-surface), 12%);
   $foreground: map.get($system, on-surface);
@@ -69,30 +83,3 @@
     chip-with-trailing-icon-trailing-icon-color: $foreground,
   );
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    chip-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    chip-label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
-    chip-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    chip-label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
-    chip-label-text-weight: inspection.get-theme-typography($theme, body-2, font-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), -2);
-  @return (
-    // The height of the chip.
-    chip-container-height: map.get(
-        (
-          0: 32px,
-          -1: 28px,
-          -2: 24px,
-        ),
-        $scale
-    )
-  );
-}

package/chips/_m3-chip.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-chip.
@@ -67,7 +66,7 @@
       chip-label-text-tracking: map.get($system, label-large-tracking),
       chip-label-text-weight: map.get($system, label-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/core/_core-theme.scss

@@ -1,10 +1,8 @@
-@use './theming/theming';
 @use './theming/inspection';
 @use './ripple/ripple-theme';
 @use './option/option-theme';
 @use './option/optgroup-theme';
 @use './selection/pseudo-checkbox/pseudo-checkbox-theme';
-@use './style/sass-utils';
 @use './typography/typography';
 @use './tokens/token-utils';
 @use './m2-app';
@@ -16,71 +14,59 @@
 @use 'sass:map';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-app.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), base));
-    @include token-utils.create-token-values(map.get(m3-pseudo-checkbox.get-tokens($theme), base));
-  } @else {
-    @include ripple-theme.base($theme);
-    @include option-theme.base($theme);
-    @include optgroup-theme.base($theme);
-    @include pseudo-checkbox-theme.base($theme);
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-app.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-app.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.base($theme);
+  @include option-theme.base($theme);
+  @include optgroup-theme.base($theme);
+  @include pseudo-checkbox-theme.base($theme);
 }
 
 @mixin color($theme) {
+  $tokens: map.get(m2-app.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), color));
-    @include token-utils.create-token-values(map.get(m3-pseudo-checkbox.get-tokens($theme), color));
-  } @else {
-    @include ripple-theme.color($theme);
-    @include option-theme.color($theme);
-    @include optgroup-theme.color($theme);
-    @include pseudo-checkbox-theme.color($theme);
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-app.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-app.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.color($theme);
+  @include option-theme.color($theme);
+  @include optgroup-theme.color($theme);
+  @include pseudo-checkbox-theme.color($theme);
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-app.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), typography));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), typography));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), typography));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), typography));
-    @include token-utils.create-token-values(
-        map.get(m3-pseudo-checkbox.get-tokens($theme), typography));
-  } @else {
-    @include option-theme.typography($theme);
-    @include optgroup-theme.typography($theme);
-    @include pseudo-checkbox-theme.typography($theme);
-    @include ripple-theme.typography($theme);
+    $tokens: map.get(m3-app.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.typography($theme);
+  @include option-theme.typography($theme);
+  @include optgroup-theme.typography($theme);
+  @include pseudo-checkbox-theme.typography($theme);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-app.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-app.get-tokens($theme), density));
-    @include token-utils.create-token-values(map.get(m3-ripple.get-tokens($theme), density));
-    @include token-utils.create-token-values(map.get(m3-option.get-tokens($theme), density));
-    @include token-utils.create-token-values(map.get(m3-optgroup.get-tokens($theme), density));
-    @include token-utils.create-token-values(
-        map.get(m3-pseudo-checkbox.get-tokens($theme), density));
-  } @else {
-    @include option-theme.density($theme);
-    @include optgroup-theme.density($theme);
-    @include pseudo-checkbox-theme.density($theme);
-    @include ripple-theme.density($theme);
+    $tokens: map.get(m3-app.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
+
+  @include ripple-theme.density($theme);
+  @include option-theme.density($theme);
+  @include optgroup-theme.density($theme);
+  @include pseudo-checkbox-theme.density($theme);
 }
 
 @function _define-overrides() {
@@ -119,26 +105,21 @@
 
 // Mixin that renders all of the core styles that depend on the theme.
 @mixin theme($theme) {
-  // Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that
-  // there won't be multiple warnings. e.g. if `mat-core-theme` reports a warning, then
-  // the imported themes (such as `mat-ripple-theme`) should not report again.
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-core') {
-    @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/_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/focus-indicators/_private.scss

@@ -2,7 +2,6 @@
 @use 'sass:meta';
 @use '@angular/cdk';
 @use '../style/layout-common';
-@use '../theming/theming';
 @use '../theming/inspection';
 
 // Private sass variables that will be used as reference throughout component stylesheets.
@@ -104,10 +103,8 @@ $default-border-radius: 4px;
     @include _customize-focus-indicators((border-color: $theme-or-color));
   }
   @else {
-    @include theming.private-check-duplicate-theme-styles($theme-or-color, 'mat-focus-indicators') {
-      @if inspection.theme-has($theme-or-color, color) {
-        @include strong-focus-indicators-color($theme-or-color);
-      }
+    @if inspection.theme-has($theme-or-color, color) {
+      @include strong-focus-indicators-color($theme-or-color);
     }
   }
 }