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

package/list/_m2-list.scss

@@ -1,116 +1,92 @@
-@use '../core/theming/inspection';
 @use 'sass:map';
 @use '../core/tokens/m2-utils';
+@use '../core/theming/theming';
 
-// 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 (
-    list-active-indicator-color: transparent,
-    list-active-indicator-shape: 4px,
-    list-list-item-container-shape: 0,
-    list-list-item-leading-avatar-shape: 50%,
-    list-list-item-container-color: transparent,
-    list-list-item-selected-container-color: transparent,
-    list-list-item-leading-avatar-color: transparent,
-    list-list-item-leading-icon-size: 24px,
-    list-list-item-leading-avatar-size: 40px,
-    list-list-item-trailing-icon-size: 24px,
-    list-list-item-disabled-state-layer-color: transparent,
-    list-list-item-disabled-state-layer-opacity: 0,
-    list-list-item-disabled-label-text-opacity: 0.38,
-    list-list-item-disabled-leading-icon-opacity: 0.38,
-    list-list-item-disabled-trailing-icon-opacity: 0.38,
-  );
-}
-
-// 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), -5);
 
   @return (
-    list-list-item-label-text-color: map.get($system, on-surface),
-    list-list-item-supporting-text-color: map.get($system, on-surface-variant),
-    list-list-item-leading-icon-color: map.get($system, on-surface-variant),
-    list-list-item-trailing-supporting-text-color: map.get($system, on-surface-variant),
-    list-list-item-trailing-icon-color: map.get($system, on-surface-variant),
-    list-list-item-selected-trailing-icon-color: map.get($system, on-surface-variant),
-    list-list-item-disabled-label-text-color: map.get($system, on-surface),
-    list-list-item-disabled-leading-icon-color: map.get($system, on-surface),
-    list-list-item-disabled-trailing-icon-color: map.get($system, on-surface),
-    list-list-item-hover-label-text-color: map.get($system, on-surface),
-    list-list-item-hover-leading-icon-color: map.get($system, on-surface-variant),
-    list-list-item-hover-state-layer-color: map.get($system, on-surface),
-    list-list-item-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
-    list-list-item-hover-trailing-icon-color: map.get($system, on-surface-variant),
-    list-list-item-focus-label-text-color: map.get($system, on-surface),
-    list-list-item-focus-state-layer-color: map.get($system, on-surface),
-    list-list-item-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    list-list-item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    list-list-item-label-text-line-height:
-        inspection.get-theme-typography($theme, body-1, line-height),
-    list-list-item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    list-list-item-label-text-tracking:
-        inspection.get-theme-typography($theme, body-1, letter-spacing),
-    list-list-item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
-    list-list-item-supporting-text-font:
-        inspection.get-theme-typography($theme, body-2, font-family),
-    list-list-item-supporting-text-line-height:inspection.get-theme-typography(
-        $theme, body-2, line-height),
-    list-list-item-supporting-text-size: inspection.get-theme-typography($theme, body-2, font-size),
-    list-list-item-supporting-text-tracking: inspection.get-theme-typography(
-        $theme, body-2, letter-spacing),
-    list-list-item-supporting-text-weight:
-        inspection.get-theme-typography($theme, body-2, font-weight),
-    list-list-item-trailing-supporting-text-font: inspection.get-theme-typography(
-        $theme, caption, font-family),
-    list-list-item-trailing-supporting-text-line-height: inspection.get-theme-typography(
-        $theme, caption, line-height),
-    list-list-item-trailing-supporting-text-size: inspection.get-theme-typography(
-        $theme, caption, font-size),
-    list-list-item-trailing-supporting-text-tracking: inspection.get-theme-typography(
-        $theme, caption, letter-spacing),
-    list-list-item-trailing-supporting-text-weight: inspection.get-theme-typography(
-        $theme, caption, font-weight),
-  );
-}
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  $scale: inspection.get-theme-density($theme);
-
-  @return (
-    list-list-item-leading-icon-start-space: 16px,
-    list-list-item-leading-icon-end-space: 32px,
-    list-list-item-one-line-container-height: map.get((
-      0: 48px,
-      -1: 44px,
-      -2: 40px,
-      -3: 36px,
-      -4: 32px,
-      -5: 24px,
-    ), $scale),
-    list-list-item-two-line-container-height: map.get((
-      0: 64px,
-      -1: 60px,
-      -2: 56px,
-      -3: 52px,
-      -4: 48px,
-      -5: 48px,
-    ), $scale),
-    list-list-item-three-line-container-height: map.get((
-      0: 88px,
-      -1: 84px,
-      -2: 80px,
-      -3: 76px,
-      -4: 72px,
-      -5: 56px,
-    ), $scale),
+    base: (
+      list-active-indicator-color: transparent,
+      list-active-indicator-shape: 4px,
+      list-list-item-container-shape: 0,
+      list-list-item-leading-avatar-shape: 50%,
+      list-list-item-container-color: transparent,
+      list-list-item-selected-container-color: transparent,
+      list-list-item-leading-avatar-color: transparent,
+      list-list-item-leading-icon-size: 24px,
+      list-list-item-leading-avatar-size: 40px,
+      list-list-item-trailing-icon-size: 24px,
+      list-list-item-disabled-state-layer-color: transparent,
+      list-list-item-disabled-state-layer-opacity: 0,
+      list-list-item-disabled-label-text-opacity: 0.38,
+      list-list-item-disabled-leading-icon-opacity: 0.38,
+      list-list-item-disabled-trailing-icon-opacity: 0.38,
+    ),
+    color: (
+      list-list-item-label-text-color: map.get($system, on-surface),
+      list-list-item-supporting-text-color: map.get($system, on-surface-variant),
+      list-list-item-leading-icon-color: map.get($system, on-surface-variant),
+      list-list-item-trailing-supporting-text-color: map.get($system, on-surface-variant),
+      list-list-item-trailing-icon-color: map.get($system, on-surface-variant),
+      list-list-item-selected-trailing-icon-color: map.get($system, on-surface-variant),
+      list-list-item-disabled-label-text-color: map.get($system, on-surface),
+      list-list-item-disabled-leading-icon-color: map.get($system, on-surface),
+      list-list-item-disabled-trailing-icon-color: map.get($system, on-surface),
+      list-list-item-hover-label-text-color: map.get($system, on-surface),
+      list-list-item-hover-leading-icon-color: map.get($system, on-surface-variant),
+      list-list-item-hover-state-layer-color: map.get($system, on-surface),
+      list-list-item-hover-state-layer-opacity: map.get($system, hover-state-layer-opacity),
+      list-list-item-hover-trailing-icon-color: map.get($system, on-surface-variant),
+      list-list-item-focus-label-text-color: map.get($system, on-surface),
+      list-list-item-focus-state-layer-color: map.get($system, on-surface),
+      list-list-item-focus-state-layer-opacity: map.get($system, focus-state-layer-opacity),
+    ),
+    typography: (
+      list-list-item-label-text-font: map.get($system, body-large-font),
+      list-list-item-label-text-line-height: map.get($system, body-large-line-height),
+      list-list-item-label-text-size: map.get($system, body-large-size),
+      list-list-item-label-text-tracking: map.get($system, body-large-tracking),
+      list-list-item-label-text-weight: map.get($system, body-large-weight),
+      list-list-item-supporting-text-font: map.get($system, body-medium-font),
+      list-list-item-supporting-text-line-height: map.get($system, body-medium-line-height),
+      list-list-item-supporting-text-size: map.get($system, body-medium-size),
+      list-list-item-supporting-text-tracking: map.get($system, body-medium-tracking),
+      list-list-item-supporting-text-weight: map.get($system, body-medium-weight),
+      list-list-item-trailing-supporting-text-font: map.get($system, body-small-font),
+      list-list-item-trailing-supporting-text-line-height: map.get($system, body-small-line-height),
+      list-list-item-trailing-supporting-text-size: map.get($system, body-small-size),
+      list-list-item-trailing-supporting-text-tracking: map.get($system, body-small-tracking),
+      list-list-item-trailing-supporting-text-weight: map.get($system, body-small-weight),
+    ),
+    density: (
+      list-list-item-leading-icon-start-space: 16px,
+      list-list-item-leading-icon-end-space: 32px,
+      list-list-item-one-line-container-height: map.get((
+        0: 48px,
+        -1: 44px,
+        -2: 40px,
+        -3: 36px,
+        -4: 32px,
+        -5: 24px,
+      ), $density-scale),
+      list-list-item-two-line-container-height: map.get((
+        0: 64px,
+        -1: 60px,
+        -2: 56px,
+        -3: 52px,
+        -4: 48px,
+        -5: 48px,
+      ), $density-scale),
+      list-list-item-three-line-container-height: map.get((
+        0: 88px,
+        -1: 84px,
+        -2: 80px,
+        -3: 76px,
+        -4: 72px,
+        -5: 56px,
+      ), $density-scale),
+    ),
   );
 }

package/list/_m3-list.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';
 
 /// Generates custom tokens for the mat-list.
@@ -72,7 +71,7 @@
       list-list-item-trailing-supporting-text-tracking: map.get($system, label-small-tracking),
       list-list-item-trailing-supporting-text-weight: map.get($system, label-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/menu/_m2-menu.scss

@@ -1,57 +1,44 @@
-@use '../core/theming/inspection';
 @use '../core/style/elevation';
 @use 'sass:map';
 @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 (
-    menu-container-shape: 4px,
-    menu-divider-bottom-spacing: 0,
-    menu-divider-top-spacing: 0,
-    menu-item-spacing: 16px,
-    menu-item-icon-size: 24px,
-    menu-item-leading-spacing: 16px,
-    menu-item-trailing-spacing: 16px,
-    menu-item-with-icon-leading-spacing: 16px,
-    menu-item-with-icon-trailing-spacing: 16px,
-    menu-container-elevation-shadow: elevation.get-box-shadow(8),
-
-    // Unused
-    menu-base-elevation-level: null,
-  );
-}
-
-// 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 (
-    menu-item-label-text-color: map.get($system, on-surface),
-    menu-item-icon-color: map.get($system, on-surface),
-    menu-item-hover-state-layer-color: m3-utils.color-with-opacity(
-        map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
-    menu-item-focus-state-layer-color: m3-utils.color-with-opacity(
-        map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
-    menu-container-color: map.get($system, surface),
-    menu-divider-color: map.get($system, outline),
-  );
-}
+    base: (
+      menu-container-shape: 4px,
+      menu-divider-bottom-spacing: 0,
+      menu-divider-top-spacing: 0,
+      menu-item-spacing: 16px,
+      menu-item-icon-size: 24px,
+      menu-item-leading-spacing: 16px,
+      menu-item-trailing-spacing: 16px,
+      menu-item-with-icon-leading-spacing: 16px,
+      menu-item-with-icon-trailing-spacing: 16px,
+      menu-container-elevation-shadow: elevation.get-box-shadow(8),
 
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  @return (
-    menu-item-label-text-font: inspection.get-theme-typography($theme, body-1, font-family),
-    menu-item-label-text-size: inspection.get-theme-typography($theme, body-1, font-size),
-    menu-item-label-text-tracking: inspection.get-theme-typography($theme, body-1, letter-spacing),
-    menu-item-label-text-line-height: inspection.get-theme-typography($theme, body-1, line-height),
-    menu-item-label-text-weight: inspection.get-theme-typography($theme, body-1, font-weight),
+      // Unused
+      menu-base-elevation-level: null,
+    ),
+    color: (
+      menu-item-label-text-color: map.get($system, on-surface),
+      menu-item-icon-color: map.get($system, on-surface),
+      menu-item-hover-state-layer-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
+      menu-item-focus-state-layer-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
+      menu-container-color: map.get($system, surface),
+      menu-divider-color: map.get($system, outline),
+    ),
+    typography: (
+      menu-item-label-text-font: map.get($system, body-large-font),
+      menu-item-label-text-size: map.get($system, body-large-size),
+      menu-item-label-text-tracking: map.get($system, body-large-tracking),
+      menu-item-label-text-line-height: map.get($system, body-large-line-height),
+      menu-item-label-text-weight: map.get($system, body-large-weight),
+    ),
+    density: (),
   );
 }
-
-// Tokens that can be configured through Angular Material's density theming API.
-@function get-density-tokens($theme) {
-  @return ();
-}

package/menu/_menu-theme.scss

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