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

package/slide-toggle/_slide-toggle-theme.scss

@@ -1,79 +1,49 @@
 @use 'sass:map';
 @use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-slide-toggle';
 @use './m3-slide-toggle';
+@use '../core/tokens/m2-utils';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-slide-toggle.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-slide-toggle.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-slide-toggle.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      // TODO: See if this can be removed
-      @include token-utils.create-token-values-mixed(m2-slide-toggle.get-unthemable-tokens($theme));
-
-      .mat-mdc-slide-toggle {
-        @include token-utils.create-token-values-mixed(
-            m2-slide-toggle.get-unthemable-tokens($theme));
-      }
-    }
+    $tokens: map.get(m3-slide-toggle.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-slide-toggle.
 /// @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-slide-toggle.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-slide-toggle.get-tokens($theme, $color-variant), color));
-  } @else {
-    $mat-tokens: m2-slide-toggle.get-color-tokens($theme);
+    $tokens: map.get(m3-slide-toggle.get-tokens($theme, $color-variant), color);
+  }
 
-    // Add values for MDC slide toggles tokens
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-slide-toggle.get-color-tokens($theme));
+  @include token-utils.values($tokens);
 
-      & {
-        // TODO(andrewjs): Remove this once all tokens are migrated to
-        // mat internally.
-        --mdc-slide-toggle-disabled-label-text-color: #{inspection.get-theme-color(
-            $theme,
-            foreground,
-            disabled-text
-          )};
-        // TODO(wagnermaciel): Use our token system to define this css variable.
-        --mat-slide-toggle-disabled-label-text-color: #{inspection.get-theme-color(
-            $theme,
-            foreground,
-            disabled-text
-          )};
-      }
+  @if inspection.get-theme-version($theme) != 1 {
+    $mat-tokens: map.get(m2-slide-toggle.get-tokens($theme), color);
+    $system: m2-utils.get-system($theme);
 
-      .mat-mdc-slide-toggle {
-        // TODO(wagnermaciel): Use our token system to define this css variable.
-        --mat-slide-toggle-label-text-color: #{inspection.get-theme-color(
-          $theme,
-          foreground,
-          text
-        )};
-
-        // Change the color palette related tokens to accent or warn if applicable
-        &.mat-accent {
-          @include token-utils.create-token-values-mixed(
-              m2-slide-toggle.private-get-color-palette-color-tokens($theme, accent));
-        }
+    .mat-mdc-slide-toggle {
+      // Change the color palette related tokens to accent or warn if applicable
+      &.mat-accent {
+        $tokens: m2-slide-toggle.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
+      }
 
-        &.mat-warn {
-          @include token-utils.create-token-values-mixed(
-              m2-slide-toggle.private-get-color-palette-color-tokens($theme, warn));
-        }
+      &.mat-warn {
+        $tokens: m2-slide-toggle.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
@@ -83,16 +53,16 @@
 /// @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(
+    @include token-utils.values(
         map.get(m3-slide-toggle.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
       // TODO: See if this can be removed
-      @include token-utils.create-token-values-mixed(m2-slide-toggle.get-typography-tokens($theme));
+      @include token-utils.values(map.get(m2-slide-toggle.get-tokens($theme), typography));
 
       .mat-mdc-slide-toggle {
-        @include token-utils.create-token-values-mixed(
-            m2-slide-toggle.get-typography-tokens($theme));
+        @include token-utils.values(
+            map.get(m2-slide-toggle.get-tokens($theme), typography));
       }
     }
   }
@@ -101,18 +71,12 @@
 /// Outputs density theme styles for the mat-slide-toggle.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-slide-toggle.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      // TODO: See if this can be removed
-      @include token-utils.create-token-values-mixed(m2-slide-toggle.get-density-tokens($theme));
-
-      .mat-mdc-slide-toggle {
-        @include token-utils.create-token-values-mixed(m2-slide-toggle.get-density-tokens($theme));
-      }
-    }
+    $tokens: map.get(m3-slide-toggle.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -135,23 +99,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-slide-toggle') {
-    @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/slider/_m2-slider.scss

@@ -1,44 +1,35 @@
 @use 'sass:map';
-@use '../core/theming/inspection';
 @use '../core/style/elevation';
 @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 (
-    slider-active-track-height: 6px,
-    slider-active-track-shape: 9999px,
-    slider-handle-elevation: elevation.get-box-shadow(1),
-    slider-handle-height: 20px,
-    slider-handle-shape: 50%,
-    slider-handle-width: 20px,
-    slider-inactive-track-height: 4px,
-    slider-inactive-track-shape: 9999px,
-    slider-value-indicator-border-radius: 4px,
-    slider-value-indicator-caret-display: block,
-    slider-value-indicator-container-transform: translateX(-50%),
-    slider-value-indicator-height: 32px,
-    slider-value-indicator-padding: 0 12px,
-    slider-value-indicator-text-transform: none,
-    slider-value-indicator-width: auto,
-    slider-with-overlap-handle-outline-width: 1px,
-    slider-with-tick-marks-active-container-opacity: 0.6,
-    slider-with-tick-marks-container-shape: 50%,
-    slider-with-tick-marks-container-size: 2px,
-    slider-with-tick-marks-inactive-container-opacity: 0.6,
-  );
-}
-
-// 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);
-  $theme-color-tokens: private-get-color-palette-color-tokens($theme, primary);
 
-  @return map.merge(
-    $theme-color-tokens,
-    (
+  @return (
+    base: (
+      slider-active-track-height: 6px,
+      slider-active-track-shape: 9999px,
+      slider-handle-elevation: elevation.get-box-shadow(1),
+      slider-handle-height: 20px,
+      slider-handle-shape: 50%,
+      slider-handle-width: 20px,
+      slider-inactive-track-height: 4px,
+      slider-inactive-track-shape: 9999px,
+      slider-value-indicator-border-radius: 4px,
+      slider-value-indicator-caret-display: block,
+      slider-value-indicator-container-transform: translateX(-50%),
+      slider-value-indicator-height: 32px,
+      slider-value-indicator-padding: 0 12px,
+      slider-value-indicator-text-transform: none,
+      slider-value-indicator-width: auto,
+      slider-with-overlap-handle-outline-width: 1px,
+      slider-with-tick-marks-active-container-opacity: 0.6,
+      slider-with-tick-marks-container-shape: 50%,
+      slider-with-tick-marks-container-size: 2px,
+      slider-with-tick-marks-inactive-container-opacity: 0.6,
+    ),
+    color: map.merge(private-get-color-palette-color-tokens($theme, primary), (
       slider-disabled-active-track-color: map.get($system, on-surface),
       slider-disabled-handle-color: map.get($system, on-surface),
       slider-disabled-inactive-track-color: map.get($system, on-surface),
@@ -46,8 +37,16 @@
       slider-label-label-text-color: map.get($system, inverse-on-surface),
       slider-value-indicator-opacity: 1,
       slider-with-overlap-handle-outline-color: map.get($system, on-surface),
-      slider-with-tick-marks-disabled-container-color: map.get($system, on-surface),
+      slider-with-tick-marks-disabled-container-color: map.get($system, on-surface)),
+    ),
+    typography: (
+      slider-label-label-text-font: map.get($system, label-medium-font),
+      slider-label-label-text-size: map.get($system, label-medium-size),
+      slider-label-label-text-line-height: map.get($system, label-medium-line-height),
+      slider-label-label-text-tracking: map.get($system, label-medium-tracking),
+      slider-label-label-text-weight: map.get($system, label-medium-weight),
     ),
+    density: (),
   );
 }
 
@@ -55,7 +54,6 @@
 @function private-get-color-palette-color-tokens($theme, $color-variant) {
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
-  $color: map.get($system, primary);
 
   @return (
     slider-active-track-color: map.get($system, primary),
@@ -72,22 +70,3 @@
     slider-with-tick-marks-inactive-container-color: map.get($system, primary),
   );
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    slider-label-label-text-font: inspection.get-theme-typography($theme, subtitle-2, font-family),
-    slider-label-label-text-size: inspection.get-theme-typography($theme, subtitle-2, font-size),
-    slider-label-label-text-line-height:
-        inspection.get-theme-typography($theme, subtitle-2, line-height),
-    slider-label-label-text-tracking:
-        inspection.get-theme-typography($theme, subtitle-2, letter-spacing),
-    slider-label-label-text-weight:
-        inspection.get-theme-typography($theme, subtitle-2, font-weight),
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/slider/_slider-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-slider';
 @use './m3-slider';
@@ -11,35 +9,34 @@
 /// for the mat-slider.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
+  $tokens: map.get(m2-slider.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-slider.get-tokens($theme), base));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-slider.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-slider.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs color theme styles for the mat-slider.
 /// @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-slider.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-slider.get-tokens($theme, $color-variant), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-slider.get-color-tokens($theme));
+    $tokens: map.get(m3-slider.get-tokens($theme, $color-variant), color);
+  }
 
-      .mat-accent {
-        @include token-utils.create-token-values-mixed(
-          m2-slider.private-get-color-palette-color-tokens($theme, secondary));
-      }
+  @include token-utils.values($tokens);
 
-      .mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-slider.private-get-color-palette-color-tokens($theme, error));
-      }
+  @if inspection.get-theme-version($theme) != 1 {
+    .mat-accent {
+      $tokens: m2-slider.private-get-color-palette-color-tokens($theme, secondary);
+      @include token-utils.values($tokens);
+    }
+
+    .mat-warn {
+      $tokens: m2-slider.private-get-color-palette-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
   }
 }
@@ -47,25 +44,23 @@
 /// Outputs typography theme styles for the mat-slider.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: map.get(m2-slider.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-slider.get-tokens($theme), typography));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-slider.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-slider.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Outputs density theme styles for the mat-slider.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-slider.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-slider.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-slider.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -88,23 +83,21 @@
 /// @param {Map} $theme The theme to generate styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin theme($theme, $color-variant: null) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-slider') {
-    @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/snack-bar/_m2-snack-bar.scss

@@ -1,44 +1,24 @@
-@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.
-@function get-unthemable-tokens() {
-  @return (
-    snack-bar-container-shape: 4px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $is-dark: inspection.get-theme-type($theme) == dark;
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
   @return (
-    snack-bar-container-color: map.get($system, inverse-surface),
-    snack-bar-supporting-text-color: map.get($system, inverse-on-surface),
-    snack-bar-button-color:
-      if(
-        $is-dark,
-        inspection.get-theme-color($theme, primary, 500),
-        inspection.get-theme-color($theme, primary, 100)
-      )
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    snack-bar-supporting-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    snack-bar-supporting-text-line-height:
-        inspection.get-theme-typography($theme, body-2, line-height),
-    snack-bar-supporting-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    snack-bar-supporting-text-weight: inspection.get-theme-typography($theme, body-2, font-weight),
+    base: (
+      snack-bar-container-shape: 4px,
+    ),
+    color: (
+      snack-bar-container-color: map.get($system, inverse-surface),
+      snack-bar-supporting-text-color: map.get($system, inverse-on-surface),
+      snack-bar-button-color: map.get($system, inverse-primary)
+    ),
+    typography: (
+      snack-bar-supporting-text-font: map.get($system, body-medium-font),
+      snack-bar-supporting-text-line-height: map.get($system, body-medium-line-height),
+      snack-bar-supporting-text-size: map.get($system, body-medium-size),
+      snack-bar-supporting-text-weight: map.get($system, body-medium-weight),
+    ),
+    density: (),
   );
 }
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/snack-bar/_snack-bar-theme.scss

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

@@ -1,27 +1,16 @@
 @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.
-@function get-unthemable-tokens() {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
   @return (
-    sort-arrow-color: map.get($system, on-surface),
+    base: (),
+    color: (
+      sort-arrow-color: map.get($system, on-surface),
+    ),
+    typography: (),
+    density: (),
   );
 }
 
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}