@angular/material 20.1.0-next.2 → 20.1.0

package/slide-toggle/_m2-slide-toggle.scss

@@ -1,98 +1,106 @@
 @use '../core/style/elevation';
-@use '../core/theming/inspection';
 @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.
-@function get-unthemable-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
-  // visible-track-opacity and hidden-track-opacity:
-  // The hidden and visible track represent whichever track is visible or
-  // hidden in the ui. This could be the .mdc-switch__track :before or
-  // :after depending on whether the switch is selected or unselected.
-  //
-  // The m2 slide-toggle uses transforms to hide & show the tracks while
-  // the m3 slide-toggle uses opacity.
   @return (
-    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,
-    slide-toggle-disabled-unselected-handle-opacity: 0.38,
-    slide-toggle-disabled-unselected-icon-opacity: 0.38,
-    slide-toggle-disabled-unselected-track-outline-color: transparent,
-    slide-toggle-disabled-unselected-track-outline-width: 1px,
-    slide-toggle-handle-height: 20px,
-    slide-toggle-handle-shape: 10px,
-    slide-toggle-handle-width: 20px,
-    slide-toggle-hidden-track-opacity: 1,
-    slide-toggle-hidden-track-transition: transform 75ms 0ms cubic-bezier(0.4, 0, 0.6, 1),
-    slide-toggle-pressed-handle-size: 20px,
-    slide-toggle-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    slide-toggle-selected-handle-horizontal-margin: 0,
-    slide-toggle-selected-handle-size: 20px,
-    slide-toggle-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    slide-toggle-selected-icon-size: 18px,
-    slide-toggle-selected-pressed-handle-horizontal-margin: 0,
-    slide-toggle-selected-pressed-state-layer-opacity:
-        map.get($system, pressed-state-layer-opacity),
-    slide-toggle-selected-track-outline-color: transparent,
-    slide-toggle-selected-track-outline-width: 1px,
-    slide-toggle-selected-with-icon-handle-horizontal-margin: 0,
-    slide-toggle-track-height: 14px,
-    slide-toggle-track-outline-color: transparent,
-    slide-toggle-track-outline-width: 1px,
-    slide-toggle-track-shape: 7px,
-    slide-toggle-track-width: 36px,
-    slide-toggle-unselected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    slide-toggle-unselected-handle-horizontal-margin: 0,
-    slide-toggle-unselected-handle-size: 20px,
-    slide-toggle-unselected-hover-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    slide-toggle-unselected-icon-size: 18px,
-    slide-toggle-unselected-pressed-handle-horizontal-margin: 0,
-    slide-toggle-unselected-pressed-state-layer-opacity: 0.1,
-    slide-toggle-unselected-with-icon-handle-horizontal-margin: 0,
-    slide-toggle-visible-track-opacity: 1,
-    slide-toggle-visible-track-transition: transform 75ms 0ms cubic-bezier(0, 0, 0.2, 1),
-    slide-toggle-with-icon-handle-size: 20px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-
-  @return map.merge(
-      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: 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: map.get($system, surface),
-        slide-toggle-label-text-color: map.get($system, on-surface),
-        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),
-      )
+    base: (
+      // visible-track-opacity and hidden-track-opacity:
+      // The hidden and visible track represent whichever track is visible or
+      // hidden in the ui. This could be the .mdc-switch__track :before or
+      // :after depending on whether the switch is selected or unselected.
+      //
+      // The m2 slide-toggle uses transforms to hide & show the tracks while
+      // the m3 slide-toggle uses opacity.
+      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,
+      slide-toggle-disabled-unselected-handle-opacity: 0.38,
+      slide-toggle-disabled-unselected-icon-opacity: 0.38,
+      slide-toggle-disabled-unselected-track-outline-color: transparent,
+      slide-toggle-disabled-unselected-track-outline-width: 1px,
+      slide-toggle-handle-height: 20px,
+      slide-toggle-handle-shape: 10px,
+      slide-toggle-handle-width: 20px,
+      slide-toggle-hidden-track-opacity: 1,
+      slide-toggle-hidden-track-transition: transform 75ms 0ms cubic-bezier(0.4, 0, 0.6, 1),
+      slide-toggle-pressed-handle-size: 20px,
+      slide-toggle-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      slide-toggle-selected-handle-horizontal-margin: 0,
+      slide-toggle-selected-handle-size: 20px,
+      slide-toggle-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      slide-toggle-selected-icon-size: 18px,
+      slide-toggle-selected-pressed-handle-horizontal-margin: 0,
+      slide-toggle-selected-pressed-state-layer-opacity:
+          map.get($system, pressed-state-layer-opacity),
+      slide-toggle-selected-track-outline-color: transparent,
+      slide-toggle-selected-track-outline-width: 1px,
+      slide-toggle-selected-with-icon-handle-horizontal-margin: 0,
+      slide-toggle-track-height: 14px,
+      slide-toggle-track-outline-color: transparent,
+      slide-toggle-track-outline-width: 1px,
+      slide-toggle-track-shape: 7px,
+      slide-toggle-track-width: 36px,
+      slide-toggle-unselected-focus-state-layer-opacity:
+          map.get($system, focus-state-layer-opacity),
+      slide-toggle-unselected-handle-horizontal-margin: 0,
+      slide-toggle-unselected-handle-size: 20px,
+      slide-toggle-unselected-hover-state-layer-opacity:
+          map.get($system, focus-state-layer-opacity),
+      slide-toggle-unselected-icon-size: 18px,
+      slide-toggle-unselected-pressed-handle-horizontal-margin: 0,
+      slide-toggle-unselected-pressed-state-layer-opacity: 0.1,
+      slide-toggle-unselected-with-icon-handle-horizontal-margin: 0,
+      slide-toggle-visible-track-opacity: 1,
+      slide-toggle-visible-track-transition: transform 75ms 0ms cubic-bezier(0, 0, 0.2, 1),
+      slide-toggle-with-icon-handle-size: 20px,
+    ),
+    color: map.merge(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: 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: map.get($system, surface),
+      slide-toggle-label-text-color: map.get($system, on-surface),
+      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))
+    ),
+    typography: (
+      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)
+    ),
+    density: (
+      slide-toggle-state-layer-size: map.get((
+        0: 40px,
+        -1: 36px,
+        -2: 32px,
+        -3: 28px,
+      ), $density-scale)
+    ),
   );
 }
 
@@ -117,30 +125,3 @@
     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: 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)
-  );
-}
-
-// 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), -3);
-
-  @return (
-    // The diameter of the handle ripple.
-    slide-toggle-state-layer-size: map.get((
-      0: 40px,
-      -1: 36px,
-      -2: 32px,
-      -3: 28px,
-    ), $scale)
-  );
-}

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

@@ -11,7 +11,7 @@
 /// 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);
+  $tokens: map.get(m2-slide-toggle.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-slide-toggle.get-tokens($theme), base);
   }
@@ -23,7 +23,7 @@
 /// @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);
+  $tokens: map.get(m2-slide-toggle.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-slide-toggle.get-tokens($theme, $color-variant), color);
   }
@@ -31,7 +31,7 @@
   @include token-utils.values($tokens);
 
   @if inspection.get-theme-version($theme) != 1 {
-    $mat-tokens: m2-slide-toggle.get-color-tokens($theme);
+    $mat-tokens: map.get(m2-slide-toggle.get-tokens($theme), color);
     $system: m2-utils.get-system($theme);
 
     .mat-mdc-slide-toggle {
@@ -58,11 +58,11 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       // TODO: See if this can be removed
-      @include token-utils.values(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.values(
-            m2-slide-toggle.get-typography-tokens($theme));
+            map.get(m2-slide-toggle.get-tokens($theme), typography));
       }
     }
   }
@@ -71,7 +71,7 @@
 /// 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);
+  $tokens: map.get(m2-slide-toggle.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-slide-toggle.get-tokens($theme), density);
   }

package/slider/_m2-slider.scss

@@ -3,41 +3,33 @@
 @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),
@@ -45,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: (),
   );
 }
 
@@ -54,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),
@@ -71,20 +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) {
-  $system: m2-utils.get-system($theme);
-  @return (
-    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),
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/slider/_slider-theme.scss

@@ -9,7 +9,7 @@
 /// for the mat-slider.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-  $tokens: m2-slider.get-unthemable-tokens();
+  $tokens: map.get(m2-slider.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-slider.get-tokens($theme), base);
   }
@@ -21,7 +21,7 @@
 /// @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);
+  $tokens: map.get(m2-slider.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-slider.get-tokens($theme, $color-variant), color);
   }
@@ -44,7 +44,7 @@
 /// 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);
+  $tokens: map.get(m2-slider.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-slider.get-tokens($theme), typography);
   }
@@ -55,7 +55,7 @@
 /// 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);
+  $tokens: map.get(m2-slider.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-slider.get-tokens($theme), density);
   }

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)
-      )
+    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 typography theming API.
-@function get-typography-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-  @return (
-    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),
-  );
-}
-
-// 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

@@ -6,7 +6,7 @@
 @use './m3-snack-bar';
 
 @mixin base($theme) {
-  $tokens: m2-snack-bar.get-unthemable-tokens();
+  $tokens: map.get(m2-snack-bar.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-snack-bar.get-tokens($theme), base);
   }
@@ -18,12 +18,12 @@
   @if inspection.get-theme-version($theme) == 1 {
     @include token-utils.values(map.get(m3-snack-bar.get-tokens($theme), color));
   } @else {
-    @include token-utils.values(m2-snack-bar.get-color-tokens($theme));
+    @include token-utils.values(map.get(m2-snack-bar.get-tokens($theme), color));
   }
 }
 
 @mixin typography($theme) {
-  $tokens: m2-snack-bar.get-typography-tokens($theme);
+  $tokens: map.get(m2-snack-bar.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-snack-bar.get-tokens($theme), typography);
   }
@@ -32,7 +32,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-snack-bar.get-density-tokens($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);
   }

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 ();
-}

package/sort/_sort-theme.scss

@@ -6,7 +6,7 @@
 @use '../core/tokens/token-utils';
 
 @mixin base($theme) {
-  $tokens: m2-sort.get-unthemable-tokens();
+  $tokens: map.get(m2-sort.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sort.get-tokens($theme), base);
   }
@@ -15,7 +15,7 @@
 }
 
 @mixin color($theme) {
-  $tokens: m2-sort.get-color-tokens($theme);
+  $tokens: map.get(m2-sort.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sort.get-tokens($theme), color);
   }
@@ -24,7 +24,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-sort.get-typography-tokens($theme);
+  $tokens: map.get(m2-sort.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sort.get-tokens($theme), typography);
   }
@@ -33,7 +33,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-sort.get-density-tokens($theme);
+  $tokens: map.get(m2-sort.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-sort.get-tokens($theme), density);
   }