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

package/timepicker/_m2-timepicker.scss

@@ -3,22 +3,19 @@
 @use '../core/style/sass-utils';
 @use '../core/style/elevation';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, timepicker);
-
 // 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: 4px,
-    container-elevation-shadow: elevation.get-box-shadow(8),
+    timepicker-container-shape: 4px,
+    timepicker-container-elevation-shadow: elevation.get-box-shadow(8),
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
 @function get-color-tokens($theme) {
   @return (
-    container-background-color: inspection.get-theme-color($theme, background, card)
+    timepicker-container-background-color: inspection.get-theme-color($theme, background, card)
   );
 }
 

package/timepicker/_m3-timepicker.scss

@@ -1,22 +1,21 @@
 @use 'sass:map';
 @use '../core/style/elevation';
 @use '../core/tokens/m3-utils';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, timepicker);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-timepicker.
-/// @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-timepicker
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    container-background-color: map.get($systems, md-sys-color, surface-container),
-    container-shape: map.get($systems, md-sys-shape, corner-extra-small),
-    container-elevation-shadow:
-      m3-utils.hardcode(elevation.get-box-shadow(2), $exclude-hardcoded),
-  );
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
 
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+  @return (
+    base: (
+      timepicker-container-shape: map.get($system, corner-extra-small),
+    ),
+    color: (
+      timepicker-container-background-color: map.get($system, surface-container),
+      timepicker-container-elevation-shadow: elevation.get-box-shadow(2),
+    ),
+    typography: (),
+    density: (),
+  );
 }

package/timepicker/_timepicker-theme.scss

@@ -1,10 +1,10 @@
 @use 'sass:map';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/typography/typography';
 @use '../core/style/sass-utils';
 @use './m2-timepicker';
+@use './m3-timepicker';
 @use '../core/tokens/token-utils';
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -12,31 +12,23 @@
 /// @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-timepicker.get-tokens($theme), base));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-timepicker.$prefix,
-        m2-timepicker.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(m2-timepicker.get-unthemable-tokens());
     }
   }
 }
 
 /// Outputs color theme styles for the mat-timepicker.
 /// @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 main selection: primary, secondary, tertiary,
-///      or error (If not specified, default primary color will be used).
-@mixin color($theme, $options...) {
+@mixin color($theme) {
   @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-timepicker.get-tokens($theme), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-timepicker.$prefix,
-        m2-timepicker.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-timepicker.get-color-tokens($theme));
     }
   }
 }
@@ -45,13 +37,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-timepicker.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-timepicker.$prefix,
-        m2-timepicker.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-timepicker.get-typography-tokens($theme));
     }
   }
 }
@@ -60,13 +49,10 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
+    @include token-utils.create-token-values(map.get(m3-timepicker.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-timepicker.$prefix,
-        m2-timepicker.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-timepicker.get-density-tokens($theme));
     }
   }
 }
@@ -75,8 +61,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-timepicker.$prefix,
-      tokens: m2-timepicker.get-token-slots(),
+      namespace: timepicker,
+      tokens: token-utils.get-overrides(m3-timepicker.get-tokens(), timepicker)
     ),
   );
 }
@@ -84,18 +70,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-timepicker.
 /// @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 main selection: primary, secondary, tertiary,
-///      or error (If not specified, default primary color will be used).
-@mixin theme($theme) {
+/// @param {String} $color-variant The color variant to use for the component
+@mixin theme($theme, $color-variant: null) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-timepicker') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -110,15 +97,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  @if ($tokens != ()) {
-    @include token-utils.create-token-values(
-      m2-timepicker.$prefix,
-      map.get($tokens, m2-timepicker.$prefix)
-    );
-  }
-}

package/toolbar/_m2-toolbar.scss

@@ -4,9 +4,6 @@
 @use '../core/theming/inspection';
 @use '../core/style/sass-utils';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, toolbar);
-
 // 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() {
@@ -24,11 +21,13 @@ $prefix: (mat, toolbar);
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
-    title-text-line-height: inspection.get-theme-typography($theme, headline-6, line-height),
-    title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
-    title-text-tracking: inspection.get-theme-typography($theme, headline-6, letter-spacing),
-    title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
+    toolbar-title-text-font: inspection.get-theme-typography($theme, headline-6, font-family),
+    toolbar-title-text-line-height:
+        inspection.get-theme-typography($theme, headline-6, line-height),
+    toolbar-title-text-size: inspection.get-theme-typography($theme, headline-6, font-size),
+    toolbar-title-text-tracking:
+        inspection.get-theme-typography($theme, headline-6, letter-spacing),
+    toolbar-title-text-weight: inspection.get-theme-typography($theme, headline-6, font-weight),
   );
 }
 
@@ -50,16 +49,16 @@ $prefix: (mat, toolbar);
   );
 
   @return (
-    standard-height: map.get($standard-scale, $density-scale),
-    mobile-height: map.get($mobile-scale, $density-scale),
+    toolbar-standard-height: map.get($standard-scale, $density-scale),
+    toolbar-mobile-height: map.get($mobile-scale, $density-scale),
   );
 }
 
 // Generates the tokens used to theme the toolbar based on a palette.
 @function private-get-color-palette-color-tokens($background-color, $text-color) {
   @return (
-    container-background-color: $background-color,
-    container-text-color: $text-color,
+    toolbar-container-background-color: $background-color,
+    toolbar-container-text-color: $text-color,
   );
 }
 

package/toolbar/_m3-toolbar.scss

@@ -1,37 +1,42 @@
 @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, toolbar);
+@use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-toolbar.
 /// @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-toolbar
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: sass-utils.merge-all(
-    m3-utils.generate-typography-tokens($systems, title-text, title-large),
-    (
-      container-background-color: map.get($systems, md-sys-color, surface),
-      container-text-color: map.get($systems, md-sys-color, on-surface),
-    )
-  );
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
 
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+  @return (
+    base: (),
+    color: (
+      toolbar-container-background-color: map.get($system, surface),
+      toolbar-container-text-color: map.get($system, on-surface),
+    ),
+    typography: (
+      toolbar-title-text-font: map.get($system, title-large-font),
+      toolbar-title-text-line-height: map.get($system, title-large-line-height),
+      toolbar-title-text-size: map.get($system, title-large-size),
+      toolbar-title-text-tracking: map.get($system, title-large-tracking),
+      toolbar-title-text-weight: map.get($system, title-large-weight),
+    ),
+    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+  );
 }
 
 // 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 (
-    standard-height: list.nth((64px, 60px, 56px, 52px), $index),
-    mobile-height: list.nth((56px, 52px, 48px, 44px), $index),
+    toolbar-standard-height: list.nth((64px, 60px, 56px, 52px), $index),
+    toolbar-mobile-height: list.nth((56px, 52px, 48px, 44px), $index),
   );
 }

package/toolbar/_toolbar-theme.scss

@@ -2,7 +2,6 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/inspection';
 @use '../core/theming/theming';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-toolbar';
@@ -10,7 +9,6 @@
 
 @mixin _palette-styles($theme, $palette-name) {
   @include token-utils.create-token-values-mixed(
-    m2-toolbar.$prefix,
     m2-toolbar.private-get-color-palette-color-tokens(
       $background-color: inspection.get-theme-color($theme, $palette-name),
       $text-color: inspection.get-theme-color($theme, $palette-name, default-contrast)
@@ -23,13 +21,10 @@
 
 @mixin color($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-toolbar.$prefix,
-        m2-toolbar.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-toolbar.get-color-tokens($theme));
     }
 
     .mat-toolbar {
@@ -50,30 +45,23 @@
 
 @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-toolbar.get-tokens($theme), typography));
   } @else {
     // TODO(mmalerba): Stop calling this and resolve resulting screen diffs.
     $theme: inspection.private-get-typography-back-compat-theme($theme);
 
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-toolbar.$prefix,
-        m2-toolbar.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-toolbar.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(
-        m3-toolbar.$prefix, m3-toolbar.get-density-tokens($theme));
+    @include token-utils.create-token-values(map.get(m3-toolbar.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-toolbar.$prefix,
-        m2-toolbar.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-toolbar.get-density-tokens($theme));
     }
   }
 }
@@ -82,8 +70,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-toolbar.$prefix,
-      tokens: m2-toolbar.get-token-slots(),
+      namespace: toolbar,
+      tokens: token-utils.get-overrides(m3-toolbar.get-tokens(), toolbar)
     ),
   );
 }
@@ -91,16 +79,16 @@
 /// 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());
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-toolbar') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
-      @if inspection.theme-has($theme, density) {
-        @include density($theme);
-      }
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -115,15 +103,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  @if ($tokens != ()) {
-    @include token-utils.create-token-values(
-      m2-toolbar.$prefix,
-      map.get($tokens, m2-toolbar.$prefix)
-    );
-  }
-}

package/tooltip/_m2-tooltip.scss

@@ -2,9 +2,6 @@
 @use '../core/style/sass-utils';
 @use '../core/tokens/m2-utils';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, tooltip);
-
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
 //
@@ -13,8 +10,8 @@ $prefix: (mat, tooltip);
 // our CSS.
 @function get-unthemable-tokens() {
   @return (
-    container-shape: 4px,
-    supporting-text-line-height: 16px,
+    tooltip-container-shape: 4px,
+    tooltip-supporting-text-line-height: 16px,
   );
 }
 
@@ -22,18 +19,19 @@ $prefix: (mat, tooltip);
 @function get-color-tokens($theme) {
 
   @return (
-    container-color: inspection.get-theme-color($theme, background, tooltip),
-    supporting-text-color: #fff,
+    tooltip-container-color: inspection.get-theme-color($theme, background, tooltip),
+    tooltip-supporting-text-color: #fff,
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    supporting-text-font: inspection.get-theme-typography($theme, caption, font-family),
-    supporting-text-size: inspection.get-theme-typography($theme, caption, font-size),
-    supporting-text-weight: inspection.get-theme-typography($theme, caption, font-weight),
-    supporting-text-tracking: inspection.get-theme-typography($theme, caption, letter-spacing),
+    tooltip-supporting-text-font: inspection.get-theme-typography($theme, caption, font-family),
+    tooltip-supporting-text-size: inspection.get-theme-typography($theme, caption, font-size),
+    tooltip-supporting-text-weight: inspection.get-theme-typography($theme, caption, font-weight),
+    tooltip-supporting-text-tracking:
+        inspection.get-theme-typography($theme, caption, letter-spacing),
   );
 }
 

package/tooltip/_m3-tooltip.scss

@@ -1,25 +1,25 @@
 @use '../core/tokens/m3-utils';
 @use 'sass:map';
-
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, tooltip);
+@use '../core/tokens/m3';
 
 /// Generates the tokens for MDC plain-tooltip
-/// @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 tokens for the MDC plain-tooltip
-@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $tokens: (
-    container-color: map.get($systems, md-sys-color, inverse-surface),
-    container-shape: map.get($systems, md-sys-shape, corner-extra-small),
-    supporting-text-color: map.get($systems, md-sys-color, inverse-on-surface),
-    supporting-text-font: map.get($systems, md-sys-typescale, body-small-font),
-    supporting-text-line-height: map.get($systems, md-sys-typescale, body-small-line-height),
-    supporting-text-size: map.get($systems, md-sys-typescale, body-small-size),
-    supporting-text-tracking: map.get($systems, md-sys-typescale, body-small-tracking),
-    supporting-text-weight: map.get($systems, md-sys-typescale, body-small-weight)
-  );
+@function get-tokens($theme: m3.$sys-theme) {
+  $system: m3-utils.get-system($theme);
 
-  @return m3-utils.namespace($prefix, $tokens, $token-slots);
+  @return (
+    base: (),
+    color: (
+      tooltip-container-color: map.get($system, inverse-surface),
+      tooltip-container-shape: map.get($system, corner-extra-small),
+      tooltip-supporting-text-color: map.get($system, inverse-on-surface),
+    ),
+    typography: (
+      tooltip-supporting-text-font: map.get($system, body-small-font),
+      tooltip-supporting-text-line-height: map.get($system, body-small-line-height),
+      tooltip-supporting-text-size: map.get($system, body-small-size),
+      tooltip-supporting-text-tracking: map.get($system, body-small-tracking),
+      tooltip-supporting-text-weight: map.get($system, body-small-weight)
+    ),
+    density: (),
+  );
 }

package/tooltip/_tooltip-theme.scss

@@ -1,60 +1,49 @@
 @use '../core/style/sass-utils';
 @use '../core/theming/theming';
 @use '../core/theming/inspection';
-@use '../core/theming/validation';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
 @use './m2-tooltip';
+@use './m3-tooltip';
+@use 'sass:map';
 
 @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-tooltip.get-tokens($theme), base));
   } @else {
     // Add default values for tokens not related to color, typography, or density.
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-tooltip.$prefix,
-        m2-tooltip.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(m2-tooltip.get-unthemable-tokens());
     }
   }
 }
 
 @mixin color($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), color));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-tooltip.$prefix,
-        m2-tooltip.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-tooltip.get-color-tokens($theme));
     }
   }
 }
 
 @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-tooltip.get-tokens($theme), typography));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-tooltip.$prefix,
-        m2-tooltip.get-typography-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-tooltip.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    // There are no M3 density tokens for this component
+    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), density));
   } @else {
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(
-        m2-tooltip.$prefix,
-        m2-tooltip.get-density-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(m2-tooltip.get-density-tokens($theme));
     }
   }
 }
@@ -63,20 +52,23 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: m2-tooltip.$prefix,
-      tokens: m2-tooltip.get-token-slots(),
+      namespace: tooltip,
+      tokens: token-utils.get-overrides(m3-tooltip.get-tokens(), tooltip)
     ),
   );
 }
 
 @mixin overrides($tokens: ()) {
-  @include token-utils.batch-create-token-values($tokens, _define-overrides()...);
+    @include token-utils.batch-create-token-values($tokens, _define-overrides());
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-tooltip') {
     @if inspection.get-theme-version($theme) == 1 {
-      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
+      @include base($theme);
+      @include color($theme);
+      @include density($theme);
+      @include typography($theme);
     } @else {
       @include base($theme);
       @if inspection.theme-has($theme, color) {
@@ -91,13 +83,3 @@
     }
   }
 }
-
-@mixin _theme-from-tokens($tokens) {
-  @include validation.selector-defined(
-    'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
-  );
-  @if $tokens != () {
-    $tokens: token-utils.get-tokens-for($tokens, m2-tooltip.$prefix);
-    @include token-utils.create-token-values(m2-tooltip.$prefix, $tokens);
-  }
-}

package/tree/_m2-tree.scss

@@ -4,9 +4,6 @@
 @use '../core/theming/inspection';
 @use '../core/style/sass-utils';
 
-// The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, tree);
-
 // 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() {
@@ -18,17 +15,17 @@ $prefix: (mat, tree);
   $foreground-base: inspection.get-theme-color($theme, foreground, base);
 
   @return (
-    container-background-color: inspection.get-theme-color($theme, background, card),
-    node-text-color: inspection.get-theme-color($theme, foreground, text),
+    tree-container-background-color: inspection.get-theme-color($theme, background, card),
+    tree-node-text-color: inspection.get-theme-color($theme, foreground, text),
   );
 }
 
 // Tokens that can be configured through Angular Material's typography theming API.
 @function get-typography-tokens($theme) {
   @return (
-    node-text-font: inspection.get-theme-typography($theme, body-2, font-family),
-    node-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    node-text-weight: inspection.get-theme-typography($theme, body-2, font-weight),
+    tree-node-text-font: inspection.get-theme-typography($theme, body-2, font-family),
+    tree-node-text-size: inspection.get-theme-typography($theme, body-2, font-size),
+    tree-node-text-weight: inspection.get-theme-typography($theme, body-2, font-weight),
 
     // TODO(crisbeto): provide tokens for line height and letter spacing to match other components.
   );
@@ -46,7 +43,7 @@ $prefix: (mat, tree);
   );
 
   @return (
-    node-min-height: map.get($min-height-scale, $density-scale)
+    tree-node-min-height: map.get($min-height-scale, $density-scale)
   );
 }