@angular/material 20.1.0-next.2 → 20.1.0

package/stepper/_m2-stepper.scss

@@ -1,65 +1,50 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @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 (
-    stepper-header-focus-state-layer-shape: 0,
-    stepper-header-hover-state-layer-shape: 0,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-  @return map.merge(private-get-color-palette-color-tokens($theme, primary), (
-    stepper-container-color: map.get($system, surface),
-    stepper-line-color: map.get($system, outline),
-    stepper-header-hover-state-layer-color: m3-utils.color-with-opacity(
-        map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
-    stepper-header-focus-state-layer-color: m3-utils.color-with-opacity(
-        map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
-    stepper-header-label-text-color: map.get($system, on-surface-variant),
-    stepper-header-optional-label-text-color: map.get($system, on-surface-variant),
-    stepper-header-selected-state-label-text-color: map.get($system, on-surface),
-    stepper-header-error-state-label-text-color: map.get($system, error),
-    stepper-header-icon-background-color: map.get($system, on-surface-variant),
-    stepper-header-error-state-icon-foreground-color: map.get($system, error),
-    stepper-header-error-state-icon-background-color: transparent,
-  ));
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
-  @return (
-    stepper-container-text-font: map.get($system, body-medium-font),
-    stepper-header-label-text-font: map.get($system, body-medium-font),
-    stepper-header-label-text-size: map.get($system, body-medium-size),
-    stepper-header-label-text-weight: map.get($system, body-medium-weight),
-    stepper-header-error-state-label-text-size: map.get($system, body-large-size),
-    stepper-header-selected-state-label-text-size: map.get($system, body-large-size),
-    stepper-header-selected-state-label-text-weight: map.get($system, body-large-weight),
-  );
-}
-
-// 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), -4);
-  $height-config: (
-    0: 72px,
-    -1: 68px,
-    -2: 64px,
-    -3: 60px,
-    -4: 42px,
-  );
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
-    stepper-header-height: map.get($height-config, $scale),
+    base: (
+      stepper-header-focus-state-layer-shape: 0,
+      stepper-header-hover-state-layer-shape: 0,
+    ),
+    color: map.merge(private-get-color-palette-color-tokens($theme, primary), (
+      stepper-container-color: map.get($system, surface),
+      stepper-line-color: map.get($system, outline),
+      stepper-header-hover-state-layer-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface), map.get($system, hover-state-layer-opacity)),
+      stepper-header-focus-state-layer-color: m3-utils.color-with-opacity(
+          map.get($system, on-surface), map.get($system, focus-state-layer-opacity)),
+      stepper-header-label-text-color: map.get($system, on-surface-variant),
+      stepper-header-optional-label-text-color: map.get($system, on-surface-variant),
+      stepper-header-selected-state-label-text-color: map.get($system, on-surface),
+      stepper-header-error-state-label-text-color: map.get($system, error),
+      stepper-header-icon-background-color: map.get($system, on-surface-variant),
+      stepper-header-error-state-icon-foreground-color: map.get($system, error),
+      stepper-header-error-state-icon-background-color: transparent)
+    ),
+    typography: (
+      stepper-container-text-font: map.get($system, body-medium-font),
+      stepper-header-label-text-font: map.get($system, body-medium-font),
+      stepper-header-label-text-size: map.get($system, body-medium-size),
+      stepper-header-label-text-weight: map.get($system, body-medium-weight),
+      stepper-header-error-state-label-text-size: map.get($system, body-large-size),
+      stepper-header-selected-state-label-text-size: map.get($system, body-large-size),
+      stepper-header-selected-state-label-text-weight: map.get($system, body-large-weight),
+    ),
+    density: (
+      stepper-header-height: map.get((
+        0: 72px,
+        -1: 68px,
+        -2: 64px,
+        -3: 60px,
+        -4: 42px,
+      ), $density-scale),
+    ),
   );
 }
 

package/stepper/_m3-stepper.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.
@@ -52,7 +51,7 @@ $prefix: (mat, stepper);
       stepper-header-selected-state-label-text-size: map.get($system, title-small-size),
       stepper-header-selected-state-label-text-weight: map.get($system, title-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/stepper/_stepper-theme.scss

@@ -9,7 +9,7 @@
 /// for mat-stepper.
 /// @param {Map} $theme The theme to generate base styles for.
 @mixin base($theme) {
-  $tokens: m2-stepper.get-unthemable-tokens();
+  $tokens: map.get(m2-stepper.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-stepper.get-tokens($theme), base);
   }
@@ -21,7 +21,7 @@
 /// @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: m2-stepper.get-color-tokens($theme);
+  $tokens: map.get(m2-stepper.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-stepper.get-tokens($theme, $color-variant), color);
   }
@@ -42,7 +42,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-stepper.get-typography-tokens($theme);
+  $tokens: map.get(m2-stepper.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-stepper.get-tokens($theme), typography);
   }
@@ -51,7 +51,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-stepper.get-density-tokens($theme);
+  $tokens: map.get(m2-stepper.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-stepper.get-tokens($theme), density);
   }

package/table/_m2-table.scss

@@ -1,74 +1,63 @@
 @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 (
-    table-row-item-outline-width: 1px,
-  );
-}
-
-// Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-
-  @return (
-    table-background-color: map.get($system, surface),
-    table-header-headline-color: map.get($system, on-surface),
-    table-row-item-label-text-color: map.get($system, on-surface),
-    table-row-item-outline-color: map.get($system, outline),
-  );
-}
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
-  @return (
-    table-header-headline-font: map.get($system, label-medium-font),
-    table-header-headline-line-height: map.get($system, label-medium-line-height),
-    table-header-headline-size: map.get($system, label-medium-size),
-    table-header-headline-weight: map.get($system, label-medium-weight),
-    table-header-headline-tracking: map.get($system, label-medium-tracking),
-
-    // Plain cells and footer cells have the same typography.
-    table-row-item-label-text-font: map.get($system, body-medium-font),
-    table-row-item-label-text-line-height: map.get($system, body-medium-line-height),
-    table-row-item-label-text-size: map.get($system, body-medium-size),
-    table-row-item-label-text-weight: map.get($system, body-medium-weight),
-    table-row-item-label-text-tracking: map.get($system, body-medium-tracking),
-
-    table-footer-supporting-text-font: map.get($system, body-medium-font),
-    table-footer-supporting-text-line-height: map.get($system, body-medium-line-height),
-    table-footer-supporting-text-size: map.get($system, body-medium-size),
-    table-footer-supporting-text-weight: map.get($system, body-medium-weight),
-    table-footer-supporting-text-tracking: map.get($system, body-medium-tracking),
-  );
-}
-
-// 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), -4);
-  $header-scale: (
-    0: 56px,
-    -1: 52px,
-    -2: 48px,
-    -3: 44px,
-    -4: 40px
-  );
-  $cell-scale: (
-    0: 52px,
-    -1: 48px,
-    -2: 44px,
-    -3: 40px,
-    -4: 36px
-  );
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
-    table-header-container-height: map.get($header-scale, $scale),
-    table-footer-container-height: map.get($cell-scale, $scale),
-    table-row-item-container-height: map.get($cell-scale, $scale),
+    base: (
+      table-row-item-outline-width: 1px,
+    ),
+    color: (
+      table-background-color: map.get($system, surface),
+      table-header-headline-color: map.get($system, on-surface),
+      table-row-item-label-text-color: map.get($system, on-surface),
+      table-row-item-outline-color: map.get($system, outline),
+    ),
+    typography: (
+      table-header-headline-font: map.get($system, label-medium-font),
+      table-header-headline-line-height: map.get($system, label-medium-line-height),
+      table-header-headline-size: map.get($system, label-medium-size),
+      table-header-headline-weight: map.get($system, label-medium-weight),
+      table-header-headline-tracking: map.get($system, label-medium-tracking),
+
+      // Plain cells and footer cells have the same typography.
+      table-row-item-label-text-font: map.get($system, body-medium-font),
+      table-row-item-label-text-line-height: map.get($system, body-medium-line-height),
+      table-row-item-label-text-size: map.get($system, body-medium-size),
+      table-row-item-label-text-weight: map.get($system, body-medium-weight),
+      table-row-item-label-text-tracking: map.get($system, body-medium-tracking),
+
+      table-footer-supporting-text-font: map.get($system, body-medium-font),
+      table-footer-supporting-text-line-height: map.get($system, body-medium-line-height),
+      table-footer-supporting-text-size: map.get($system, body-medium-size),
+      table-footer-supporting-text-weight: map.get($system, body-medium-weight),
+      table-footer-supporting-text-tracking: map.get($system, body-medium-tracking),
+    ),
+    density: (
+      table-header-container-height: map.get((
+        0: 56px,
+        -1: 52px,
+        -2: 48px,
+        -3: 44px,
+        -4: 40px
+      ), $density-scale),
+      table-footer-container-height: map.get((
+        0: 52px,
+        -1: 48px,
+        -2: 44px,
+        -3: 40px,
+        -4: 36px
+      ), $density-scale),
+      table-row-item-container-height: map.get((
+        0: 52px,
+        -1: 48px,
+        -2: 44px,
+        -3: 40px,
+        -4: 36px
+      ), $density-scale),
+    ),
   );
 }

package/table/_m3-table.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-table.
@@ -36,7 +35,7 @@
       table-footer-supporting-text-tracking: map.get($system, body-medium-tracking),
       table-footer-supporting-text-weight: map.get($system, body-medium-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/table/_table-theme.scss

@@ -6,7 +6,7 @@
 @use '../core/tokens/token-utils';
 
 @mixin base($theme) {
-  $tokens: m2-table.get-unthemable-tokens();
+  $tokens: map.get(m2-table.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-table.get-tokens($theme), base);
   }
@@ -15,7 +15,7 @@
 }
 
 @mixin color($theme) {
-  $tokens: m2-table.get-color-tokens($theme);
+  $tokens: map.get(m2-table.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-table.get-tokens($theme), color);
   }
@@ -24,7 +24,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-table.get-typography-tokens($theme);
+  $tokens: map.get(m2-table.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-table.get-tokens($theme), typography);
   }
@@ -33,7 +33,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-table.get-density-tokens($theme);
+  $tokens: map.get(m2-table.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-table.get-tokens($theme), density);
   }

package/tabs/_m2-tabs.scss

@@ -1,32 +1,44 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @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.
-//
-// 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() {
+@function get-tokens($theme) {
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
+
   @return (
-    // This is specified both here and in the density tokens, because it determines the size of the
-    // tab itself and there are internal tests who don't configure the theme correctly.
-    tab-container-height: 48px,
-    // For some period of time, the MDC tabs removed the divider. This has been added back in
-    // and will be present in M3.
-    tab-divider-color: transparent,
-    tab-divider-height: 0,
-    tab-active-indicator-height: 2px,
-    // Currently set to zero, but used by the gmat styles to make the indicator rounded.
-    tab-active-indicator-shape: 0,
+    base: (
+      // This is specified both here and in the density tokens, because it determines the size of
+      // the tab itself and there are internal tests who don't configure the theme correctly.
+      tab-container-height: 48px,
+      tab-divider-color: transparent,
+      tab-divider-height: 0,
+      tab-active-indicator-height: 2px,
+      tab-active-indicator-shape: 0,
+    ),
+    color: private-get-color-palette-color-tokens($theme, primary),
+    typography: (
+      tab-label-text-font: map.get($system, label-small-font),
+      tab-label-text-size: map.get($system, label-small-size),
+      tab-label-text-tracking: map.get($system, label-small-tracking),
+      tab-label-text-line-height: map.get($system, label-small-line-height),
+      tab-label-text-weight: map.get($system, label-small-weight),
+    ),
+    density: (
+      tab-container-height: map.get((
+        0: 48px,
+        -1: 44px,
+        -2: 40px,
+        -3: 36px,
+        -4: 32px,
+      ), $density-scale),
+    ),
   );
 }
 
 // Tokens that can be configured through Angular Material's color theming API.
-@function get-color-tokens($theme, $color-variant, $exclude: ()) {
+@function private-get-color-palette-color-tokens($theme, $color-variant, $exclude: ()) {
   $system: m2-utils.get-system($theme);
   $system: m3-utils.replace-colors-with-variant($system, primary, $color-variant);
 
@@ -54,31 +66,3 @@
 
   @return $tokens;
 }
-
-// Tokens that can be configured through Angular Material's typography theming API.
-@function get-typography-tokens($theme) {
-  $system: m2-utils.get-system($theme);
-  @return (
-    // Note: MDC has equivalents of these tokens, but they lead to much higher selector specificity.
-    tab-label-text-font: map.get($system, label-small-font),
-    tab-label-text-size: map.get($system, label-small-size),
-    tab-label-text-tracking: map.get($system, label-small-tracking),
-    tab-label-text-line-height: map.get($system, label-small-line-height),
-    tab-label-text-weight: map.get($system, label-small-weight),
-  );
-}
-
-// 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), -4);
-
-  @return (
-    tab-container-height: map.get((
-      0: 48px,
-      -1: 44px,
-      -2: 40px,
-      -3: 36px,
-      -4: 32px,
-    ), $scale),
-  );
-}

package/tabs/_m3-tabs.scss

@@ -2,7 +2,6 @@
 @use 'sass:map';
 @use 'sass:list';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates the tokens for MDC tab
@@ -44,7 +43,7 @@
       tab-label-text-tracking: map.get($system, title-small-tracking),
       tab-label-text-weight: map.get($system, title-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 

package/tabs/_tabs-theme.scss

@@ -6,7 +6,7 @@
 @use 'sass:map';
 
 @mixin base($theme) {
-  $tokens: m2-tabs.get-unthemable-tokens();
+  $tokens: map.get(m2-tabs.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-tabs.get-tokens($theme), base);
   }
@@ -25,23 +25,23 @@
     .mat-mdc-tab-group,
     .mat-mdc-tab-nav-bar {
       @include token-utils.values(
-          m2-tabs.get-color-tokens($theme, primary,
+          m2-tabs.private-get-color-palette-color-tokens($theme, primary,
             $exclude: (tab-background-color, tab-foreground-color)));
 
       &.mat-accent {
         @include token-utils.values(
-          m2-tabs.get-color-tokens($theme, secondary,
+          m2-tabs.private-get-color-palette-color-tokens($theme, secondary,
             $exclude: (tab-background-color, tab-foreground-color)));
       }
 
       &.mat-warn {
         @include token-utils.values(
-          m2-tabs.get-color-tokens($theme, error,
+          m2-tabs.private-get-color-palette-color-tokens($theme, error,
             $exclude: (tab-background-color, tab-foreground-color)));
       }
 
       &.mat-background-primary {
-        $tokens: m2-tabs.get-color-tokens($theme, primary);
+        $tokens: m2-tabs.private-get-color-palette-color-tokens($theme, primary);
         @include token-utils.values((
           tab-background-color: map.get($tokens, tab-background-color),
           tab-foreground-color: map.get($tokens, tab-foreground-color)
@@ -49,7 +49,7 @@
       }
 
       &.mat-background-accent {
-        $tokens: m2-tabs.get-color-tokens($theme, secondary);
+        $tokens: m2-tabs.private-get-color-palette-color-tokens($theme, secondary);
         @include token-utils.values((
           tab-background-color: map.get($tokens, tab-background-color),
           tab-foreground-color: map.get($tokens, tab-foreground-color),
@@ -57,7 +57,7 @@
       }
 
       &.mat-background-warn {
-        $tokens: m2-tabs.get-color-tokens($theme, error);
+        $tokens: m2-tabs.private-get-color-palette-color-tokens($theme, error);
         @include token-utils.values((
           tab-background-color: map.get($tokens, tab-background-color),
           tab-foreground-color: map.get($tokens, tab-foreground-color),
@@ -74,7 +74,7 @@
     @include token-utils.values(map.get(m3-tabs.get-tokens($theme), typography));
   } @else {
     .mat-mdc-tab-header {
-      @include token-utils.values(m2-tabs.get-typography-tokens($theme));
+      @include token-utils.values(map.get(m2-tabs.get-tokens($theme), typography));
     }
   }
 }
@@ -86,7 +86,7 @@
     @include token-utils.values(map.get(m3-tabs.get-tokens($theme), density));
   } @else {
     .mat-mdc-tab-header {
-      @include token-utils.values(m2-tabs.get-density-tokens($theme));
+      @include token-utils.values(map.get(m2-tabs.get-tokens($theme), density));
     }
   }
 }

package/timepicker/_m2-timepicker.scss

@@ -2,30 +2,18 @@
 @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.
-@function get-unthemable-tokens() {
-  @return (
-    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) {
+@function get-tokens($theme) {
   $system: m2-utils.get-system($theme);
 
   @return (
-    timepicker-container-background-color: map.get($system, surface)
+    base: (
+      timepicker-container-shape: 4px,
+      timepicker-container-elevation-shadow: elevation.get-box-shadow(8),
+    ),
+    color: (
+      timepicker-container-background-color: map.get($system, surface)
+    ),
+    typography: (),
+    density: (),
   );
 }
-
-// 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 ();
-}

package/timepicker/_timepicker-theme.scss

@@ -6,7 +6,7 @@
 @use '../core/tokens/token-utils';
 
 @mixin base($theme) {
-  $tokens: m2-timepicker.get-unthemable-tokens();
+  $tokens: map.get(m2-timepicker.get-tokens($theme), base);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-timepicker.get-tokens($theme), base);
   }
@@ -15,7 +15,7 @@
 }
 
 @mixin color($theme) {
-  $tokens: m2-timepicker.get-color-tokens($theme);
+  $tokens: map.get(m2-timepicker.get-tokens($theme), color);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-timepicker.get-tokens($theme), color);
   }
@@ -24,7 +24,7 @@
 }
 
 @mixin typography($theme) {
-  $tokens: m2-timepicker.get-typography-tokens($theme);
+  $tokens: map.get(m2-timepicker.get-tokens($theme), typography);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-timepicker.get-tokens($theme), typography);
   }
@@ -33,7 +33,7 @@
 }
 
 @mixin density($theme) {
-  $tokens: m2-timepicker.get-density-tokens($theme);
+  $tokens: map.get(m2-timepicker.get-tokens($theme), density);
   @if inspection.get-theme-version($theme) == 1 {
     $tokens: map.get(m3-timepicker.get-tokens($theme), density);
   }