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

package/tabs/_tabs-theme.scss

@@ -1,23 +1,17 @@
-@use '../core/style/sass-utils';
 @use './m2-tabs';
 @use './m3-tabs';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 @use 'sass:map';
 
-/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
-/// for the mat-tab.
-/// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-tabs.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tabs.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tabs.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-tabs.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-tab.
@@ -25,48 +19,48 @@
 /// @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(
-        map.get(m3-tabs.get-tokens($theme, $color-variant), color));
+    $tokens: map.get(m3-tabs.get-tokens($theme, $color-variant), color);
+    @include token-utils.values($tokens);
   } @else {
     .mat-mdc-tab-group,
     .mat-mdc-tab-nav-bar {
-      @include token-utils.create-token-values-mixed(
+      @include token-utils.values(
           m2-tabs.get-color-tokens($theme, primary,
             $exclude: (tab-background-color, tab-foreground-color)));
 
       &.mat-accent {
-        @include token-utils.create-token-values-mixed(
+        @include token-utils.values(
           m2-tabs.get-color-tokens($theme, secondary,
             $exclude: (tab-background-color, tab-foreground-color)));
       }
 
       &.mat-warn {
-        @include token-utils.create-token-values-mixed(
+        @include token-utils.values(
           m2-tabs.get-color-tokens($theme, error,
             $exclude: (tab-background-color, tab-foreground-color)));
       }
 
       &.mat-background-primary {
         $tokens: m2-tabs.get-color-tokens($theme, primary);
-        @include token-utils.create-token-values-mixed((
-          tab-background-color: map.get($tokens, background-color),
-          tab-foreground-color: map.get($tokens, foreground-color)
+        @include token-utils.values((
+          tab-background-color: map.get($tokens, tab-background-color),
+          tab-foreground-color: map.get($tokens, tab-foreground-color)
         ));
       }
 
       &.mat-background-accent {
         $tokens: m2-tabs.get-color-tokens($theme, secondary);
-        @include token-utils.create-token-values-mixed((
-          tab-background-color: map.get($tokens, background-color),
-          tab-foreground-color: map.get($tokens, foreground-color),
+        @include token-utils.values((
+          tab-background-color: map.get($tokens, tab-background-color),
+          tab-foreground-color: map.get($tokens, tab-foreground-color),
         ));
       }
 
       &.mat-background-warn {
         $tokens: m2-tabs.get-color-tokens($theme, error);
-        @include token-utils.create-token-values-mixed((
-          tab-background-color: map.get($tokens, background-color),
-          tab-foreground-color: map.get($tokens, foreground-color),
+        @include token-utils.values((
+          tab-background-color: map.get($tokens, tab-background-color),
+          tab-foreground-color: map.get($tokens, tab-foreground-color),
         ));
       }
     }
@@ -77,10 +71,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-tabs.get-tokens($theme), typography));
+    @include token-utils.values(map.get(m3-tabs.get-tokens($theme), typography));
   } @else {
     .mat-mdc-tab-header {
-      @include token-utils.create-token-values-mixed(m2-tabs.get-typography-tokens($theme));
+      @include token-utils.values(m2-tabs.get-typography-tokens($theme));
     }
   }
 }
@@ -89,10 +83,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-tabs.get-tokens($theme), density));
+    @include token-utils.values(map.get(m3-tabs.get-tokens($theme), density));
   } @else {
     .mat-mdc-tab-header {
-      @include token-utils.create-token-values-mixed(m2-tabs.get-density-tokens($theme));
+      @include token-utils.values(m2-tabs.get-density-tokens($theme));
     }
   }
 }
@@ -117,23 +111,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-tabs') {
-    @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/timepicker/_m2-timepicker.scss

@@ -1,5 +1,6 @@
-@use '../core/theming/inspection';
 @use '../core/style/elevation';
+@use '../core/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.
@@ -12,8 +13,10 @@
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+
   @return (
-    timepicker-container-background-color: inspection.get-theme-color($theme, system, surface)
+    timepicker-container-background-color: map.get($system, surface)
   );
 }
 

package/timepicker/_timepicker-theme.scss

@@ -1,60 +1,44 @@
 @use 'sass:map';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/style/sass-utils';
 @use './m2-timepicker';
 @use './m3-timepicker';
 @use '../core/tokens/token-utils';
 
-/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
-/// for the mat-timepicker.
-/// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-timepicker.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-timepicker.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs color theme styles for the mat-timepicker.
-/// @param {Map} $theme The theme to generate color styles for.
 @mixin color($theme) {
+  $tokens: m2-timepicker.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-timepicker.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs typography theme styles for the mat-timepicker.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-timepicker.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-timepicker.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-timepicker.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-timepicker.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-timepicker.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-timepicker.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-timepicker.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -77,23 +61,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-timepicker') {
-    @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/toolbar/_m2-toolbar.scss

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
+@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.
@@ -10,22 +11,22 @@
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return private-get-color-palette-color-tokens(
-    $background-color: inspection.get-theme-color($theme, system, surface),
-    $text-color: inspection.get-theme-color($theme, system, on-surface),
+    $background-color: map.get($system, surface),
+    $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 (
-    toolbar-title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
-    toolbar-title-text-line-height:
-        inspection.get-theme-typography($theme, headline-6, line-height),
-    toolbar-title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
-    toolbar-title-text-tracking:
-        inspection.get-theme-typography($theme, headline-6, letter-spacing),
-    toolbar-title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
+    toolbar-title-text-font: map.get($system, title-small-font),
+    toolbar-title-text-line-height: map.get($system, title-small-line-height),
+    toolbar-title-text-size: map.get($system, title-small-size),
+    toolbar-title-text-tracking: map.get($system, title-small-tracking),
+    toolbar-title-text-weight: map.get($system, title-small-weight),
   );
 }
 

package/toolbar/_toolbar-theme.scss

@@ -1,70 +1,81 @@
 @use 'sass:map';
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-toolbar';
 @use './m3-toolbar';
 
 @mixin _palette-styles($theme, $palette-name) {
-  @include token-utils.create-token-values-mixed(
-    m2-toolbar.private-get-color-palette-color-tokens(
-      $background-color: inspection.get-theme-color($theme, $palette-name),
-      $text-color: inspection.get-theme-color($theme, $palette-name, default-contrast)
-    )
+  $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+    $background-color: inspection.get-theme-color($theme, $palette-name),
+    $text-color: inspection.get-theme-color($theme, $palette-name, default-contrast)
   );
+  @include token-utils.values($tokens);
 }
 
 @mixin base($theme) {
+  $tokens: m2-toolbar.get-unthemable-tokens();
+  @if inspection.get-theme-version($theme) == 1 {
+    $tokens: map.get(m3-toolbar.get-tokens($theme), base);
+  }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: m2-toolbar.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-toolbar.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-toolbar.get-tokens($theme), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-toolbar {
       &.mat-primary {
-        @include _palette-styles($theme, primary);
+        $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+          $background-color: inspection.get-theme-color($theme, primary),
+          $text-color: inspection.get-theme-color($theme, primary, default-contrast)
+        );
+        @include token-utils.values($tokens);
       }
 
       &.mat-accent {
-        @include _palette-styles($theme, accent);
+        $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+          $background-color: inspection.get-theme-color($theme, accent),
+          $text-color: inspection.get-theme-color($theme, accent, default-contrast)
+        );
+        @include token-utils.values($tokens);
       }
 
       &.mat-warn {
-        @include _palette-styles($theme, warn);
+        $tokens: m2-toolbar.private-get-color-palette-color-tokens(
+          $background-color: inspection.get-theme-color($theme, warn),
+          $text-color: inspection.get-theme-color($theme, warn, default-contrast)
+        );
+        @include token-utils.values($tokens);
       }
     }
   }
 }
 
-@mixin typography($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), typography));
-  } @else {
-    // TODO(mmalerba): Stop calling this and resolve resulting screen diffs.
-    $theme: inspection.private-get-typography-back-compat-theme($theme);
-
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-toolbar.get-typography-tokens($theme));
+  @mixin typography($theme) {
+    $tokens: m2-toolbar.get-typography-tokens($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      $tokens: map.get(m3-toolbar.get-tokens($theme), typography);
     }
+
+    @include token-utils.values($tokens);
   }
-}
 
-@mixin density($theme) {
-  @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-toolbar.get-density-tokens($theme));
+  @mixin density($theme) {
+    $tokens: m2-toolbar.get-density-tokens($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      $tokens: map.get(m3-toolbar.get-tokens($theme), density);
     }
+
+    @include token-utils.values($tokens);
   }
-}
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
 @function _define-overrides() {
@@ -83,23 +94,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-toolbar') {
-    @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/tooltip/_m2-tooltip.scss

@@ -1,4 +1,3 @@
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use 'sass:map';
 
@@ -27,12 +26,12 @@
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    tooltip-supporting-text-font: inspection.get-theme-typography($theme, caption, font-family),
-    tooltip-supporting-text-size: inspection.get-theme-typography($theme, caption, font-size),
-    tooltip-supporting-text-weight: inspection.get-theme-typography($theme, caption, font-weight),
-    tooltip-supporting-text-tracking:
-        inspection.get-theme-typography($theme, caption, letter-spacing),
+    tooltip-supporting-text-font: map.get($system, body-small-font),
+    tooltip-supporting-text-size: map.get($system, body-small-size),
+    tooltip-supporting-text-weight: map.get($system, body-small-weight),
+    tooltip-supporting-text-tracking: map.get($system, body-small-tracking),
   );
 }
 

package/tooltip/_tooltip-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
@@ -8,44 +6,39 @@
 @use 'sass:map';
 
 @mixin base($theme) {
+  $tokens: m2-tooltip.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), base));
-  } @else {
-    // Add default values for tokens not related to color, typography, or density.
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: m2-tooltip.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: m2-tooltip.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: m2-tooltip.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -63,23 +56,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-tooltip') {
-    @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/tree/_m2-tree.scss

@@ -1,6 +1,7 @@
 @use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
+@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.
@@ -10,18 +11,21 @@
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+
   @return (
-    tree-container-background-color: inspection.get-theme-color($theme, system, surface),
-    tree-node-text-color: inspection.get-theme-color($theme, system, on-surface),
+    tree-container-background-color: map.get($system, surface),
+    tree-node-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 (
-    tree-node-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    tree-node-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    tree-node-text-weight: inspection.get-theme-typography($theme, body-2, font-weight),
+    tree-node-text-font: map.get($system, body-medium-font),
+    tree-node-text-size: map.get($system, body-medium-size),
+    tree-node-text-weight: map.get($system, body-medium-weight),
 
     // TODO(crisbeto): provide tokens for line height and letter spacing to match other components.
   );