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

package/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss

@@ -1,32 +1,21 @@
-@use '../../theming/theming';
 @use '../../theming/inspection';
-@use '../../style/sass-utils';
 @use '../../tokens/token-utils';
 @use './m2-pseudo-checkbox';
 @use './m3-pseudo-checkbox';
 @use 'sass:map';
 
 @mixin _palette-styles($theme, $palette-name) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values-mixed(
-        m2-pseudo-checkbox.get-color-tokens($theme, $palette-name));
-  }
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), color);
+  @include token-utils.values($tokens);
 }
 
-/// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
-/// for the mat-pseudo-checkbox.
-/// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-}
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), base);
+  @if inspection.get-theme-version($theme) == 1 {
+    $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme), base);
+  }
 
-/// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
-@function _define-overrides() {
-  @return (
-    (
-      namespace: pseudo-checkbox,
-      tokens: token-utils.get-overrides(m3-pseudo-checkbox.get-tokens(), pseudo-checkbox)
-    ),
-  );
+  @include token-utils.values($tokens);
 }
 
 /// Outputs the CSS variable values for the given tokens.
@@ -39,62 +28,83 @@
 /// @param {Map} $theme The theme to generate color styles for.
 /// @param {String} $color-variant The color variant to use for the component (M3 only)
 @mixin color($theme, $color-variant: null) {
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        map.get(m3-pseudo-checkbox.get-tokens($theme, $color-variant), color));
-  } @else {
+    $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme, $color-variant), color);
+  }
+
+  @include token-utils.values($tokens);
+
+  @if inspection.get-theme-version($theme) != 1 {
     // Default to the accent color. Note that the pseudo checkboxes are meant to inherit the
     // theme from their parent, rather than implementing their own theming, which is why we
     // don't attach to the `mat-*` classes. Also note that this needs to be below `.mat-primary`
     // in order to allow for the color to be overwritten if the checkbox is inside a parent that
     // has `mat-accent` and is placed inside another parent that has `mat-primary`.
-    @include _palette-styles($theme, secondary);
-
     .mat-primary {
-      @include _palette-styles($theme, primary);
+      $tokens: m2-pseudo-checkbox.private-get-color-palette-color-tokens($theme, primary);
+      @include token-utils.values($tokens);
     }
 
     .mat-accent {
-      @include _palette-styles($theme, secondary);
+      $tokens: m2-pseudo-checkbox.private-get-color-palette-color-tokens($theme, secondary);
+      @include token-utils.values($tokens);
     }
 
     .mat-warn {
-      @include _palette-styles($theme, error);
+      $tokens: m2-pseudo-checkbox.private-get-color-palette-color-tokens($theme, error);
+      @include token-utils.values($tokens);
     }
   }
 }
 
-/// Outputs typography theme styles for the mat-pseudo-checkbox.
-/// @param {Map} $theme The theme to generate typography styles for.
 @mixin typography($theme) {
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), typography);
+  @if inspection.get-theme-version($theme) == 1 {
+    $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme), typography);
+  }
+
+  @include token-utils.values($tokens);
 }
 
-/// Outputs density theme styles for the mat-pseudo-checkbox.
-/// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
+  $tokens: map.get(m2-pseudo-checkbox.get-tokens($theme), density);
+  @if inspection.get-theme-version($theme) == 1 {
+    $tokens: map.get(m3-pseudo-checkbox.get-tokens($theme), density);
+  }
+
+  @include token-utils.values($tokens);
+}
+
+/// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
+@function _define-overrides() {
+  @return (
+    (
+      namespace: pseudo-checkbox,
+      tokens: token-utils.get-overrides(m3-pseudo-checkbox.get-tokens(), pseudo-checkbox)
+    ),
+  );
 }
 
 /// Outputs all (base, color, typography, and density) theme styles for the mat-pseudo-checkbox.
 /// @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-pseudo-checkbox') {
-    @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/core/theming/_all-theme.scss

@@ -37,51 +37,47 @@
 @use '../../snack-bar/snack-bar-theme';
 @use '../../form-field/form-field-theme';
 @use '../../timepicker/timepicker-theme';
-@use './theming';
 
 // Create a theme.
 @mixin all-component-themes($theme) {
-  $dedupe-key: 'angular-material-theme';
-  @include theming.private-check-duplicate-theme-styles($theme, $dedupe-key) {
-    @include core-theme.theme($theme);
-    @include card-theme.theme($theme);
-    @include progress-bar-theme.theme($theme);
-    @include tooltip-theme.theme($theme);
-    @include form-field-theme.theme($theme);
-    @include input-theme.theme($theme);
-    @include select-theme.theme($theme);
-    @include autocomplete-theme.theme($theme);
-    @include dialog-theme.theme($theme);
-    @include chips-theme.theme($theme);
-    @include slide-toggle-theme.theme($theme);
-    @include radio-theme.theme($theme);
-    @include slider-theme.theme($theme);
-    @include menu-theme.theme($theme);
-    @include list-theme.theme($theme);
-    @include paginator-theme.theme($theme);
-    @include tabs-theme.theme($theme);
-    @include checkbox-theme.theme($theme);
-    @include button-theme.theme($theme);
-    @include icon-button-theme.theme($theme);
-    @include fab-theme.theme($theme);
-    @include snack-bar-theme.theme($theme);
-    @include table-theme.theme($theme);
-    @include progress-spinner-theme.theme($theme);
-    @include badge-theme.theme($theme);
-    @include bottom-sheet-theme.theme($theme);
-    @include button-toggle-theme.theme($theme);
-    @include datepicker-theme.theme($theme);
-    @include divider-theme.theme($theme);
-    @include expansion-theme.theme($theme);
-    @include grid-list-theme.theme($theme);
-    @include icon-theme.theme($theme);
-    @include sidenav-theme.theme($theme);
-    @include stepper-theme.theme($theme);
-    @include sort-theme.theme($theme);
-    @include toolbar-theme.theme($theme);
-    @include tree-theme.theme($theme);
-    @include timepicker-theme.theme($theme);
-  }
+  @include core-theme.theme($theme);
+  @include card-theme.theme($theme);
+  @include progress-bar-theme.theme($theme);
+  @include tooltip-theme.theme($theme);
+  @include form-field-theme.theme($theme);
+  @include input-theme.theme($theme);
+  @include select-theme.theme($theme);
+  @include autocomplete-theme.theme($theme);
+  @include dialog-theme.theme($theme);
+  @include chips-theme.theme($theme);
+  @include slide-toggle-theme.theme($theme);
+  @include radio-theme.theme($theme);
+  @include slider-theme.theme($theme);
+  @include menu-theme.theme($theme);
+  @include list-theme.theme($theme);
+  @include paginator-theme.theme($theme);
+  @include tabs-theme.theme($theme);
+  @include checkbox-theme.theme($theme);
+  @include button-theme.theme($theme);
+  @include icon-button-theme.theme($theme);
+  @include fab-theme.theme($theme);
+  @include snack-bar-theme.theme($theme);
+  @include table-theme.theme($theme);
+  @include progress-spinner-theme.theme($theme);
+  @include badge-theme.theme($theme);
+  @include bottom-sheet-theme.theme($theme);
+  @include button-toggle-theme.theme($theme);
+  @include datepicker-theme.theme($theme);
+  @include divider-theme.theme($theme);
+  @include expansion-theme.theme($theme);
+  @include grid-list-theme.theme($theme);
+  @include icon-theme.theme($theme);
+  @include sidenav-theme.theme($theme);
+  @include stepper-theme.theme($theme);
+  @include sort-theme.theme($theme);
+  @include toolbar-theme.theme($theme);
+  @include tree-theme.theme($theme);
+  @include timepicker-theme.theme($theme);
 }
 
 @mixin all-component-bases($theme) {

package/core/theming/_definition.scss

@@ -76,7 +76,29 @@ $theme-version: 1;
   // density
   $density-scale: map.get($density-config, scale) or 0;
 
+  $system-maps: (
+    m3-tokens.get-sys-color($type, $palettes, $color-system-variables-prefix),
+    m3.md-sys-elevation-values(),
+    m3.md-sys-motion-values(),
+    m3.md-sys-shape-values(),
+    m3.md-sys-state-values(),
+    (
+      // Form field native select option text color
+      neutral10: map.get($palettes, neutral, 10),
+      // Sidenav scrim (container background shadow when opened),
+      neutral-variant20: map.get($palettes, neutral-variant, 20),
+    ),
+    m3-tokens.get-sys-typeface($typography, $typography-system-variables-prefix),
+  );
+  $system: (
+    density-scale: $density-scale,
+  );
+  @each $sys-map in $system-maps {
+    $system: map.merge($system, $sys-map);
+  }
+
   @return (
+    _mat-system: $system,
     $internals: (
       base-tokens: m3-tokens.generate-base-tokens(),
       color-system-variables-prefix: $color-system-variables-prefix,
@@ -84,19 +106,6 @@ $theme-version: 1;
         m3-tokens.generate-color-tokens($type, $palettes, $color-system-variables-prefix),
       density-scale: $density-scale,
       font-definition: $typography,
-      md-sys-color: m3-tokens.get-sys-color($type, $palettes, $color-system-variables-prefix),
-      md-sys-elevation: m3.md-sys-elevation-values(),
-      md-sys-motion: m3.md-sys-motion-values(),
-      md-sys-shape: m3.md-sys-shape-values(),
-      md-sys-state: m3.md-sys-state-values(),
-      md-ref-palette: (
-        // Form field native select option text color
-        neutral10: map.get($palettes, neutral, 10),
-        // Sidenav scrim (container background shadow when opened),
-        neutral-variant20: map.get($palettes, neutral-variant, 20),
-      ),
-      md-sys-typescale:
-        m3-tokens.get-sys-typeface($typography, $typography-system-variables-prefix),
       palettes: $palettes,
       theme-type: $type,
       theme-version: $theme-version,

package/core/theming/_inspection.scss

@@ -279,15 +279,3 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
     @return $theme;
   }
 }
-
-/// Gets a version of the theme with a modified typography config that preserves old behavior in
-/// some components that previously used `private-typography-to-2014-config`.
-/// Do not introduce new usages of this, it should be cleaned up and removed.
-/// @deprecated
-@function private-get-typography-back-compat-theme($theme) {
-  @return if(
-      get-theme-version($theme) == 0,
-      m2-inspection.private-get-typography-back-compat-theme($theme),
-      $theme
-  );
-}

package/core/theming/_m2-inspection.scss

@@ -235,36 +235,3 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
   }
   @return $theme;
 }
-
-/// Gets a version of the theme with a modified typography config that preserves old behavior in
-/// some components that previously used `private-typography-to-2014-config`.
-/// Do not introduce new usages of this, it should be cleaned up and removed.
-/// @deprecated
-@function private-get-typography-back-compat-theme($theme) {
-  // It is possible for a user to pass a "density theme" that is just a number.
-  @if meta.type-of($theme) != 'map' {
-    @return $theme;
-  }
-  $internal: map.get($theme, $_internals, m2-config);
-  $theme: map.remove($theme, $_internals);
-  @if theme-has($theme, typography) {
-    $typography-config: m2-theming.get-typography-config($theme);
-    // gmat configs have both 2018 and 2014 keys.
-    @if (not typography-versioning.private-typography-is-2014-config($typography-config)) or
-        (not typography-versioning.private-typography-is-2018-config($typography-config)) {
-      @return $theme;
-    }
-    $new-typography-config: typography-versioning.private-typography-to-2018-config(
-        $typography-config, true);
-    // subtitle-2 is mapped differently by `private-typography-to-2014-config`.
-    $new-typography-config: map.set(
-        $new-typography-config, subtitle-2, map.get($new-typography-config, body-1));
-    $theme: if($theme == $typography-config, $new-typography-config,
-      map.set($theme, typography, $new-typography-config));
-  }
-  @if $internal {
-    $internal: private-get-typography-back-compat-theme($internal);
-    $theme: map.set($theme, $_internals, m2-config, $internal);
-  }
-  @return $theme;
-}

package/core/theming/_theming.scss

@@ -4,19 +4,16 @@
 @use 'sass:meta';
 @use 'sass:color';
 
+// Deprecated flag that is no longer used to control duplication warnings.
+// Remove in v22
+$theme-ignore-duplication-warnings: false;
+
 // Whether to enable compatibility with legacy methods for accessing theme information.
 $theme-legacy-inspection-api-compatibility: true !default;
 
-// Whether duplication warnings should be disabled. Warnings enabled by default.
-$theme-ignore-duplication-warnings: false !default;
-
 // Whether density should be generated by default.
 $_generate-default-density: true !default;
 
-// Warning that will be printed if duplicated styles are generated by a theme.
-$_duplicate-warning: 'Read more about how style duplication can be avoided in a dedicated ' +
-  'guide. https://v18.material.angular.dev/guide/duplicate-theming-styles';
-
 // Warning that will be printed if the legacy theming API is used.
 $private-legacy-theme-warning: 'Angular Material themes should be created from a map containing ' +
   'the keys "color", "typography", and "density". The color value should be a map containing the ' +
@@ -40,46 +37,6 @@ $_emitted-base: () !default;
 
 $private-internal-name: _mat-theming-internals-do-not-access;
 
-// Checks if configurations that have been declared in the given theme have been generated
-// before. If so, warnings will be reported. This should notify developers in case duplicate
-// styles are accidentally generated due to wrong usage of the all-theme mixins.
-//
-// Additionally, this mixin controls the default value for the density configuration. By
-// default, density styles are generated at scale zero. If the same density styles would be
-// generated a second time though, the default value will change to avoid duplicate styles.
-//
-// The mixin keeps track of all configurations in a list that is scoped to the specified
-// id. This is necessary because a given theme can be passed to multiple disjoint theme mixins
-// (e.g. `all-component-themes` and `all-legacy-component-themes`) without causing any
-// style duplication.
-@mixin private-check-duplicate-theme-styles($theme-or-color-config, $id) {
-  // TODO(mmalerba): use get-theme-version for this check when its moved out of experimental.
-  @if map.get($theme-or-color-config, $private-internal-name, theme-version) == 1 {
-    @include _check-duplicate-theme-styles-v1($theme-or-color-config, $id) {
-      // Optionally, consumers of this mixin can wrap contents inside so that nested
-      // duplicate style checks do not report another warning. e.g. if developers include
-      // the `all-component-themes` mixin twice, only the top-level duplicate styles check
-      // should report a warning. Not all individual components should report a warning too.
-      $orig-mat-theme-ignore-duplication-warnings: $theme-ignore-duplication-warnings;
-      $theme-ignore-duplication-warnings: true !global;
-      @content;
-      $theme-ignore-duplication-warnings: $orig-mat-theme-ignore-duplication-warnings !global;
-    }
-  }
-  @else {
-    @include _check-duplicate-theme-styles-v0($theme-or-color-config, $id) {
-      // Optionally, consumers of this mixin can wrap contents inside so that nested
-      // duplicate style checks do not report another warning. e.g. if developers include
-      // the `all-component-themes` mixin twice, only the top-level duplicate styles check
-      // should report a warning. Not all individual components should report a warning too.
-      $orig-mat-theme-ignore-duplication-warnings: $theme-ignore-duplication-warnings;
-      $theme-ignore-duplication-warnings: true !global;
-      @content;
-      $theme-ignore-duplication-warnings: $orig-mat-theme-ignore-duplication-warnings !global;
-    }
-  }
-}
-
 /// Strip out any settings map entries that have empty values (null or ()).
 @function _strip-empty-settings($settings) {
   $result: ();
@@ -91,131 +48,6 @@ $private-internal-name: _mat-theming-internals-do-not-access;
   @return if($result == (), null, $result);
 }
 
-// Checks for duplicate styles in a `theme-version: 1` style theme.
-@mixin _check-duplicate-theme-styles-v1($theme-or-color-config, $id) {
-  $color-settings: _strip-empty-settings((
-    theme-type: map.get($theme-or-color-config, $private-internal-name, theme-type),
-    color-tokens: map.get($theme-or-color-config, $private-internal-name, color-tokens),
-  ));
-  $typography-settings: _strip-empty-settings((
-    typography-tokens:
-      map.get($theme-or-color-config, $private-internal-name, typography-tokens),
-  ));
-  $density-settings: _strip-empty-settings((
-    density-scale:
-      map.get($theme-or-color-config, $private-internal-name, density-scale),
-    density-tokens:
-      map.get($theme-or-color-config, $private-internal-name, density-tokens),
-  ));
-  $base-settings: _strip-empty-settings((
-    base-tokens: map.get($theme-or-color-config, $private-internal-name, base-tokens),
-  ));
-  $previous-color-settings: map.get($_emitted-color, $id) or ();
-  $previous-typography-settings: map.get($_emitted-typography, $id) or ();
-  $previous-density-settings: map.get($_emitted-density, $id) or ();
-  $previous-base-settings: map.get($_emitted-base, $id) or ();
-
-  // Check if the color configuration has been generated before.
-  @if $color-settings != null {
-    @if list.index($previous-color-settings, $color-settings) != null and
-        not $theme-ignore-duplication-warnings {
-      @warn 'The same color styles are generated multiple times. ' + $_duplicate-warning;
-    }
-    $previous-color-settings: list.append($previous-color-settings, $color-settings);
-  }
-
-  // Check if the typography configuration has been generated before.
-  @if $typography-settings != null {
-    @if list.index($previous-typography-settings, $typography-settings) != null and
-        not $theme-ignore-duplication-warnings {
-      @warn 'The same typography styles are generated multiple times. ' + $_duplicate-warning;
-    }
-    $previous-typography-settings: list.append($previous-typography-settings, $typography-settings);
-  }
-
-  // Check if the density configuration has been generated before.
-  @if $density-settings != null {
-    @if list.index($previous-density-settings, $density-settings) != null and
-        not $theme-ignore-duplication-warnings {
-      @warn 'The same density styles are generated multiple times. ' + $_duplicate-warning;
-    }
-    $previous-density-settings: list.append($previous-density-settings, $density-settings);
-  }
-
-  // Check if the base configuration has been generated before.
-  @if $base-settings != null {
-    @if list.index($previous-base-settings, $base-settings) != null and
-        not $theme-ignore-duplication-warnings {
-      @warn 'The same base theme styles are generated multiple times. ' + $_duplicate-warning;
-    }
-    $previous-base-settings: list.append($previous-base-settings, $base-settings);
-  }
-
-  $_emitted-color: map.set($_emitted-color, $id, $previous-color-settings) !global;
-  $_emitted-density: map.set($_emitted-density, $id, $previous-density-settings) !global;
-  $_emitted-typography: map.set($_emitted-typography, $id, $previous-typography-settings) !global;
-  $_emitted-base: map.set($_emitted-base, $id, $previous-base-settings) !global;
-
-  @content;
-}
-
-// Checks for duplicate styles in a `theme-version: 0` style theme.
-@mixin _check-duplicate-theme-styles-v0($theme-or-color-config, $id) {
-  $theme: private-legacy-get-theme($theme-or-color-config);
-  $color-config: map.get($theme, $private-internal-name, m2-config, color) or
-    private-get-color-config($theme);
-  $density-config: map.get($theme, $private-internal-name, m2-config, density) or
-    private-get-density-config($theme);
-  $typography-config: map.get($theme, $private-internal-name, m2-config, typography) or
-    private-get-typography-config($theme);
-  // Lists of previous `color`, `density` and `typography` configurations.
-  $previous-color: map.get($_emitted-color, $id) or ();
-  $previous-typography: map.get($_emitted-typography, $id) or ();
-  $previous-density: map.get($_emitted-density, $id) or ();
-  // Whether duplicate legacy density styles would be generated.
-  $duplicate-legacy-density: false;
-
-  // Check if the color configuration has been generated before.
-  @if $color-config != null {
-    @if list.index($previous-color, $color-config) != null and
-        not $theme-ignore-duplication-warnings {
-      @warn 'The same color styles are generated multiple times. ' + $_duplicate-warning;
-    }
-    $previous-color: list.append($previous-color, $color-config);
-  }
-
-  // Check if the typography configuration has been generated before.
-  @if $typography-config != null {
-    @if list.index($previous-typography, $typography-config) != null and
-        not $theme-ignore-duplication-warnings {
-      @warn 'The same typography styles are generated multiple times. ' + $_duplicate-warning;
-    }
-    $previous-typography: list.append($previous-typography, $typography-config);
-  }
-
-  // Check if the density configuration has been generated before.
-  @if $density-config != null {
-    @if list.index($previous-density, $density-config) != null {
-      // Only report a warning if density styles would be duplicated for non-legacy theme
-      // definitions. For legacy themes, we have compatibility logic that avoids duplication
-      // of default density styles. We don't want to report a warning in those cases.
-      @if private-is-legacy-constructed-theme($theme) {
-        $duplicate-legacy-density: true;
-      }
-      @else if not $theme-ignore-duplication-warnings {
-        @warn 'The same density styles are generated multiple times. ' + $_duplicate-warning;
-      }
-    }
-    $previous-density: list.append($previous-density, $density-config);
-  }
-
-  $_emitted-color: map.merge($_emitted-color, ($id: $previous-color)) !global;
-  $_emitted-density: map.merge($_emitted-density, ($id: $previous-density)) !global;
-  $_emitted-typography: map.merge($_emitted-typography, ($id: $previous-typography)) !global;
-
-  @content;
-}
-
 // Checks whether the given value resolves to a theme object. Theme objects are always
 // of type `map` and can optionally only specify `color`, `density` or `typography`.
 @function private-is-theme-object($value) {

package/core/tokens/_m2-utils.scss

@@ -1,77 +1,25 @@
-@use 'sass:color';
-@use 'sass:math';
-@use 'sass:meta';
 @use 'sass:map';
-
-// Indicates whether we're building internally. Used for backwards compatibility.
-$private-is-internal-build: false;
+@use 'sass:meta';
+@use './m2';
 
 // Gets the theme's system values as a flat map.
 @function get-system($theme) {
-  $system: map.get($theme, _mat-system);
-  @if $system {
-    @return $system;
+  @if meta.type-of($theme) == map {
+    $system: map.get($theme, _mat-system);
+    @if $system {
+      @return $system;
+    }
+
+    // If the $theme is a typography-config, convert it to a system map.
+    @if map.has-key($theme, body-1) {
+      @return m2.md-sys-typescale-values($theme);
+    }
   }
 
-  @return ();
-}
-
-/// Inherited function from MDC that computes which contrast tone to use on top of a color.
-/// This is used only in a narrow set of use cases when generating M2 button tokens to maintain
-/// backwards compatibility.
-/// @param {Color} $value Color for which we're calculating the contrast tone.
-/// @param {Boolean} $is-dark Whether the current theme is dark.
-/// @return {Map} Either `dark` or `light`.
-@function contrast-tone($value, $is-dark) {
-  @if ($value == 'dark') {
-    @return 'light';
-  }
-
-  @if ($value == 'light') {
-    @return 'dark';
-  }
-
-  // Fallback if the app is using a non-color palette (e.g. CSS variable based).
-  @if (meta.type-of($value) != 'color') {
-    @return if($is-dark, 'light', 'dark');
-  }
-
-  $minimum-contrast: 3.1;
-  $light-contrast: _contrast($value, #fff);
-  $dark-contrast: _contrast($value, rgba(0, 0, 0, 0.87));
-
-  @if ($light-contrast < $minimum-contrast) and ($dark-contrast > $light-contrast) {
-    @return 'dark';
+  // If the $theme is a density scale, convert it to a system map.
+  @if meta.type-of($theme) == 'number' or $theme == minimum or $theme == maximum {
+    @return (density-scale: $theme);
   }
 
-  @return 'light';
-}
-
-@function _linear-channel-value($channel-value) {
-  $normalized-channel-value: math.div($channel-value, 255);
-
-  @if ($normalized-channel-value < 0.03928) {
-    @return math.div($normalized-channel-value, 12.92);
-  }
-
-  @return math.pow(math.div($normalized-channel-value + 0.055, 1.055), 2.4);
-}
-
-// Calculate the luminance for a color.
-// See https://www.w3.org/TR/WCAG20-TECHS/G17.html#G17-tests
-@function _luminance($color) {
-  $red: _linear-channel-value(color.red($color));
-  $green: _linear-channel-value(color.green($color));
-  $blue: _linear-channel-value(color.blue($color));
-
-  @return 0.2126 * $red + 0.7152 * $green + 0.0722 * $blue;
-}
-
-// Calculate the contrast ratio between two colors.
-// See https://www.w3.org/TR/WCAG20-TECHS/G17.html#G17-tests
-@function _contrast($back, $front) {
-  $back-lum: _luminance($back) + 0.05;
-  $fore-lum: _luminance($front) + 0.05;
-
-  @return math.div(math.max($back-lum, $fore-lum), math.min($back-lum, $fore-lum));
+  @return ();
 }

package/core/tokens/_m3-utils.scss

@@ -8,25 +8,13 @@
   $system: map.set($system, on-#{$color}-container, map.get($system, on-#{$variant}-container));
   $system: map.set($system, #{$color}, map.get($system, #{$variant}));
   $system: map.set($system, #{$color}-container, map.get($system, #{$variant}-container));
+  $system: map.set($system, inverse-#{$color}, map.get($system, inverse-#{$variant}));
   @return $system;
 }
 
 // Gets the theme's system values as a flat map.
 @function get-system($theme) {
-  $system: ();
-  $system: map.merge($system,
-      map.get($theme, _mat-theming-internals-do-not-access, md-sys-color));
-  $system: map.merge($system,
-      map.get($theme, _mat-theming-internals-do-not-access, md-sys-elevation));
-  $system: map.merge($system,
-      map.get($theme, _mat-theming-internals-do-not-access, md-sys-shape));
-  $system: map.merge($system,
-      map.get($theme, _mat-theming-internals-do-not-access, md-sys-state));
-  $system: map.merge($system,
-      map.get($theme, _mat-theming-internals-do-not-access, md-sys-typescale));
-  $system: map.merge($system,
-      map.get($theme, _mat-theming-internals-do-not-access, md-ref-palette));
-  @return $system;
+  @return map.get($theme, _mat-system);
 }
 
 // Returns the color with an opacity value using color-mix. If the color is a variable name, it