@angular/material 20.1.0-next.2 → 20.1.0

package/button-toggle/_button-toggle-theme.scss

@@ -9,7 +9,7 @@
 /// for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-  $tokens: m2-button-toggle.get-unthemable-tokens($theme);
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-button-toggle.get-tokens($theme), base);
   }
@@ -22,7 +22,7 @@
 /// @param {String} $color-variant: The color variant to use for the button toggle: primary,
 ///        secondary, tertiary, or error (If not specified, default secondary color will be used).
 @mixin color($theme, $color-variant: null) {
-  $tokens: m2-button-toggle.get-color-tokens($theme);
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-button-toggle.get-tokens($theme, $color-variant), color);
   }
@@ -33,7 +33,7 @@
 /// Outputs typography theme styles for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
-  $tokens: m2-button-toggle.get-typography-tokens($theme);
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-button-toggle.get-tokens($theme), typography);
   }
@@ -44,7 +44,7 @@
 /// Outputs density theme styles for the mat-button-toggle.
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
-  $tokens: m2-button-toggle.get-density-tokens($theme);
+  $tokens: map.get(m2-button-toggle.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-button-toggle.get-tokens($theme), density);
   }

package/button-toggle/_m2-button-toggle.scss

@@ -1,85 +1,68 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 
-// Tokens that can't be configured through Angular Material's current theming API,
-// but may be in a future version of the theming API.
-@function get-unthemable-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
-  @return (
-    button-toggle-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    button-toggle-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    button-toggle-legacy-focus-state-layer-opacity: 1,
-    button-toggle-legacy-height: 36px,
-    button-toggle-legacy-shape: 2px,
-    button-toggle-shape: 4px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-
-  @return (
-    button-toggle-background-color: map.get($system, surface),
-    button-toggle-disabled-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-disabled-selected-state-text-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
-    button-toggle-disabled-state-background-color: map.get($system, surface),
-    button-toggle-disabled-state-text-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
-    button-toggle-divider-color: map.get($system, outline),
-    button-toggle-legacy-disabled-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-legacy-disabled-state-background-color: map.get($system, surface),
-    button-toggle-legacy-disabled-state-text-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
-    button-toggle-legacy-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-legacy-selected-state-text-color: map.get($system, on-surface),
-    button-toggle-legacy-state-layer-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-legacy-text-color: map.get($system, on-surface),
-    button-toggle-selected-state-background-color:
-        m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
-    button-toggle-selected-state-text-color: map.get($system, on-surface),
-    button-toggle-state-layer-color: map.get($system, on-surface),
-    button-toggle-text-color: map.get($system, on-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 (
-    button-toggle-label-text-font: map.get($system, body-large-font),
-    button-toggle-label-text-line-height: map.get($system, body-large-line-height),
-    button-toggle-label-text-size: map.get($system, body-large-size),
-    button-toggle-label-text-tracking: map.get($system, body-large-tracking),
-    button-toggle-label-text-weight: map.get($system, body-large-weight),
-    button-toggle-legacy-label-text-font: map.get($system, body-large-font),
-    button-toggle-legacy-label-text-line-height: map.get($system, body-large-line-height),
-    button-toggle-legacy-label-text-size: map.get($system, body-large-size),
-    button-toggle-legacy-label-text-tracking: map.get($system, body-large-tracking),
-    button-toggle-legacy-label-text-weight: map.get($system, body-large-weight),
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
-  $size-scale: (
-    0: 48px,
-    -1: 44px,
-    -2: 40px,
-    -3: 36px,
-    -4: 24px,
-  );
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
-    button-toggle-height: map.get($size-scale, $density-scale)
+    base: (
+      button-toggle-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      button-toggle-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      button-toggle-legacy-focus-state-layer-opacity: 1,
+      button-toggle-legacy-height: 36px,
+      button-toggle-legacy-shape: 2px,
+      button-toggle-shape: 4px,
+    ),
+    color: (
+      button-toggle-background-color: map.get($system, surface),
+      button-toggle-disabled-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-disabled-selected-state-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      button-toggle-disabled-state-background-color: map.get($system, surface),
+      button-toggle-disabled-state-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      button-toggle-divider-color: map.get($system, outline),
+      button-toggle-legacy-disabled-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-legacy-disabled-state-background-color: map.get($system, surface),
+      button-toggle-legacy-disabled-state-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      button-toggle-legacy-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-legacy-selected-state-text-color: map.get($system, on-surface),
+      button-toggle-legacy-state-layer-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-legacy-text-color: map.get($system, on-surface),
+      button-toggle-selected-state-background-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      button-toggle-selected-state-text-color: map.get($system, on-surface),
+      button-toggle-state-layer-color: map.get($system, on-surface),
+      button-toggle-text-color: map.get($system, on-surface),
+    ),
+    typography: (
+      button-toggle-label-text-font: map.get($system, body-large-font),
+      button-toggle-label-text-line-height: map.get($system, body-large-line-height),
+      button-toggle-label-text-size: map.get($system, body-large-size),
+      button-toggle-label-text-tracking: map.get($system, body-large-tracking),
+      button-toggle-label-text-weight: map.get($system, body-large-weight),
+      button-toggle-legacy-label-text-font: map.get($system, body-large-font),
+      button-toggle-legacy-label-text-line-height: map.get($system, body-large-line-height),
+      button-toggle-legacy-label-text-size: map.get($system, body-large-size),
+      button-toggle-legacy-label-text-tracking: map.get($system, body-large-tracking),
+      button-toggle-legacy-label-text-weight: map.get($system, body-large-weight),
+    ),
+    density: (
+      button-toggle-height: map.get((
+        0: 48px,
+        -1: 44px,
+        -2: 40px,
+        -3: 36px,
+        -4: 24px,
+      ), $density-scale)
+    ),
   );
 }

package/button-toggle/_m3-button-toggle.scss

@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-button-toggle.
@@ -56,7 +55,7 @@
       button-toggle-legacy-state-layer-color: null,
       button-toggle-legacy-text-color: null,
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 
   @return $tokens;

package/card/_card-theme.scss

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

package/card/_m2-card.scss

@@ -2,51 +2,38 @@
 @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 (
-    card-elevated-container-shape: 4px,
-    card-outlined-container-shape: 4px,
-    card-filled-container-shape: 4px,
-    card-outlined-outline-width: 1px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
   @return (
-    card-elevated-container-color: map.get($system, surface),
-    card-elevated-container-elevation: elevation.get-box-shadow(1),
-    card-outlined-container-color: map.get($system, surface),
-    card-outlined-container-elevation: elevation.get-box-shadow(0),
-    card-outlined-outline-color: map.get($system, outline),
-    card-subtitle-text-color: map.get($system, on-surface-variant),
-    card-filled-container-color: map.get($system, surface),
-    card-filled-container-elevation: elevation.get-box-shadow(0)
+    base: (
+      card-elevated-container-shape: 4px,
+      card-outlined-container-shape: 4px,
+      card-filled-container-shape: 4px,
+      card-outlined-outline-width: 1px,
+    ),
+    color: (
+      card-elevated-container-color: map.get($system, surface),
+      card-elevated-container-elevation: elevation.get-box-shadow(1),
+      card-outlined-container-color: map.get($system, surface),
+      card-outlined-container-elevation: elevation.get-box-shadow(0),
+      card-outlined-outline-color: map.get($system, outline),
+      card-subtitle-text-color: map.get($system, on-surface-variant),
+      card-filled-container-color: map.get($system, surface),
+      card-filled-container-elevation: elevation.get-box-shadow(0)
+    ),
+    typography: (
+      card-title-text-font: map.get($system, title-small-font),
+      card-title-text-line-height: map.get($system, title-small-line-height),
+      card-title-text-size: map.get($system, title-small-size),
+      card-title-text-tracking: map.get($system, title-small-tracking),
+      card-title-text-weight: map.get($system, title-small-weight),
+      card-subtitle-text-font: map.get($system, label-medium-font),
+      card-subtitle-text-line-height: map.get($system, label-medium-line-height),
+      card-subtitle-text-size: map.get($system, label-medium-size),
+      card-subtitle-text-tracking: map.get($system, label-medium-tracking),
+      card-subtitle-text-weight: map.get($system, label-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 (
-    card-title-text-font: map.get($system, title-small-font),
-    card-title-text-line-height: map.get($system, title-small-line-height),
-    card-title-text-size: map.get($system, title-small-size),
-    card-title-text-tracking: map.get($system, title-small-tracking),
-    card-title-text-weight: map.get($system, title-small-weight),
-    card-subtitle-text-font: map.get($system, label-medium-font),
-    card-subtitle-text-line-height: map.get($system, label-medium-line-height),
-    card-subtitle-text-size: map.get($system, label-medium-size),
-    card-subtitle-text-tracking: map.get($system, label-medium-tracking),
-    card-subtitle-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/checkbox/_checkbox-theme.scss

@@ -9,7 +9,7 @@
 /// for the mat-checkbox.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-  $tokens: m2-checkbox.get-unthemable-tokens($theme);
+  $tokens: map.get(m2-checkbox.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-checkbox.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
 @mixin color($theme, $color-variant: null) {
-  $tokens: m2-checkbox.get-color-tokens($theme, secondary);
+  $tokens: map.get(m2-checkbox.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-checkbox.get-tokens($theme, $color-variant), color);
   }
@@ -31,14 +31,16 @@
   @if inspection.get-theme-version($theme) != 1 {
     .mat-mdc-checkbox {
       &.mat-primary {
-        @include token-utils.values(m2-checkbox.get-color-tokens($theme, primary,
-          $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.private-get-color-palette-color-tokens(
+            $theme, primary,
+            $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
 
       &.mat-warn {
-        @include token-utils.values(m2-checkbox.get-color-tokens($theme, error,
-          $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
+        @include token-utils.values(m2-checkbox.private-get-color-palette-color-tokens(
+            $theme, error,
+            $exclude: (checkbox-disabled-label-color, checkbox-label-text-color))
         );
       }
     }
@@ -46,7 +48,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-checkbox.get-typography-tokens($theme);
+  $tokens: map.get(m2-checkbox.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-checkbox.get-tokens($theme), typography);
   }
@@ -55,7 +57,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-checkbox.get-density-tokens($theme);
+  $tokens: map.get(m2-checkbox.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-checkbox.get-tokens($theme), density);
   }

package/checkbox/_m2-checkbox.scss

@@ -2,29 +2,45 @@
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 
-// 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);
 
   @return (
-    checkbox-disabled-selected-checkmark-color: map.get($system, surface),
-    checkbox-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    checkbox-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    checkbox-selected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
-    checkbox-unselected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-    checkbox-unselected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    checkbox-unselected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+    base: (
+      checkbox-disabled-selected-checkmark-color: map.get($system, surface),
+      checkbox-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      checkbox-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      checkbox-selected-pressed-state-layer-opacity: map.get($system, pressed-state-layer-opacity),
+      checkbox-unselected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      checkbox-unselected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      checkbox-unselected-pressed-state-layer-opacity:
+          map.get($system, pressed-state-layer-opacity),
+    ),
+    color: private-get-color-palette-color-tokens($theme, secondary),
+    typography: (
+      checkbox-label-text-font: map.get($system, body-medium-font),
+      checkbox-label-text-line-height: map.get($system, body-medium-line-height),
+      checkbox-label-text-size: map.get($system, body-medium-size),
+      checkbox-label-text-tracking: map.get($system, body-medium-tracking),
+      checkbox-label-text-weight: map.get($system, body-medium-weight)
+    ),
+    density: (
+      checkbox-touch-target-display: if($density-scale < -1, none, block),
+      checkbox-state-layer-size: map.get((
+        0: 40px,
+        -1: 36px,
+        -2: 32px,
+        -3: 28px,
+      ), $density-scale)
+    ),
   );
 }
 
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant, $exclude: ()) {
+@function private-get-color-palette-color-tokens($theme, $color-variant, $exclude: ()) {
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, secondary, $color-variant);
-  $is-dark: inspection.get-theme-type($theme) == dark;
   $disabled: m3-utils.color-with-opacity(map.get($system, on-surface), 38%);
 
   $tokens: (
@@ -54,30 +70,3 @@
 
   @return $tokens;
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-  @return (
-    checkbox-label-text-font: map.get($system, body-medium-font),
-    checkbox-label-text-line-height: map.get($system, body-medium-line-height),
-    checkbox-label-text-size: map.get($system, body-medium-size),
-    checkbox-label-text-tracking: map.get($system, body-medium-tracking),
-    checkbox-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 (
-    checkbox-touch-target-display: if($scale < -1, none, block),
-    checkbox-state-layer-size: map.get((
-      0: 40px,
-      -1: 36px,
-      -2: 32px,
-      -3: 28px,
-    ), $scale)
-  );
-}

package/checkbox/_m3-checkbox.scss

@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for mat-checkbox.
@@ -52,7 +51,7 @@
       checkbox-label-text-tracking: map.get($system, body-medium-tracking),
       checkbox-label-text-weight: map.get($system, body-medium-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/chips/_chips-theme.scss

@@ -14,7 +14,7 @@
     @include token-utils.values(map.get(m3-chip.get-tokens($theme), base));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.values(m2-chip.get-unthemable-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), base));
     }
   }
 }
@@ -28,20 +28,23 @@
         map.get(m3-chip.get-tokens($theme, $color-variant), color));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.values(m2-chip.get-color-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), color));
 
       &.mat-mdc-chip-selected,
       &.mat-mdc-chip-highlighted {
         &.mat-primary {
-          @include token-utils.values(m2-chip.get-color-tokens($theme, primary));
+          @include token-utils.values(
+              m2-chip.private-get-color-palette-color-tokens($theme, primary));
         }
 
         &.mat-accent {
-          @include token-utils.values(m2-chip.get-color-tokens($theme, secondary));
+          @include token-utils.values(
+              m2-chip.private-get-color-palette-color-tokens($theme, secondary));
         }
 
         &.mat-warn {
-          @include token-utils.values(m2-chip.get-color-tokens($theme, error));
+          @include token-utils.values(
+              m2-chip.private-get-color-palette-color-tokens($theme, error));
         }
       }
     }
@@ -55,7 +58,7 @@
     @include token-utils.values(map.get(m3-chip.get-tokens($theme), typography));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.values(m2-chip.get-typography-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), typography));
     }
   }
 }
@@ -67,7 +70,7 @@
     @include token-utils.values(map.get(m3-chip.get-tokens($theme), density));
   } @else {
     .mat-mdc-chip.mat-mdc-standard-chip {
-      @include token-utils.values(m2-chip.get-density-tokens($theme));
+      @include token-utils.values(map.get(m2-chip.get-tokens($theme), density));
     }
   }
 }

package/chips/_m2-chip.scss

@@ -1,41 +1,55 @@
 @use 'sass:map';
-@use '../core/theming/inspection';
 @use '../core/theming/theming';
 @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), -2);
 
   @return (
-    chip-container-shape-radius: 16px,
-    chip-disabled-container-opacity: 0.4,
-    chip-disabled-outline-color: transparent,
-    chip-flat-selected-outline-width: 0,
-    chip-focus-outline-color: transparent,
-    chip-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    chip-outline-color: transparent,
-    chip-outline-width: 0,
-    chip-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    chip-selected-trailing-action-state-layer-color: transparent,
-    chip-trailing-action-focus-opacity: 1,
-    chip-trailing-action-focus-state-layer-opacity: 0,
-    chip-trailing-action-hover-state-layer-opacity: 0,
-    chip-trailing-action-opacity: 0.54,
-    chip-trailing-action-state-layer-color: transparent,
-    chip-with-avatar-avatar-shape-radius: 14px,
-    chip-with-avatar-avatar-size: 28px,
-    chip-with-avatar-disabled-avatar-opacity: 1,
-    chip-with-icon-disabled-icon-opacity: 1,
-    chip-with-icon-icon-size: 18px,
-    chip-with-trailing-icon-disabled-trailing-icon-opacity: 1,
+    base: (
+      chip-container-shape-radius: 16px,
+      chip-disabled-container-opacity: 0.4,
+      chip-disabled-outline-color: transparent,
+      chip-flat-selected-outline-width: 0,
+      chip-focus-outline-color: transparent,
+      chip-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      chip-outline-color: transparent,
+      chip-outline-width: 0,
+      chip-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      chip-selected-trailing-action-state-layer-color: transparent,
+      chip-trailing-action-focus-opacity: 1,
+      chip-trailing-action-focus-state-layer-opacity: 0,
+      chip-trailing-action-hover-state-layer-opacity: 0,
+      chip-trailing-action-opacity: 0.54,
+      chip-trailing-action-state-layer-color: transparent,
+      chip-with-avatar-avatar-shape-radius: 14px,
+      chip-with-avatar-avatar-size: 28px,
+      chip-with-avatar-disabled-avatar-opacity: 1,
+      chip-with-icon-disabled-icon-opacity: 1,
+      chip-with-icon-icon-size: 18px,
+      chip-with-trailing-icon-disabled-trailing-icon-opacity: 1,
+    ),
+    color: private-get-color-palette-color-tokens($theme, null),
+    typography: (
+      chip-label-text-font: map.get($system, body-medium-font),
+      chip-label-text-line-height: map.get($system, body-medium-line-height),
+      chip-label-text-size: map.get($system, body-medium-size),
+      chip-label-text-tracking: map.get($system, body-medium-tracking),
+      chip-label-text-weight: map.get($system, body-medium-weight)
+    ),
+    density: (
+      chip-container-height: map.get((
+        0: 32px,
+        -1: 28px,
+        -2: 24px), $density-scale)
+    ),
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant: null) {
+@function private-get-color-palette-color-tokens($theme, $color-variant: null) {
   $system: m2-utils.get-system($theme);
   $background: m3-utils.color-with-opacity(map.get($system, on-surface), 12%);
   $foreground: map.get($system, on-surface);
@@ -69,31 +83,3 @@
     chip-with-trailing-icon-trailing-icon-color: $foreground,
   );
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-  @return (
-    chip-label-text-font: map.get($system, body-medium-font),
-    chip-label-text-line-height: map.get($system, body-medium-line-height),
-    chip-label-text-size: map.get($system, body-medium-size),
-    chip-label-text-tracking: map.get($system, body-medium-tracking),
-    chip-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), -2);
-  @return (
-    // The height of the chip.
-    chip-container-height: map.get(
-        (
-          0: 32px,
-          -1: 28px,
-          -2: 24px,
-        ),
-        $scale
-    )
-  );
-}

package/chips/_m3-chip.scss

@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-chip.
@@ -67,7 +66,7 @@
       chip-label-text-tracking: map.get($system, label-large-tracking),
       chip-label-text-weight: map.get($system, label-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }