@angular/material 20.0.0-rc.1 → 20.0.0-rc.2

package/checkbox/_m3-checkbox.scss

@@ -1,103 +1,68 @@
 @use 'sass:map';
 @use 'sass:list';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, checkbox);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for mat-checkbox.
-/// @param {Map} $systems The MDC system tokens
-/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
-/// @param {Map} $token-slots Possible token slots
-/// @return {Map} A set of custom tokens for mat-checkbox
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    disabled-label-color:
-        sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-    disabled-selected-checkmark-color: map.get($systems, md-sys-color, surface),
-    disabled-selected-icon-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-    disabled-unselected-icon-color: sass-utils.safe-color-change(
-        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
-    label-text-color: map.get($systems, md-sys-color, on-surface),
-    label-text-font: map.get($systems, md-sys-typescale, body-medium-font),
-    label-text-line-height: map.get($systems, md-sys-typescale, body-medium-line-height),
-    label-text-size: map.get($systems, md-sys-typescale, body-medium-size),
-    label-text-tracking: map.get($systems, md-sys-typescale, body-medium-tracking),
-    label-text-weight: map.get($systems, md-sys-typescale, body-medium-weight),
-    selected-checkmark-color: map.get($systems, md-sys-color, on-primary),
-    selected-focus-icon-color: map.get($systems, md-sys-color, primary),
-    selected-focus-state-layer-color: map.get($systems, md-sys-color, primary),
-    selected-focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-    selected-hover-icon-color: map.get($systems, md-sys-color, primary),
-    selected-hover-state-layer-color: map.get($systems, md-sys-color, primary),
-    selected-hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-    selected-icon-color: map.get($systems, md-sys-color, primary),
-    selected-pressed-icon-color: map.get($systems, md-sys-color, primary),
-    selected-pressed-state-layer-color: map.get($systems, md-sys-color, on-surface),
-    selected-pressed-state-layer-opacity:
-        map.get($systems, md-sys-state, pressed-state-layer-opacity),
-    unselected-focus-icon-color: map.get($systems, md-sys-color, on-surface),
-    unselected-focus-state-layer-color: map.get($systems, md-sys-color, on-surface),
-    unselected-focus-state-layer-opacity:
-        map.get($systems, md-sys-state, focus-state-layer-opacity),
-    unselected-hover-icon-color: map.get($systems, md-sys-color, on-surface),
-    unselected-hover-state-layer-color: map.get($systems, md-sys-color, on-surface),
-    unselected-hover-state-layer-opacity:
-        map.get($systems, md-sys-state, hover-state-layer-opacity),
-    unselected-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-    unselected-pressed-state-layer-color: map.get($systems, md-sys-color, primary),
-    unselected-pressed-state-layer-opacity:
-        map.get($systems, md-sys-state, pressed-state-layer-opacity),
-  );
+@function get-tokens($theme: m3.$sys-theme, $color-variant: null) {
+  $system: m3-utils.get-system($theme);
+  @if $color-variant {
+    $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
+  }
 
-  $variant-tokens: (
-    primary: (), // Default, no overrides needed
-    secondary: (
-      selected-focus-icon-color: map.get($systems, md-sys-color, secondary),
-      selected-focus-state-layer-color: map.get($systems, md-sys-color, secondary),
-      selected-hover-icon-color: map.get($systems, md-sys-color, secondary),
-      selected-hover-state-layer-color: map.get($systems, md-sys-color, secondary),
-      selected-icon-color: map.get($systems, md-sys-color, secondary),
-      selected-pressed-icon-color: map.get($systems, md-sys-color, secondary),
-      unselected-pressed-state-layer-color: map.get($systems, md-sys-color, secondary),
-      selected-checkmark-color: map.get($systems, md-sys-color, on-secondary),
+  @return (
+    base: (
+      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),
     ),
-    tertiary: (
-      selected-focus-icon-color: map.get($systems, md-sys-color, tertiary),
-      selected-focus-state-layer-color: map.get($systems, md-sys-color, tertiary),
-      selected-hover-icon-color: map.get($systems, md-sys-color, tertiary),
-      selected-hover-state-layer-color: map.get($systems, md-sys-color, tertiary),
-      selected-icon-color: map.get($systems, md-sys-color, tertiary),
-      selected-pressed-icon-color: map.get($systems, md-sys-color, tertiary),
-      unselected-pressed-state-layer-color: map.get($systems, md-sys-color, tertiary),
-      selected-checkmark-color: map.get($systems, md-sys-color, on-tertiary),
+    color: (
+      checkbox-disabled-label-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      checkbox-disabled-selected-checkmark-color: map.get($system, surface),
+      checkbox-disabled-selected-icon-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      checkbox-disabled-unselected-icon-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      checkbox-label-text-color: map.get($system, on-surface),
+      checkbox-selected-checkmark-color: map.get($system, on-primary),
+      checkbox-selected-focus-icon-color: map.get($system, primary),
+      checkbox-selected-focus-state-layer-color: map.get($system, primary),
+      checkbox-selected-hover-icon-color: map.get($system, primary),
+      checkbox-selected-hover-state-layer-color: map.get($system, primary),
+      checkbox-selected-icon-color: map.get($system, primary),
+      checkbox-selected-pressed-icon-color: map.get($system, primary),
+      checkbox-selected-pressed-state-layer-color: map.get($system, on-surface),
+      checkbox-unselected-focus-icon-color: map.get($system, on-surface),
+      checkbox-unselected-focus-state-layer-color: map.get($system, on-surface),
+      checkbox-unselected-hover-icon-color: map.get($system, on-surface),
+      checkbox-unselected-hover-state-layer-color: map.get($system, on-surface),
+      checkbox-unselected-icon-color: map.get($system, on-surface-variant),
+      checkbox-unselected-pressed-state-layer-color: map.get($system, primary),
     ),
-    error: (
-      selected-focus-icon-color: map.get($systems, md-sys-color, error),
-      selected-focus-state-layer-color: map.get($systems, md-sys-color, error),
-      selected-hover-icon-color: map.get($systems, md-sys-color, error),
-      selected-hover-state-layer-color: map.get($systems, md-sys-color, error),
-      selected-icon-color: map.get($systems, md-sys-color, error),
-      selected-pressed-icon-color: map.get($systems, md-sys-color, error),
-      unselected-pressed-state-layer-color: map.get($systems, md-sys-color, error),
-      selected-checkmark-color: map.get($systems, md-sys-color, on-error),
-    )
+    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: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
   );
-
-  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }
 
 // 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);
+@function get-density-tokens($scale) {
+  $scale: theming.clamp-density($scale, -3);
   $index: ($scale * -1) + 1;
 
   @return (
-    touch-target-display: list.nth((block, block, none, none), $index),
-    state-layer-size: list.nth((40px, 36px, 32px, 28px), $index)
+    checkbox-touch-target-display: list.nth((block, block, none, none), $index),
+    checkbox-state-layer-size: list.nth((40px, 36px, 32px, 28px), $index)
   );
 }

package/chips/_chips-theme.scss

@@ -4,51 +4,45 @@
 @use '../core/tokens/token-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/typography/typography';
+@use 'sass:map';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
 /// for the mat-chips.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), base));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(
-        m2-chip.$prefix, m2-chip.get-unthemable-tokens());
+      @include token-utils.create-token-values-mixed(m2-chip.get-unthemable-tokens());
     }
   }
 }
 
 /// Outputs color theme styles for the mat-chips.
 /// @param {Map} $theme The theme to generate color styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the selected chip: primary, secondary, tertiary,
-///      or error (If not specified, default secondary color will be used).
-@mixin color($theme, $options...) {
+/// @param {String} $color-variant The color variant to use for the component (M3 only)
+@mixin color($theme, $color-variant: null) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color), $options...);
+    @include token-utils.create-token-values(
+        map.get(m3-chip.get-tokens($theme, $color-variant), color));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(
-        m2-chip.$prefix, m2-chip.get-color-tokens($theme));
+      @include token-utils.create-token-values-mixed(m2-chip.get-color-tokens($theme));
 
       &.mat-mdc-chip-selected,
       &.mat-mdc-chip-highlighted {
         &.mat-primary {
-          @include token-utils.create-token-values-mixed(
-            m2-chip.$prefix, m2-chip.get-color-tokens($theme, primary));
+          @include token-utils.create-token-values-mixed(m2-chip.get-color-tokens($theme, primary));
         }
 
         &.mat-accent {
-          @include token-utils.create-token-values-mixed(
-            m2-chip.$prefix, m2-chip.get-color-tokens($theme, accent));
+          @include token-utils.create-token-values-mixed(m2-chip.get-color-tokens($theme, accent));
         }
 
         &.mat-warn {
-          @include token-utils.create-token-values-mixed(
-            m2-chip.$prefix, m2-chip.get-color-tokens($theme, warn));
+          @include token-utils.create-token-values-mixed(m2-chip.get-color-tokens($theme, warn));
         }
       }
     }
@@ -59,12 +53,10 @@
 /// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), typography));
   } @else {
     .mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(
-        m2-chip.$prefix, m2-chip.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-chip.get-typography-tokens($theme));
     }
   }
 }
@@ -73,12 +65,10 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(m3-chip.$prefix, m3-chip.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-chip.get-tokens($theme), density));
   } @else {
     .mat-mdc-chip.mat-mdc-standard-chip {
-      @include token-utils.create-token-values-mixed(
-        m2-chip.$prefix, m2-chip.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-chip.get-density-tokens($theme));
     }
   }
 }
@@ -87,8 +77,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-chip.$prefix,
-      tokens: m2-chip.get-token-slots(),
+      namespace: chip,
+      tokens: token-utils.get-overrides(m3-chip.get-tokens(), chip)
     ),
   );
 }
@@ -96,21 +86,19 @@
 /// Outputs the CSS variable values for the given tokens.
 /// @param {Map} $tokens The token values to emit.
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 /// Outputs all (base, color, typography, and density) theme styles for the mat-chips.
 /// @param {Map} $theme The theme to generate styles for.
-/// @param {ArgList} Additional optional arguments (only supported for M3 themes):
-///   $color-variant: The color variant to use for the selected chip: primary, secondary, tertiary,
-///      or error (If not specified, default secondary color will be used).
-@mixin theme($theme, $options...) {
+/// @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-chips') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme), $options...);
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
+      @include base($theme);
+      @include color($theme, $color-variant);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -125,11 +113,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens, $options...) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  $mat-chip-tokens: token-utils.get-tokens-for($tokens, m2-chip.$prefix, $options...);
-  @include token-utils.create-token-values(m2-chip.$prefix, $mat-chip-tokens);
-}

package/chips/_m2-chip.scss

@@ -7,34 +7,31 @@
 @use '../core/m2/palette' as m2-palette;
 @use '../core/theming/theming';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, chip);
-
 // 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 (
-    container-shape-radius: 16px,
-    disabled-container-opacity: 0.4,
-    disabled-outline-color: transparent,
-    flat-selected-outline-width: 0,
-    focus-outline-color: transparent,
-    hover-state-layer-opacity: 0.04,
-    outline-color: transparent,
-    outline-width: 0,
-    selected-hover-state-layer-opacity: 0.04,
-    selected-trailing-action-state-layer-color: transparent,
-    trailing-action-focus-opacity: 1,
-    trailing-action-focus-state-layer-opacity: 0,
-    trailing-action-hover-state-layer-opacity: 0,
-    trailing-action-opacity: 0.54,
-    trailing-action-state-layer-color: transparent,
-    with-avatar-avatar-shape-radius: 14px,
-    with-avatar-avatar-size: 28px,
-    with-avatar-disabled-avatar-opacity: 1,
-    with-icon-disabled-icon-opacity: 1,
-    with-icon-icon-size: 18px,
-    with-trailing-icon-disabled-trailing-icon-opacity: 1,
+    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: 0.04,
+    chip-outline-color: transparent,
+    chip-outline-width: 0,
+    chip-selected-hover-state-layer-opacity: 0.04,
+    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,
   );
 }
 
@@ -64,37 +61,37 @@ $prefix: (mat, chip);
     $foreground: inspection.get-theme-color($theme, $palette-name, default-contrast);
   }
   @return (
-    disabled-label-text-color: $foreground,
-    elevated-container-color: $background,
-    elevated-disabled-container-color: $background,
-    elevated-selected-container-color: $background,
-    flat-disabled-selected-container-color: $background,
-    focus-state-layer-color: $state-layer-color,
-    focus-state-layer-opacity: $state-layer-opacity,
-    hover-state-layer-color: $state-layer-color,
-    label-text-color: $foreground,
-    selected-disabled-trailing-icon-color: $foreground,
-    selected-focus-state-layer-color: $state-layer-color,
-    selected-focus-state-layer-opacity: $state-layer-opacity,
-    selected-hover-state-layer-color: $state-layer-color,
-    selected-label-text-color: $foreground,
-    selected-trailing-icon-color: $foreground,
-    with-icon-disabled-icon-color: $foreground,
-    with-icon-icon-color: $foreground,
-    with-icon-selected-icon-color: $foreground,
-    with-trailing-icon-disabled-trailing-icon-color: $foreground,
-    with-trailing-icon-trailing-icon-color: $foreground,
+    chip-disabled-label-text-color: $foreground,
+    chip-elevated-container-color: $background,
+    chip-elevated-disabled-container-color: $background,
+    chip-elevated-selected-container-color: $background,
+    chip-flat-disabled-selected-container-color: $background,
+    chip-focus-state-layer-color: $state-layer-color,
+    chip-focus-state-layer-opacity: $state-layer-opacity,
+    chip-hover-state-layer-color: $state-layer-color,
+    chip-label-text-color: $foreground,
+    chip-selected-disabled-trailing-icon-color: $foreground,
+    chip-selected-focus-state-layer-color: $state-layer-color,
+    chip-selected-focus-state-layer-opacity: $state-layer-opacity,
+    chip-selected-hover-state-layer-color: $state-layer-color,
+    chip-selected-label-text-color: $foreground,
+    chip-selected-trailing-icon-color: $foreground,
+    chip-with-icon-disabled-icon-color: $foreground,
+    chip-with-icon-icon-color: $foreground,
+    chip-with-icon-selected-icon-color: $foreground,
+    chip-with-trailing-icon-disabled-trailing-icon-color: $foreground,
+    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) {
   @return (
-    label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
-    label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
-    label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
+    chip-label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
+    chip-label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
+    chip-label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
+    chip-label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
+    chip-label-text-weight: inspection.get-theme-typography($theme, body-2, font-weight)
   );
 }
 
@@ -103,8 +100,7 @@ $prefix: (mat, chip);
   $scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
   @return (
     // The height of the chip.
-    container-height:
-    map.get(
+    chip-container-height: map.get(
         (
           0: 32px,
           -1: 28px,

package/chips/_m3-chip.scss

@@ -1,129 +1,82 @@
 @use 'sass:map';
 @use 'sass:list';
-@use '../core/style/sass-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, chip);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-chip.
-/// @param {Map} $systems The MDC system tokens
-/// @param {Boolean} $exclude-hardcoded Whether to exclude hardcoded token values
-/// @param {Map} $token-slots Possible token slots
-/// @return {Map} A set of custom tokens for the mat-chip
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  // MDC has a chip component, but they seem to have made up the tokens rather than using ones
-  // generated from the token database, therefore we need a custom token function for it.
-  $tokens: sass-utils.merge-all(
-      m3-utils.generate-typography-tokens($systems, label-text, label-large),
-      (
-        disabled-container-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
-        selected-trailing-icon-color: map.get($systems, md-sys-color, on-secondary-container),
-        selected-disabled-trailing-icon-color: map.get($systems, md-sys-color, on-surface),
-        trailing-action-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
-        selected-trailing-action-state-layer-color:
-        map.get($systems, md-sys-color, on-secondary-container),
-        trailing-action-hover-state-layer-opacity:
-        map.get($systems, md-sys-state, hover-state-layer-opacity),
-        trailing-action-focus-state-layer-opacity:
-        map.get($systems, md-sys-state, focus-state-layer-opacity),
-        trailing-action-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
-        trailing-action-focus-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
-        container-shape-radius: m3-utils.hardcode(8px, $exclude-hardcoded),
-        with-avatar-avatar-size: m3-utils.hardcode(24px, $exclude-hardcoded),
-        with-avatar-avatar-shape-radius: m3-utils.hardcode(24px, $exclude-hardcoded),
-        label-text-color: map.get($systems, md-sys-color, on-surface-variant),
-        disabled-label-text-color: sass-utils.safe-color-change(
-            map.get($systems, md-sys-color, on-surface),
-          $alpha: 0.38,
-        ),
-        with-icon-icon-size: m3-utils.hardcode(18px, $exclude-hardcoded),
-        with-icon-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-        with-icon-disabled-icon-color: map.get($systems, md-sys-color, on-surface),
-        with-icon-selected-icon-color: map.get($systems, md-sys-color, on-secondary-container),
-        with-trailing-icon-trailing-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-        with-trailing-icon-disabled-trailing-icon-color:
-            map.get($systems, md-sys-color, on-surface),
-        focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
-        focus-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
-        outline-width: m3-utils.hardcode(1px, $exclude-hardcoded),
-        outline-color: map.get($systems, md-sys-color, outline),
-        disabled-outline-color: sass-utils.safe-color-change(
-            map.get($systems, md-sys-color, on-surface),
-          $alpha: 0.12,
-        ),
-        focus-outline-color: map.get($systems, md-sys-color, on-surface-variant),
-        hover-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
-        hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
-        with-avatar-disabled-avatar-opacity: m3-utils.hardcode(0.38, $exclude-hardcoded),
-        elevated-selected-container-color: map.get($systems, md-sys-color, secondary-container),
-        // In the M3 tokens this is a `surface` color, but in the MDC implementation its
-        // never being emitted. We emit `transparent` so consumers override the color.
-        elevated-container-color: m3-utils.hardcode(transparent, $exclude-hardcoded),
-        flat-selected-outline-width: m3-utils.hardcode(0, $exclude-hardcoded),
-        selected-label-text-color: map.get($systems, md-sys-color, on-secondary-container),
-        flat-disabled-selected-container-color: sass-utils.safe-color-change(
-            map.get($systems, md-sys-color, on-surface),
-          $alpha: 0.12,
-        ),
-        selected-hover-state-layer-color: map.get($systems, md-sys-color, on-secondary-container),
-        selected-hover-state-layer-opacity:
-        map.get($systems, md-sys-state, hover-state-layer-opacity),
-        selected-focus-state-layer-color: map.get($systems, md-sys-color, on-secondary-container),
-        selected-focus-state-layer-opacity:
-        map.get($systems, md-sys-state, focus-state-layer-opacity),
-        with-icon-disabled-icon-opacity: m3-utils.hardcode(0.38, $exclude-hardcoded),
-        with-trailing-icon-disabled-trailing-icon-opacity:
-        m3-utils.hardcode(0.38, $exclude-hardcoded),
-      ),
-  );
+@function get-tokens($theme: m3.$sys-theme, $color-variant: null) {
+  $system: m3-utils.get-system($theme);
+  @if $color-variant {
+    $system: m3-utils.replace-colors-with-variant($system, secondary, $color-variant);
+  }
 
-  $variant-tokens: (
-    // Color variants:
-    primary: (
-      selected-trailing-icon-color: map.get($systems, md-sys-color, on-primary-container),
-      selected-trailing-action-state-layer-color:
-      map.get($systems, md-sys-color, on-primary-container),
-      with-icon-selected-icon-color: map.get($systems, md-sys-color, on-primary-container),
-      elevated-selected-container-color: map.get($systems, md-sys-color, primary-container),
-      selected-label-text-color: map.get($systems, md-sys-color, on-primary-container),
-      selected-hover-state-layer-color: map.get($systems, md-sys-color, on-primary-container),
-      selected-focus-state-layer-color: map.get($systems, md-sys-color, on-primary-container),
+  @return (
+    base: (
+      chip-container-shape-radius: 8px,
+      chip-disabled-container-opacity: 1,
+      chip-elevated-container-color: transparent, // surface in M3, but not emitted in MDC
+      chip-flat-selected-outline-width: 0,
+      chip-outline-width: 1px,
+      chip-trailing-action-focus-opacity: 1,
+      chip-trailing-action-opacity: 1,
+      chip-with-avatar-avatar-shape-radius: 24px,
+      chip-with-avatar-avatar-size: 24px,
+      chip-with-avatar-disabled-avatar-opacity: 0.38,
+      chip-with-icon-disabled-icon-opacity: 0.38,
+      chip-with-icon-icon-size: 18px,
+      chip-with-trailing-icon-disabled-trailing-icon-opacity: 0.38,
     ),
-    secondary: (), // Default, no overrides needed.
-    tertiary: (
-      selected-trailing-icon-color: map.get($systems, md-sys-color, on-tertiary-container),
-      selected-trailing-action-state-layer-color:
-      map.get($systems, md-sys-color, on-tertiary-container),
-      with-icon-selected-icon-color: map.get($systems, md-sys-color, on-tertiary-container),
-      elevated-selected-container-color: map.get($systems, md-sys-color, tertiary-container),
-      selected-label-text-color: map.get($systems, md-sys-color, on-tertiary-container),
-      selected-hover-state-layer-color: map.get($systems, md-sys-color, on-tertiary-container),
-      selected-focus-state-layer-color: map.get($systems, md-sys-color, on-tertiary-container),
+    color: (
+      chip-disabled-label-text-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+      chip-disabled-outline-color: m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      chip-elevated-selected-container-color: map.get($system, secondary-container),
+      chip-flat-disabled-selected-container-color:
+          m3-utils.color-with-opacity(map.get($system, on-surface), 12%),
+      chip-focus-outline-color: map.get($system, on-surface-variant),
+      chip-focus-state-layer-color: map.get($system, on-surface-variant),
+      chip-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      chip-hover-state-layer-color: map.get($system, on-surface-variant),
+      chip-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      chip-label-text-color: map.get($system, on-surface-variant),
+      chip-outline-color: map.get($system, outline),
+      chip-selected-disabled-trailing-icon-color: map.get($system, on-surface),
+      chip-selected-focus-state-layer-color: map.get($system, on-secondary-container),
+      chip-selected-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      chip-selected-hover-state-layer-color: map.get($system, on-secondary-container),
+      chip-selected-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      chip-selected-label-text-color: map.get($system, on-secondary-container),
+      chip-selected-trailing-action-state-layer-color: map.get($system, on-secondary-container),
+      chip-selected-trailing-icon-color: map.get($system, on-secondary-container),
+      chip-trailing-action-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+      chip-trailing-action-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      chip-trailing-action-state-layer-color: map.get($system, on-surface-variant),
+      chip-with-icon-disabled-icon-color: map.get($system, on-surface),
+      chip-with-icon-icon-color: map.get($system, on-surface-variant),
+      chip-with-icon-selected-icon-color: map.get($system, on-secondary-container),
+      chip-with-trailing-icon-disabled-trailing-icon-color:map.get($system, on-surface),
+      chip-with-trailing-icon-trailing-icon-color: map.get($system, on-surface-variant),
+      chip-elevated-disabled-container-color: null,
     ),
-    error: (
-      selected-trailing-icon-color: map.get($systems, md-sys-color, on-error-container),
-      selected-trailing-action-state-layer-color:
-      map.get($systems, md-sys-color, on-error-container),
-      with-icon-selected-icon-color: map.get($systems, md-sys-color, on-error-container),
-      elevated-selected-container-color: map.get($systems, md-sys-color, error-container),
-      selected-label-text-color: map.get($systems, md-sys-color, on-error-container),
-      selected-hover-state-layer-color: map.get($systems, md-sys-color, on-error-container),
-      selected-focus-state-layer-color: map.get($systems, md-sys-color, on-error-container),
-    )
+    typography: (
+      chip-label-text-font: map.get($system, label-large-font),
+      chip-label-text-line-height: map.get($system, label-large-line-height),
+      chip-label-text-size: map.get($system, label-large-size),
+      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)),
   );
-
-  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }
 
 // 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);
+@function get-density-tokens($scale) {
+  $scale: theming.clamp-density($scale, -2);
   $index: ($scale * -1) + 1;
 
   @return (
-    container-height: list.nth((32px, 28px, 24px), $index),
+    chip-container-height: list.nth((32px, 28px, 24px), $index),
   );
 }