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

package/sidenav/_sidenav-theme.scss

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

@@ -3,6 +3,7 @@
 @use '../core/theming/theming';
 @use 'sass:map';
 @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.
@@ -17,7 +18,7 @@
   // The m2 slide-toggle uses transforms to hide & show the tracks while
   // the m3 slide-toggle uses opacity.
   @return (
-    slide-toggle-disabled-handle-opacity: null,
+    slide-toggle-disabled-handle-opacity: 0.38,
     slide-toggle-disabled-selected-handle-opacity: 0.38,
     slide-toggle-disabled-selected-icon-opacity: 0.38,
     slide-toggle-disabled-track-opacity: 0.12,
@@ -65,81 +66,67 @@
 @function get-color-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
-  $is-dark: inspection.get-theme-type($theme) == dark;
-  $on-surface: if($is-dark, #f5f5f5, #424242);
-  $hairline: if($is-dark, #616161, #e0e0e0);
-  $on-surface-variant: if($is-dark, #9e9e9e, #616161);
-  $on-surface-state-content: if($is-dark, #fafafa, #212121);
-  $disabled-handle-color: if($is-dark, #000, #424242);
-  $icon-color: if($is-dark, #212121, #fff);
-
-  // The default for tokens that rely on the theme will use the primary palette
-  $theme-color-tokens: private-get-color-palette-color-tokens($theme, primary);
-
-  // TODO(crisbeto): `handle-surface-color` was hardcoded to `var(--mat-surface-color, #fff)`
-  // which made it basically hardcoded to #fff. Should it be based on the theme?
   @return map.merge(
-      $theme-color-tokens,
+      private-get-color-palette-color-tokens($theme, primary),
       (
+        slide-toggle-disabled-label-text-color:
+            m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
         slide-toggle-disabled-handle-elevation-shadow: elevation.get-box-shadow(0),
-        slide-toggle-disabled-selected-handle-color: $disabled-handle-color,
-        slide-toggle-disabled-selected-icon-color: $icon-color,
-        slide-toggle-disabled-selected-track-color: $on-surface,
-        slide-toggle-disabled-unselected-handle-color: $disabled-handle-color,
-        slide-toggle-disabled-unselected-icon-color: $icon-color,
-        slide-toggle-disabled-unselected-track-color: $on-surface,
+        slide-toggle-disabled-selected-handle-color: map.get($system, on-surface),
+        slide-toggle-disabled-selected-track-color: map.get($system, on-surface),
+        slide-toggle-disabled-unselected-handle-color: map.get($system, on-surface),
+        slide-toggle-disabled-unselected-icon-color: map.get($system, surface-variant),
+        slide-toggle-disabled-unselected-track-color: map.get($system, on-surface),
         slide-toggle-handle-elevation-shadow: elevation.get-box-shadow(1),
-        slide-toggle-handle-surface-color: #fff,
+        slide-toggle-handle-surface-color: map.get($system, surface),
         slide-toggle-label-text-color: map.get($system, on-surface),
-        slide-toggle-selected-icon-color: $icon-color,
-        slide-toggle-unselected-hover-handle-color: $on-surface-state-content,
-        slide-toggle-unselected-focus-handle-color: $on-surface-state-content,
-        slide-toggle-unselected-focus-state-layer-color: $on-surface,
-        slide-toggle-unselected-focus-track-color: $hairline,
-        slide-toggle-unselected-icon-color: $icon-color,
-        slide-toggle-unselected-handle-color: $on-surface-variant,
-        slide-toggle-unselected-hover-state-layer-color: $on-surface,
-        slide-toggle-unselected-hover-track-color: $hairline,
-        slide-toggle-unselected-pressed-handle-color: $on-surface-state-content,
-        slide-toggle-unselected-pressed-track-color: $hairline,
-        slide-toggle-unselected-pressed-state-layer-color: $on-surface,
-        slide-toggle-unselected-track-color: $hairline,
+        slide-toggle-unselected-hover-handle-color: map.get($system, inverse-surface),
+        slide-toggle-unselected-focus-handle-color: map.get($system, inverse-surface),
+        slide-toggle-unselected-focus-state-layer-color: map.get($system, on-surface),
+        slide-toggle-unselected-focus-track-color: map.get($system, outline),
+        slide-toggle-unselected-icon-color: map.get($system, surface-variant),
+        slide-toggle-unselected-handle-color: map.get($system, on-surface-variant),
+        slide-toggle-unselected-hover-state-layer-color: map.get($system, on-surface),
+        slide-toggle-unselected-hover-track-color: map.get($system, outline),
+        slide-toggle-unselected-pressed-handle-color: map.get($system, inverse-surface),
+        slide-toggle-unselected-pressed-track-color: map.get($system, outline),
+        slide-toggle-unselected-pressed-state-layer-color: map.get($system, on-surface),
+        slide-toggle-unselected-track-color: map.get($system, outline),
       )
   );
 }
 
 // Generates the mapping for the properties that change based on the slide toggle color.
-@function private-get-color-palette-color-tokens($theme, $palette-name) {
-  $is-dark: inspection.get-theme-type($theme) == dark;
-  $palette-color: inspection.get-theme-color($theme, $palette-name, if($is-dark, 300, 600));
-  $state-content: inspection.get-theme-color($theme, $palette-name, if($is-dark, 200, 900));
-  $inverse: inspection.get-theme-color($theme, $palette-name, if($is-dark, 600, 300));
+@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);
 
   @return (
-    slide-toggle-selected-focus-state-layer-color: $palette-color,
-    slide-toggle-selected-handle-color: $palette-color,
-    slide-toggle-selected-hover-state-layer-color: $palette-color,
-    slide-toggle-selected-pressed-state-layer-color: $palette-color,
-    slide-toggle-selected-focus-handle-color: $state-content,
-    slide-toggle-selected-hover-handle-color: $state-content,
-    slide-toggle-selected-pressed-handle-color: $state-content,
-    slide-toggle-selected-focus-track-color: $inverse,
-    slide-toggle-selected-hover-track-color: $inverse,
-    slide-toggle-selected-pressed-track-color: $inverse,
-    slide-toggle-selected-track-color: $inverse,
+    slide-toggle-selected-icon-color: map.get($system, on-primary),
+    slide-toggle-disabled-selected-icon-color: map.get($system, on-primary),
+    slide-toggle-selected-focus-state-layer-color: map.get($system, primary),
+    slide-toggle-selected-handle-color: map.get($system, primary),
+    slide-toggle-selected-hover-state-layer-color: map.get($system, primary),
+    slide-toggle-selected-pressed-state-layer-color: map.get($system, primary),
+    slide-toggle-selected-focus-handle-color: map.get($system, primary),
+    slide-toggle-selected-hover-handle-color: map.get($system, primary),
+    slide-toggle-selected-pressed-handle-color: map.get($system, primary),
+    slide-toggle-selected-focus-track-color: map.get($system, inverse-primary),
+    slide-toggle-selected-hover-track-color: map.get($system, inverse-primary),
+    slide-toggle-selected-pressed-track-color: map.get($system, inverse-primary),
+    slide-toggle-selected-track-color: map.get($system, inverse-primary),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   @return (
-    slide-toggle-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    slide-toggle-label-text-line-height:
-        inspection.get-theme-typography($theme, body-2, line-height),
-    slide-toggle-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    slide-toggle-label-text-tracking:
-        inspection.get-theme-typography($theme, body-2, letter-spacing),
-    slide-toggle-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
+    slide-toggle-label-text-font: map.get($system, body-medium-font),
+    slide-toggle-label-text-line-height: map.get($system, body-medium-line-height),
+    slide-toggle-label-text-size: map.get($system, body-medium-size),
+    slide-toggle-label-text-tracking: map.get($system, body-medium-tracking),
+    slide-toggle-label-text-weight: map.get($system, body-medium-weight)
   );
 }
 

package/slide-toggle/_m3-slide-toggle.scss

@@ -60,6 +60,7 @@
       slide-toggle-handle-height: null,
     ),
     color: (
+      slide-toggle-disabled-label-text-color: map.get($system, on-surface),
       slide-toggle-disabled-selected-handle-color: map.get($system, surface),
       slide-toggle-disabled-selected-icon-color: map.get($system, on-surface),
       slide-toggle-disabled-selected-track-color: map.get($system, on-surface),

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: m2-slide-toggle.get-unthemable-tokens($theme);
   @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: m2-slide-toggle.get-color-tokens($theme);
   @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);
-
-    // 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));
+    $tokens: map.get(m3-slide-toggle.get-tokens($theme, $color-variant), color);
+  }
 
-      & {
-        // 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
-          )};
-      }
+  @include token-utils.values($tokens);
 
-      .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
-        )};
+  @if inspection.get-theme-version($theme) != 1 {
+    $mat-tokens: m2-slide-toggle.get-color-tokens($theme);
+    $system: m2-utils.get-system($theme);
 
-        // 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,15 +53,15 @@
 /// @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(m2-slide-toggle.get-typography-tokens($theme));
 
       .mat-mdc-slide-toggle {
-        @include token-utils.create-token-values-mixed(
+        @include token-utils.values(
             m2-slide-toggle.get-typography-tokens($theme));
       }
     }
@@ -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: m2-slide-toggle.get-density-tokens($theme);
   @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,6 +1,7 @@
 @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.
@@ -31,58 +32,55 @@
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
+  $system: m2-utils.get-system($theme);
   $theme-color-tokens: private-get-color-palette-color-tokens($theme, primary);
-  $is-dark: inspection.get-theme-type($theme) == dark;
-  $on-surface: if($is-dark, #fff, #000);
 
   @return map.merge(
     $theme-color-tokens,
     (
-      slider-disabled-active-track-color: inspection.get-theme-color($theme, system, on-surface),
-      slider-disabled-handle-color: inspection.get-theme-color($theme, system, on-surface),
-      slider-disabled-inactive-track-color: inspection.get-theme-color($theme, system, on-surface),
-      slider-label-container-color: $on-surface,
-      slider-label-label-text-color: if($is-dark, #000, #fff),
-      slider-value-indicator-opacity: if($is-dark, 0.9, 0.6),
-      slider-with-overlap-handle-outline-color: #fff,
-      slider-with-tick-marks-disabled-container-color:
-          inspection.get-theme-color($theme, system, on-surface),
+      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),
+      slider-label-container-color: map.get($system, inverse-surface),
+      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),
     ),
   );
 }
 
 // Generates tokens for the slider properties that change based on the theme.
-@function private-get-color-palette-color-tokens($theme, $palette-name) {
-  $color: inspection.get-theme-color($theme, $palette-name);
-  $hover-ripple-color: if($color == null, null, #{rgba($color, 0.05)});
-  $focus-ripple-color: if($color == null, null, #{rgba($color, 0.2)});
-  $on-color: inspection.get-theme-color($theme, $palette-name, default-contrast);
+@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: $color,
-    slider-focus-handle-color: $color,
-    slider-focus-state-layer-color: $focus-ripple-color,
-    slider-handle-color: $color,
-    slider-hover-handle-color: $color,
-    slider-hover-state-layer-color: $hover-ripple-color,
-    slider-inactive-track-color: $color,
-    slider-ripple-color: $color,
-    slider-with-tick-marks-active-container-color: $on-color,
-    slider-with-tick-marks-inactive-container-color: $color,
+    slider-active-track-color: map.get($system, primary),
+    slider-focus-handle-color: map.get($system, primary),
+    slider-handle-color: map.get($system, primary),
+    slider-hover-handle-color: map.get($system, primary),
+    slider-focus-state-layer-color: m3-utils.color-with-opacity(
+        map.get($system, primary), map.get($system, focus-state-layer-opacity)),
+    slider-hover-state-layer-color: m3-utils.color-with-opacity(
+        map.get($system, primary), map.get($system, hover-state-layer-opacity)),
+    slider-inactive-track-color: map.get($system, primary),
+    slider-ripple-color: map.get($system, primary),
+    slider-with-tick-marks-active-container-color: map.get($system, on-primary),
+    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) {
+  $system: m2-utils.get-system($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),
+    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),
   );
 }
 

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: m2-slider.get-unthemable-tokens();
   @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: m2-slider.get-color-tokens($theme);
   @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, accent));
-      }
+  @include token-utils.values($tokens);
 
-      .mat-warn {
-        @include token-utils.create-token-values-mixed(
-          m2-slider.private-get-color-palette-color-tokens($theme, warn));
-      }
+  @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: m2-slider.get-typography-tokens($theme);
   @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: m2-slider.get-density-tokens($theme);
   @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);
-      }
     }
   }
 }