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

package/sort/_sort-theme.scss

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

@@ -1,68 +1,50 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @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() {
-  @return (
-    stepper-header-focus-state-layer-shape: 0,
-    stepper-header-hover-state-layer-shape: 0,
-  );
-}
-
-// 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 map.merge(private-get-color-palette-color-tokens($theme, primary), (
-    stepper-container-color: map.get($system, surface),
-    stepper-line-color: map.get($system, outline),
-    stepper-header-hover-state-layer-color: m3-utils.color-with-opacity(
-        map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
-    stepper-header-focus-state-layer-color: m3-utils.color-with-opacity(
-        map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
-    stepper-header-label-text-color: map.get($system, on-surface-variant),
-    stepper-header-optional-label-text-color: map.get($system, on-surface-variant),
-    stepper-header-selected-state-label-text-color: map.get($system, on-surface),
-    stepper-header-error-state-label-text-color: inspection.get-theme-color($theme, warn, text),
-    stepper-header-icon-background-color: map.get($system, on-surface-variant),
-    stepper-header-error-state-icon-foreground-color:
-        inspection.get-theme-color($theme, warn, text),
-    stepper-header-error-state-icon-background-color: transparent,
-  ));
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    stepper-container-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    stepper-header-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    stepper-header-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    stepper-header-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight),
-    stepper-header-error-state-label-text-size:
-        inspection.get-theme-typography($theme, body-1, font-size),
-    stepper-header-selected-state-label-text-size: inspection.get-theme-typography(
-        $theme, body-1, font-size),
-    stepper-header-selected-state-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) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
-  $height-config: (
-    0: 72px,
-    -1: 68px,
-    -2: 64px,
-    -3: 60px,
-    -4: 42px,
-  );
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
-    stepper-header-height: map.get($height-config, $scale),
+    base: (
+      stepper-header-focus-state-layer-shape: 0,
+      stepper-header-hover-state-layer-shape: 0,
+    ),
+    color: map.merge(private-get-color-palette-color-tokens($theme, primary), (
+      stepper-container-color: map.get($system, surface),
+      stepper-line-color: map.get($system, outline),
+      stepper-header-hover-state-layer-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
+      stepper-header-focus-state-layer-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
+      stepper-header-label-text-color: map.get($system, on-surface-variant),
+      stepper-header-optional-label-text-color: map.get($system, on-surface-variant),
+      stepper-header-selected-state-label-text-color: map.get($system, on-surface),
+      stepper-header-error-state-label-text-color: map.get($system, error),
+      stepper-header-icon-background-color: map.get($system, on-surface-variant),
+      stepper-header-error-state-icon-foreground-color: map.get($system, error),
+      stepper-header-error-state-icon-background-color: transparent)
+    ),
+    typography: (
+      stepper-container-text-font: map.get($system, body-medium-font),
+      stepper-header-label-text-font: map.get($system, body-medium-font),
+      stepper-header-label-text-size: map.get($system, body-medium-size),
+      stepper-header-label-text-weight: map.get($system, body-medium-weight),
+      stepper-header-error-state-label-text-size: map.get($system, body-large-size),
+      stepper-header-selected-state-label-text-size: map.get($system, body-large-size),
+      stepper-header-selected-state-label-text-weight: map.get($system, body-large-weight),
+    ),
+    density: (
+      stepper-header-height: map.get((
+        0: 72px,
+        -1: 68px,
+        -2: 64px,
+        -3: 60px,
+        -4: 42px,
+      ), $density-scale),
+    ),
   );
 }
 

package/stepper/_m3-stepper.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';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -52,7 +51,7 @@ $prefix: (mat, stepper);
       stepper-header-selected-state-label-text-size: map.get($system, title-small-size),
       stepper-header-selected-state-label-text-weight: map.get($system, title-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/stepper/_stepper-theme.scss

@@ -1,7 +1,5 @@
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 @use './m2-stepper';
 @use './m3-stepper';
@@ -11,58 +9,54 @@
 /// for mat-stepper.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-stepper.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-stepper.get-tokens($theme), base));
-  } @else {
+    $tokens: map.get(m3-stepper.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for mat-stepper.
 /// @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-stepper.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-stepper.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-stepper.get-color-tokens($theme));
+    $tokens: map.get(m3-stepper.get-tokens($theme, $color-variant), color);
+  }
 
-      .mat-step-header.mat-accent {
-        @include token-utils.create-token-values-mixed(
-          m2-stepper.private-get-color-palette-color-tokens($theme, secondary));
-      }
+  @include token-utils.values($tokens);
 
-      .mat-step-header.mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-stepper.private-get-color-palette-color-tokens($theme, error));
-      }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-step-header.mat-accent {
+      $tokens: m2-stepper.private-get-color-palette-color-tokens($theme, secondary);
+      @include token-utils.values($tokens);
+    }
+
+    .mat-step-header.mat-warn {
+      $tokens: m2-stepper.private-get-color-palette-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
   }
 }
 
-/// Outputs typography theme styles for mat-stepper.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: map.get(m2-stepper.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-stepper.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-stepper.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-stepper.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for mat-stepper.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-stepper.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-stepper.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-stepper.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-stepper.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -85,26 +79,24 @@
 /// @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 theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-stepper') {
-    @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);
+    @if inspection.theme-has($theme, density) {
       @include density($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);
-      @if inspection.theme-has($theme, density) {
-        @include density($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/table/_m2-table.scss

@@ -1,81 +1,63 @@
 @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.
-@function get-unthemable-tokens() {
-  @return (
-    table-row-item-outline-width: 1px,
-  );
-}
-
-// 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);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
-    table-background-color: map.get($system, surface),
-    table-header-headline-color: map.get($system, on-surface),
-    table-row-item-label-text-color: map.get($system, on-surface),
-    table-row-item-outline-color: map.get($system, outline),
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  $cell-font-family: inspection.get-theme-typography($theme, body-2, font-family);
-  $cell-line-height: inspection.get-theme-typography($theme, body-2, line-height);
-  $cell-font-size: inspection.get-theme-typography($theme, body-2, font-size);
-  $cell-font-weight: inspection.get-theme-typography($theme, body-2, font-weight);
-  $cell-letter-spacing: inspection.get-theme-typography($theme, body-2, letter-spacing);
-
-  @return (
-    table-header-headline-font: inspection.get-theme-typography($theme, subtitle-2, font-family),
-    table-header-headline-line-height:
-        inspection.get-theme-typography($theme, subtitle-2, line-height),
-    table-header-headline-size: inspection.get-theme-typography($theme, subtitle-2, font-size),
-    table-header-headline-weight: inspection.get-theme-typography($theme, subtitle-2, font-weight),
-    table-header-headline-tracking:
-        inspection.get-theme-typography($theme, subtitle-2, letter-spacing),
-
-    // Plain cells and footer cells have the same typography.
-    table-row-item-label-text-font: $cell-font-family,
-    table-row-item-label-text-line-height: $cell-line-height,
-    table-row-item-label-text-size: $cell-font-size,
-    table-row-item-label-text-weight: $cell-font-weight,
-    table-row-item-label-text-tracking: $cell-letter-spacing,
-
-    table-footer-supporting-text-font: $cell-font-family,
-    table-footer-supporting-text-line-height: $cell-line-height,
-    table-footer-supporting-text-size: $cell-font-size,
-    table-footer-supporting-text-weight: $cell-font-weight,
-    table-footer-supporting-text-tracking: $cell-letter-spacing,
-  );
-}
-
-// 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), -4);
-  $header-scale: (
-    0: 56px,
-    -1: 52px,
-    -2: 48px,
-    -3: 44px,
-    -4: 40px
-  );
-  $cell-scale: (
-    0: 52px,
-    -1: 48px,
-    -2: 44px,
-    -3: 40px,
-    -4: 36px
-  );
-
-  @return (
-    table-header-container-height: map.get($header-scale, $scale),
-    table-footer-container-height: map.get($cell-scale, $scale),
-    table-row-item-container-height: map.get($cell-scale, $scale),
+    base: (
+      table-row-item-outline-width: 1px,
+    ),
+    color: (
+      table-background-color: map.get($system, surface),
+      table-header-headline-color: map.get($system, on-surface),
+      table-row-item-label-text-color: map.get($system, on-surface),
+      table-row-item-outline-color: map.get($system, outline),
+    ),
+    typography: (
+      table-header-headline-font: map.get($system, label-medium-font),
+      table-header-headline-line-height: map.get($system, label-medium-line-height),
+      table-header-headline-size: map.get($system, label-medium-size),
+      table-header-headline-weight: map.get($system, label-medium-weight),
+      table-header-headline-tracking: map.get($system, label-medium-tracking),
+
+      // Plain cells and footer cells have the same typography.
+      table-row-item-label-text-font: map.get($system, body-medium-font),
+      table-row-item-label-text-line-height: map.get($system, body-medium-line-height),
+      table-row-item-label-text-size: map.get($system, body-medium-size),
+      table-row-item-label-text-weight: map.get($system, body-medium-weight),
+      table-row-item-label-text-tracking: map.get($system, body-medium-tracking),
+
+      table-footer-supporting-text-font: map.get($system, body-medium-font),
+      table-footer-supporting-text-line-height: map.get($system, body-medium-line-height),
+      table-footer-supporting-text-size: map.get($system, body-medium-size),
+      table-footer-supporting-text-weight: map.get($system, body-medium-weight),
+      table-footer-supporting-text-tracking: map.get($system, body-medium-tracking),
+    ),
+    density: (
+      table-header-container-height: map.get((
+        0: 56px,
+        -1: 52px,
+        -2: 48px,
+        -3: 44px,
+        -4: 40px
+      ), $density-scale),
+      table-footer-container-height: map.get((
+        0: 52px,
+        -1: 48px,
+        -2: 44px,
+        -3: 40px,
+        -4: 36px
+      ), $density-scale),
+      table-row-item-container-height: map.get((
+        0: 52px,
+        -1: 48px,
+        -2: 44px,
+        -3: 40px,
+        -4: 36px
+      ), $density-scale),
+    ),
   );
 }

package/table/_m3-table.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-table.
@@ -36,7 +35,7 @@
       table-footer-supporting-text-tracking: map.get($system, body-medium-tracking),
       table-footer-supporting-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/table/_table-theme.scss

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