@ng-matero/extensions 20.1.1 → 20.2.0

package/progress/_m2-progress.scss

@@ -1,53 +1,38 @@
 @use 'sass:map';
+@use 'sass:meta';
 @use '@angular/material' as mat;
 @use '../core/tokens/m2-utils';
+@use '../core/tokens/m3-utils';
 
-// Tokens that can't be configured through Angular Material's current theming API,
-// but may be in a future version of the theming API.
-@function get-unthemable-tokens() {
-  @return (
-    progress-container-shape: 4px,
-  );
-}
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
 
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $is-dark: mat.get-theme-type($theme) == dark;
-
-  @return (
-    progress-track-color: mat.get-theme-color($theme, background, hover),
-    progress-indicator-color: mat.get-theme-color($theme, foreground, divider),
-    progress-text-color: mat.get-theme-color($theme, foreground, text),
-    progress-info-indicator-color: mat.m2-get-color-from-palette(mat.$m2-blue-palette, if($is-dark, 900, 500)),
-    progress-info-text-color: white,
-    progress-success-indicator-color: mat.m2-get-color-from-palette(mat.$m2-green-palette, if($is-dark, 900, 500)),
-    progress-success-text-color: white,
-    progress-warning-indicator-color: mat.m2-get-color-from-palette(mat.$m2-orange-palette, if($is-dark, 900, 500)),
-    progress-warning-text-color: white,
-    progress-danger-indicator-color: mat.m2-get-color-from-palette(mat.$m2-red-palette, if($is-dark, 900, 500)),
-    progress-danger-text-color: white,
-  );
-}
+  $is-dark: false;
+  @if meta.type-of($theme) == 'map' {
+    $is-dark: mat.get-theme-type($theme) == dark;
+  }
 
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
   @return (
-    progress-text-size: 12px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}
-
-// Combines the tokens generated by the above functions into a single map with placeholder values.
-// This is used to create token slots.
-@function get-token-slots() {
-  @return mat.private-deep-merge-all(
-    get-unthemable-tokens(),
-    get-color-tokens(m2-utils.$placeholder-color-config),
-    get-typography-tokens(m2-utils.$placeholder-typography-config),
-    get-density-tokens(m2-utils.$placeholder-density-config)
+    base: (
+      progress-container-shape: 4px,
+    ),
+    color: (
+      progress-track-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
+      progress-indicator-color: map.get($system, outline),
+      progress-text-color: map.get($system, on-surface),
+      progress-info-indicator-color: mat.m2-get-color-from-palette(mat.$m2-blue-palette, if($is-dark, 900, 500)),
+      progress-info-text-color: white,
+      progress-success-indicator-color: mat.m2-get-color-from-palette(mat.$m2-green-palette, if($is-dark, 900, 500)),
+      progress-success-text-color: white,
+      progress-warning-indicator-color: mat.m2-get-color-from-palette(mat.$m2-orange-palette, if($is-dark, 900, 500)),
+      progress-warning-text-color: white,
+      progress-danger-indicator-color: mat.m2-get-color-from-palette(mat.$m2-red-palette, if($is-dark, 900, 500)),
+      progress-danger-text-color: white,
+    ),
+    typography: (
+      progress-text-size: 12px,
+    ),
+    density: ()
   );
 }

package/progress/_progress-theme.scss

@@ -5,47 +5,39 @@
 @use './m3-progress';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-progress.get-tokens($theme), base);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-progress.get-tokens($theme), base));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-progress.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-progress.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: map.get(m2-progress.get-tokens($theme), color);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-progress.get-tokens($theme), color));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values(m2-progress.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-progress.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-progress.get-tokens($theme), typography);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-progress.get-tokens($theme), typography));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values(m2-progress.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-progress.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-progress.get-tokens($theme), density);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-progress.get-tokens($theme), density));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-progress.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-progress.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -68,8 +60,7 @@
     @include color($theme);
     @include density($theme);
     @include typography($theme);
-  }
-  @else {
+  } @else {
     @include base($theme);
     @if mat.theme-has($theme, color) {
       @include color($theme);

package/select/_m2-select.scss

@@ -1,79 +1,52 @@
 @use 'sass:map';
-@use 'sass:math';
-@use '@angular/material' as mat;
 @use '../core/tokens/m2-utils';
+@use '../core/tokens/m3-utils';
 @use '../core/style/elevation';
 
-// Generates the tokens used to theme the option based on a palette.
-@function private-get-color-palette-color-tokens($theme, $palette-name) {
+@function get-tokens($theme) {
   @return (
-    select-option-selected-state-text-color: mat.get-theme-color($theme, $palette-name),
-  );
-}
-
-// 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 (
-    select-container-shape: 4px,
-    select-container-elevation-shadow: elevation.get-box-shadow(8),
+    base: (
+      select-container-shape: 4px,
+      select-container-elevation-shadow: elevation.get-box-shadow(8),
+    ),
+    color: private-get-color-palette-color-tokens($theme, primary),
+    typography: (),
+    density: ()
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $text-color: mat.get-theme-color($theme, foreground, text);
-  $hint-text-color: mat.get-theme-color($theme, foreground, hint-text);
-  $secondary-text-color: mat.get-theme-color($theme, foreground, secondary-text);
-  $disabled-text-color: mat.get-theme-color($theme, foreground, disabled-text);
-  $divider-color: mat.get-theme-color($theme, foreground, divider);
-  $hover-color: mat.get-theme-color($theme, background, hover);
-  $palette-tokens: private-get-color-palette-color-tokens($theme, primary);
-
-  @return map.merge($palette-tokens, (
-    select-container-text-color: $text-color,
-    select-placeholder-text-color: $hint-text-color,
-    select-disabled-text-color: $hint-text-color,
-
-    select-multiple-value-background-color: mat.get-theme-color($theme, background, unselected-chip),
-    select-multiple-value-outline-color: $divider-color,
-    select-multiple-value-disabled-outline-color: mat.get-theme-color($theme, foreground, divider, 0.06),
-    select-multiple-value-icon-hover-background-color: $divider-color,
-
-    select-clear-icon-color: $secondary-text-color,
-    select-clear-icon-hover-color: mat.get-theme-color($theme, warn),
-
-    select-enabled-arrow-color: $secondary-text-color,
-    select-disabled-arrow-color: $disabled-text-color,
-    select-invalid-arrow-color: mat.get-theme-color($theme, warn),
+@function private-get-color-palette-color-tokens($theme, $color-variant) {
+  $system: m2-utils.get-system($theme);
+  $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
 
-    select-panel-background-color: mat.get-theme-color($theme, background, card),
-    select-panel-divider-color: $divider-color,
-    select-optgroup-label-text-color: $secondary-text-color,
-    select-option-label-text-color: $text-color,
-    select-option-selected-state-background-color: $hover-color,
-    select-option-hover-state-background-color: $hover-color,
-    select-option-disabled-state-text-color: $hint-text-color,
-  ));
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}
-
-// Combines the tokens generated by the above functions into a single map with placeholder values.
-// This is used to create token slots.
-@function get-token-slots() {
-  @return mat.private-deep-merge-all(
-    get-unthemable-tokens(),
-    get-color-tokens(m2-utils.$placeholder-color-config),
-    get-typography-tokens(m2-utils.$placeholder-typography-config),
-    get-density-tokens(m2-utils.$placeholder-density-config)
+  @return (
+    select-container-text-color: map.get($system, on-surface),
+    select-placeholder-text-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+    select-disabled-text-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+
+    select-multiple-value-background-color: map.get($system, outline),
+    select-multiple-value-outline-color: map.get($system, outline),
+    select-multiple-value-disabled-outline-color: m3-utils.color-with-opacity(map.get($system, outline), 38%),
+    select-multiple-value-icon-hover-background-color: map.get($system, outline),
+
+    select-clear-icon-color: map.get($system, on-surface-variant),
+    select-clear-icon-hover-color: map.get($system, error),
+
+    select-enabled-arrow-color: map.get($system, on-surface-variant),
+    select-disabled-arrow-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
+    select-invalid-arrow-color: map.get($system, error),
+
+    select-panel-background-color: map.get($system, surface),
+    select-panel-divider-color: map.get($system, outline),
+    select-optgroup-label-text-color: map.get($system, on-surface-variant),
+    select-option-label-text-color: map.get($system, on-surface),
+    select-option-selected-state-text-color: map.get($system, primary),
+    select-option-selected-state-background-color: m3-utils.color-with-opacity(
+      map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
+    select-option-hover-state-background-color: m3-utils.color-with-opacity(
+      map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
+    select-option-disabled-state-text-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
   );
 }
+

package/select/_m3-select.scss

@@ -35,7 +35,8 @@
       select-option-label-text-color: map.get($system, on-surface),
       select-option-selected-state-background-color: map.get($system, secondary-container),
       select-option-selected-state-text-color: map.get($system, on-surface),
-      select-option-hover-state-background-color: m3-utils.color-with-opacity(map.get($system, on-surface), map.get($system,hover-state-layer-opacity)),
+      select-option-hover-state-background-color: m3-utils.color-with-opacity(
+        map.get($system, on-surface), map.get($system,hover-state-layer-opacity)),
       select-option-disabled-state-text-color: m3-utils.color-with-opacity(map.get($system, on-surface), 38%),
     ),
     typography: (),

package/select/_select-theme.scss

@@ -5,59 +5,53 @@
 @use './m3-select';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-select.get-tokens($theme), base);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), base));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-select.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-select.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme, $color-variant: null) {
+  $tokens: map.get(m2-select.get-tokens($theme), color);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme, $color-variant), color));
+    $tokens: map.get(m3-select.get-tokens($theme, $color-variant), color);
   }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-select.get-color-tokens($theme));
-    }
 
+  @include token-utils.values($tokens);
+
+  @if mat.get-theme-version($theme) != 1 {
     .ng-dropdown-panel {
       &.mat-accent {
-        $accent-tokens: m2-select.private-get-color-palette-color-tokens($theme, accent);
-        @include token-utils.create-token-values-mixed($accent-tokens);
+        $tokens: m2-select.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
       }
 
       &.mat-warn {
-        $warn-tokens: m2-select.private-get-color-palette-color-tokens($theme, warn);
-        @include token-utils.create-token-values-mixed($warn-tokens);
+        $tokens: m2-select.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-select.get-tokens($theme), typography);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), typography));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-select.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-select.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-select.get-tokens($theme), density);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-select.get-tokens($theme), density));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-select.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-select.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -80,8 +74,7 @@
     @include color($theme, $color-variant);
     @include density($theme);
     @include typography($theme);
-  }
-  @else {
+  } @else {
     @include base($theme);
     @if mat.theme-has($theme, color) {
       @include color($theme);

package/split/_m2-split.scss

@@ -3,45 +3,24 @@
 @use 'sass:meta';
 @use '@angular/material' as mat;
 @use '../core/tokens/m2-utils';
+@use '../core/tokens/m3-utils';
 
-@function private-get-color-palette-color-tokens($theme, $palette-name) {
+@function get-tokens($theme) {
   @return (
-    split-gutter-hover-state-background-color: mat.get-theme-color($theme, $palette-name, text),
+    base: (),
+    color: private-get-color-palette-color-tokens($theme, primary),
+    typography: (),
+    density: ()
   );
 }
 
-// Tokens that can't be configured through Angular Material's current theming API,
-// but may be in a future version of the theming API.
-@function get-unthemable-tokens() {
-  @return ();
-}
-
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $gutter-tokens: private-get-color-palette-color-tokens($theme, primary);
-
-  @return mat.private-merge-all($gutter-tokens, (
-    split-gutter-background-color: mat.get-theme-color($theme, foreground, divider),
-  ));
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}
+@function private-get-color-palette-color-tokens($theme, $color-variant) {
+  $system: m2-utils.get-system($theme);
+  $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
 
-// Combines the tokens generated by the above functions into a single map with placeholder values.
-// This is used to create token slots.
-@function get-token-slots() {
-  @return mat.private-deep-merge-all(
-    get-unthemable-tokens(),
-    get-color-tokens(m2-utils.$placeholder-color-config),
-    get-typography-tokens(m2-utils.$placeholder-typography-config),
-    get-density-tokens(m2-utils.$placeholder-density-config)
-  );
+  @return (
+    split-gutter-background-color: map.get($system, outline),
+    split-gutter-hover-state-background-color: map.get($system, primary),
+  )
 }

package/split/_split-theme.scss

@@ -5,59 +5,51 @@
 @use './m3-split';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-split.get-tokens($theme), base);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-split.get-tokens($theme), base));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-split.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-split.get-tokens($theme), base);
   }
 }
 
 @mixin color($theme, $color-variant: null) {
+  $tokens: map.get(m2-split.get-tokens($theme), color);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-split.get-tokens($theme, $color-variant), color));
+    $tokens: map.get(m3-split.get-tokens($theme, $color-variant), color);
   }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-split.get-color-tokens($theme));
-    }
 
-    .mtx-split>.mtx-split-gutter {
+  @include token-utils.values($tokens);
+
+  @if mat.get-theme-version($theme) != 1 {
+    .mtx-split > .mtx-split-gutter {
       &.mat-accent:hover {
-        $accent-tokens: m2-split.private-get-color-palette-color-tokens($theme, accent);
-        @include token-utils.create-token-values-mixed($accent-tokens);
+        $tokens: m2-split.private-get-color-palette-color-tokens($theme, secondary);
+        @include token-utils.values($tokens);
       }
 
       &.mat-warn:hover {
-        $warn-tokens: m2-split.private-get-color-palette-color-tokens($theme, warn);
-        @include token-utils.create-token-values-mixed($warn-tokens);
+        $tokens: m2-split.private-get-color-palette-color-tokens($theme, error);
+        @include token-utils.values($tokens);
       }
     }
   }
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-split.get-tokens($theme), typography);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-split.get-tokens($theme), typography));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-split.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-split.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-split.get-tokens($theme), density);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-split.get-tokens($theme), density));
-  }
-  @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-split.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-split.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -80,8 +72,7 @@
     @include color($theme, $color-variant);
     @include density($theme);
     @include typography($theme);
-  }
-  @else {
+  } @else {
     @include base($theme);
     @if mat.theme-has($theme, color) {
       @include color($theme);

package/tooltip/_m2-tooltip.scss

@@ -1,50 +1,25 @@
-@use '@angular/material' as mat;
+@use 'sass:map';
 @use '../core/tokens/m2-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.
-//
-// Tokens that are available in MDC, but not used in Angular Material should be mapped to `null`.
-// `null` indicates that we are intentionally choosing not to emit a slot or value for the token in
-// our CSS.
-@function get-unthemable-tokens() {
-  @return (
-    tooltip-container-shape: 4px,
-    tooltip-supporting-text-line-height: 16px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-
-  @return (
-    tooltip-container-color: mat.get-theme-color($theme, background, tooltip),
-    tooltip-supporting-text-color: #fff,
-  );
-}
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
 
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
   @return (
-    tooltip-supporting-text-font: mat.get-theme-typography($theme, caption, font-family),
-    tooltip-supporting-text-size: mat.get-theme-typography($theme, caption, font-size),
-    tooltip-supporting-text-weight: mat.get-theme-typography($theme, caption, font-weight),
-    tooltip-supporting-text-tracking: mat.get-theme-typography($theme, caption, letter-spacing),
+    base: (
+      tooltip-container-shape: 4px,
+      tooltip-supporting-text-line-height: 16px,
+    ),
+    color: (
+      tooltip-container-color: map.get($system, inverse-surface),
+      tooltip-supporting-text-color: map.get($system, inverse-on-surface),
+    ),
+    typography: (
+      tooltip-supporting-text-font: map.get($system, body-small-font),
+      tooltip-supporting-text-size: map.get($system, body-small-size),
+      tooltip-supporting-text-weight: map.get($system, body-small-weight),
+      tooltip-supporting-text-tracking: map.get($system, body-small-tracking),
+    ),
+    density: (),
   );
 }
 
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}
-
-// Combines the tokens generated by the above functions into a single map with placeholder values.
-// This is used to create token slots.
-@function get-token-slots() {
-  @return mat.private-deep-merge-all(
-      get-unthemable-tokens(),
-      get-color-tokens(m2-utils.$placeholder-color-config),
-      get-typography-tokens(m2-utils.$placeholder-typography-config),
-      get-density-tokens(m2-utils.$placeholder-density-config)
-  );
-}

package/tooltip/_tooltip-theme.scss

@@ -5,44 +5,39 @@
 @use './m3-tooltip';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-tooltip.get-tokens($theme), base);
   @if mat.get-theme-version($theme) == 1 {
-    @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 mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-unthemable-tokens());
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: map.get(m2-tooltip.get-tokens($theme), color);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), color));
-  } @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-tooltip.get-tokens($theme), typography);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), typography));
-  } @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-tooltip.get-tokens($theme), density);
   @if mat.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tooltip.get-tokens($theme), density));
-  } @else {
-    @include mat.private-current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tooltip.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-tooltip.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.