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

package/tooltip/_m2-tooltip.scss

@@ -1,42 +1,24 @@
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use 'sass:map';
 
-// Tokens that can't be configured through Angular Material's current theming API,
-// but may be in a future version of the theming API.
-//
-// 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) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
   @return (
-    tooltip-container-color: map.get($system, inverse-surface),
-    tooltip-supporting-text-color: map.get($system, inverse-on-surface),
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    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),
+    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 ();
-}

package/tooltip/_tooltip-theme.scss

@@ -1,5 +1,3 @@
-@use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
@@ -8,44 +6,39 @@
 @use 'sass:map';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-tooltip.get-tokens($theme), base);
   @if inspection.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 sass-utils.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 inspection.get-theme-version($theme) == 1 {
-    @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.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 inspection.get-theme-version($theme) == 1 {
-    @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.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 inspection.get-theme-version($theme) == 1 {
-    @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.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.
@@ -63,23 +56,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-tooltip') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @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/tree/_m2-tree.scss

@@ -1,47 +1,30 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @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.
-@function get-unthemable-tokens() {
-  @return ();
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
-    tree-container-background-color: map.get($system, surface),
-    tree-node-text-color: map.get($system, on-surface),
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    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.
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
-  $min-height-scale: (
-    0: 48px,
-    -1: 44px,
-    -2: 40px,
-    -3: 36px,
-    -4: 28px,
-  );
-
-  @return (
-    tree-node-min-height: map.get($min-height-scale, $density-scale)
+    base: (),
+    color: (
+      tree-container-background-color: map.get($system, surface),
+      tree-node-text-color: map.get($system, on-surface),
+    ),
+    typography: (
+      // TODO(crisbeto): provide tokens for line height and letter spacing
+      tree-node-text-font: map.get($system, body-medium-font),
+      tree-node-text-size: map.get($system, body-medium-size),
+      tree-node-text-weight: map.get($system, body-medium-weight),),
+    density: (
+      tree-node-min-height: map.get((
+        0: 48px,
+        -1: 44px,
+        -2: 40px,
+        -3: 36px,
+        -4: 28px,
+      ), $density-scale)
+    ),
   );
 }

package/tree/_m3-tree.scss

@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -23,7 +22,7 @@ $prefix: (mat, tree);
       tree-node-text-size: map.get($system, body-large-size),
       tree-node-text-weight: map.get($system, body-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/tree/_tree-theme.scss

@@ -1,52 +1,44 @@
 @use 'sass:map';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 @use './m2-tree';
 @use './m3-tree';
 
 @mixin base($theme) {
+  $tokens: map.get(m2-tree.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tree.get-tokens($theme), base));
-  } @else {
+    $tokens: map.get(m3-tree.get-tokens($theme), base);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin color($theme) {
+  $tokens: map.get(m2-tree.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tree.get-tokens($theme), color));
-  } @else {
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tree.get-color-tokens($theme));
-    }
+    $tokens: map.get(m3-tree.get-tokens($theme), color);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin typography($theme) {
+  $tokens: map.get(m2-tree.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tree.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-tree.get-typography-tokens($theme));
-    }
+    $tokens: map.get(m3-tree.get-tokens($theme), typography);
   }
+
+  @include token-utils.values($tokens);
 }
 
 @mixin density($theme) {
+  $tokens: map.get(m2-tree.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
-    @include token-utils.create-token-values(map.get(m3-tree.get-tokens($theme), density));
-  } @else {
-    $density-scale: inspection.get-theme-density($theme);
-
-    @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values-mixed(m2-tree.get-density-tokens($theme));
-    }
+    $tokens: map.get(m3-tree.get-tokens($theme), density);
   }
+
+  @include token-utils.values($tokens);
 }
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
@@ -64,23 +56,21 @@
 }
 
 @mixin theme($theme) {
-  @include theming.private-check-duplicate-theme-styles($theme, 'mat-tree') {
-    @if inspection.get-theme-version($theme) == 1 {
-      @include base($theme);
+  @if inspection.get-theme-version($theme) == 1 {
+    @include base($theme);
+    @include color($theme);
+    @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/tokens/_format-tokens.scss

@@ -1,5 +0,0 @@
-// DO NOT REMOVE
-// This function is used internally.
-@function private-format-tokens($systems) {
-  @return $systems;
-}