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

package/_index.scss

@@ -23,8 +23,7 @@
 
 // Private/Internal
 @forward './core/density/private/all-density' show all-component-densities;
-@forward './core/theming/theming' show private-check-duplicate-theme-styles,
-  private-legacy-get-theme, private-is-theme-object;
+@forward './core/theming/theming' show private-legacy-get-theme, private-is-theme-object;
 @forward './core/style/private' show private-theme-elevation;
 @forward './core/style/vendor-prefixes' as private-* show private-user-select;
 @forward './core/style/variables' as private-* show $private-swift-ease-in-duration,

package/autocomplete/_autocomplete-theme.scss

@@ -1,51 +1,44 @@
 @use 'sass:map';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 @use 'm2-autocomplete';
 @use 'm3-autocomplete';
 
 @mixin base($theme) {
+  $tokens: m2-autocomplete.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-autocomplete.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-autocomplete.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-autocomplete.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: m2-autocomplete.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-autocomplete.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-autocomplete.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-autocomplete.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: m2-autocomplete.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-autocomplete.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-autocomplete.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-autocomplete.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: m2-autocomplete.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-autocomplete.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-autocomplete.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-autocomplete.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-autocomplete') {
-    @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/autocomplete/_m2-autocomplete.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 (
-    autocomplete-background-color: inspection.get-theme-color($theme, system, surface)
+    autocomplete-background-color: map.get($system, surface)
   );
 }
 

package/badge/_badge-theme.scss

@@ -1,6 +1,4 @@
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-badge';
@@ -12,14 +10,12 @@
 /// for the mat-badge.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-badge.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-badge.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-badge.get-unthemable-tokens()
-      );
-    }
+    $tokens: map.get(m3-badge.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-badge.
@@ -28,24 +24,22 @@
 ///     the badge: primary, secondary, tertiary, or error (If not specified,
 ///     default error color will be used).
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-badge.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-badge.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-badge.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-badge.get-tokens($theme, $color-variant), color);
+  }
 
+  @include token-utils.values($tokens);
+
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-badge-accent {
-      @include token-utils.create-token-values-mixed(
-        m2-badge.private-get-color-palette-color-tokens($theme, secondary)
-      );
+      $tokens: m2-badge.private-get-color-palette-color-tokens($theme, secondary);
+      @include token-utils.values($tokens);
     }
 
     .mat-badge-warn {
-      @include token-utils.create-token-values-mixed(
-        m2-badge.private-get-color-palette-color-tokens($theme, error)
-      );
+      $tokens: m2-badge.private-get-color-palette-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
   }
 }
@@ -53,24 +47,23 @@
 /// Outputs typography theme styles for the mat-badge.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-badge.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-badge.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-badge.get-typography-tokens($theme)
-      );
-    }
+    $tokens: map.get(m3-badge.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-badge.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-badge.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-badge.get-tokens($theme), density));
-  } @else {
+    $tokens: map.get(m3-badge.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -93,23 +86,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-badge') {
-    @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/badge/_m2-badge.scss

@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use 'sass:math';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 
@@ -64,10 +63,12 @@ $_large-size: $_default-size + 6px;
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+
   $base-size: 12px;
 
   @return (
-    badge-text-font: inspection.get-theme-typography($theme, body-2, font-family),
+    badge-text-font: map.get($system, body-medium-font),
     badge-line-height: $_default-size,
     badge-text-size: $base-size,
     badge-text-weight: 600,

package/bottom-sheet/_bottom-sheet-theme.scss

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

@@ -1,4 +1,5 @@
-@use '../core/theming/inspection';
+@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.
@@ -11,23 +12,23 @@
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+
   @return (
-    bottom-sheet-container-text-color: inspection.get-theme-color($theme, system, on-surface),
-    bottom-sheet-container-background-color: inspection.get-theme-color($theme, system, surface),
+    bottom-sheet-container-text-color: map.get($system, on-surface),
+    bottom-sheet-container-background-color: map.get($system, 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 (
-    bottom-sheet-container-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    bottom-sheet-container-text-line-height:
-        inspection.get-theme-typography($theme, body-2, line-height),
-    bottom-sheet-container-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    bottom-sheet-container-text-tracking:
-        inspection.get-theme-typography($theme, body-2, letter-spacing),
-    bottom-sheet-container-text-weight:
-        inspection.get-theme-typography($theme, body-2, font-weight),
+    bottom-sheet-container-text-font: map.get($system, body-medium-font),
+    bottom-sheet-container-text-line-height: map.get($system, body-medium-line-height),
+    bottom-sheet-container-text-size: map.get($system, body-medium-size),
+    bottom-sheet-container-text-tracking: map.get($system, body-medium-tracking),
+    bottom-sheet-container-text-weight: map.get($system, body-medium-weight),
   );
 }
 

package/button/_button-theme.scss

@@ -1,33 +1,20 @@
-@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
-@use '../core/theming/theming';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-button';
 @use './m3-button';
 @use 'sass:map';
 
-@mixin _m2-button-variant($theme, $palette) {
-  $mat-tokens: if(
-    $palette,
-    m2-button.private-get-color-palette-color-tokens($theme, $palette),
-    m2-button.get-color-tokens($theme)
-  );
-
-  @include token-utils.create-token-values-mixed($mat-tokens);
-}
-
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-button.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: m2-button.get-unthemable-tokens();
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-button.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-button.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-button.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-button.
@@ -36,56 +23,53 @@
 ///     the badge: primary, secondary, tertiary, or error (If not specified,
 ///     default primary color will be used).
 @mixin color($theme, $color-variant: null) {
+  $tokens: m2-button.get-color-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-button.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include _m2-button-variant($theme, null);
-    }
+    $tokens: map.get(m3-button.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
 
+  @if inspection.get-theme-version($theme) != 1 {
     .mat-mdc-button,
     .mat-mdc-unelevated-button,
     .mat-mdc-raised-button,
     .mat-mdc-outlined-button,
     .mat-tonal-button {
       &.mat-primary {
-        @include _m2-button-variant($theme, primary);
+        $tokens: m2-button.private-get-color-palette-color-tokens($theme, primary);
+        @include token-utils.values($tokens);
       }
 
       &.mat-accent {
-        @include _m2-button-variant($theme, secondary);
+        $tokens: m2-button.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
       }
 
       &.mat-warn {
-        @include _m2-button-variant($theme, error);
+        $tokens: m2-button.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-button.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: m2-button.get-typography-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-button.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-button.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-button.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-button.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: m2-button.get-density-tokens($theme);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-button.get-tokens($theme), density));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-button.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-button.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -109,23 +93,21 @@
 /// @param {String} $color-variant: The color variant to use for the button: primary, secondary,
 //         tertiary, or error (If not specified, default primary color will be used).
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-button') {
-    @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);
-      }
     }
   }
 }