@angular/material 20.0.0-next.4 → 20.0.0-next.6

package/core/ripple/_ripple-theme.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../tokens/m2/mat/ripple' as tokens-mat-ripple;
+@use './m2-ripple';
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
 @use '../theming/theming';
@@ -19,8 +19,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-ripple.$prefix,
-        tokens-mat-ripple.get-color-tokens($theme)
+        m2-ripple.$prefix,
+        m2-ripple.get-color-tokens($theme)
       );
     }
   }
@@ -32,8 +32,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-ripple.$prefix,
-        tokens-mat-ripple.get-typography-tokens($theme)
+        m2-ripple.$prefix,
+        m2-ripple.get-typography-tokens($theme)
       );
     }
   }
@@ -45,8 +45,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-ripple.$prefix,
-        tokens-mat-ripple.get-density-tokens($theme)
+        m2-ripple.$prefix,
+        m2-ripple.get-density-tokens($theme)
       );
     }
   }
@@ -56,8 +56,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-ripple.$prefix,
-      tokens: tokens-mat-ripple.get-token-slots(),
+      namespace: m2-ripple.$prefix,
+      tokens: m2-ripple.get-token-slots(),
     ),
   );
 }
@@ -91,8 +91,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-ripple.$prefix,
-      map.get($tokens, tokens-mat-ripple.$prefix)
+      m2-ripple.$prefix,
+      map.get($tokens, m2-ripple.$prefix)
     );
   }
 }

package/core/ripple/_ripple.scss

@@ -1,5 +1,5 @@
 @use '@angular/cdk';
-@use '../tokens/m2/mat/ripple' as tokens-mat-ripple;
+@use './m2-ripple';
 @use '../tokens/token-utils';
 
 @mixin ripple() {
@@ -37,10 +37,9 @@
     // the ripples aren't clipped when inside the shadow DOM (see #24028).
     transform: scale3d(0, 0, 0);
 
-    @include token-utils.use-tokens(
-      tokens-mat-ripple.$prefix, tokens-mat-ripple.get-token-slots()) {
+    @include token-utils.use-tokens(m2-ripple.$prefix, m2-ripple.get-token-slots()) {
       // We have to emit a fallback value here, because some internal builds depend on it.
-      background-color: token-utils.get-token-variable(color, $fallback: rgba(#000, 0.1));
+      background-color: token-utils.slot(color, $fallback: rgba(#000, 0.1));
     }
 
     // In high contrast mode the ripple is opaque, causing it to obstruct the content.

package/core/{tokens/m2/mat/_full-pseudo-checkbox.scss → selection/pseudo-checkbox/_m2-pseudo-checkbox.scss}

@@ -1,9 +1,9 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../../tokens/m2-utils';
+@use '../../theming/inspection';
+@use '../../style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
-$prefix: (mat, full-pseudo-checkbox);
+$prefix: (mat, pseudo-checkbox);
 
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
@@ -18,12 +18,14 @@ $prefix: (mat, full-pseudo-checkbox);
   $checkmark-color: inspection.get-theme-color($theme, background, background);
 
   @return (
-    selected-icon-color: inspection.get-theme-color($theme, $palette-name),
-    selected-checkmark-color: $checkmark-color,
-    unselected-icon-color: inspection.get-theme-color($theme, foreground, secondary-text),
-    disabled-selected-checkmark-color: $checkmark-color,
-    disabled-unselected-icon-color: $disabled-color,
-    disabled-selected-icon-color: $disabled-color,
+    full-selected-icon-color: inspection.get-theme-color($theme, $palette-name),
+    full-selected-checkmark-color: $checkmark-color,
+    full-unselected-icon-color: inspection.get-theme-color($theme, foreground, secondary-text),
+    full-disabled-selected-checkmark-color: $checkmark-color,
+    full-disabled-unselected-icon-color: $disabled-color,
+    full-disabled-selected-icon-color: $disabled-color,
+    minimal-selected-checkmark-color: inspection.get-theme-color($theme, $palette-name),
+    minimal-disabled-selected-checkmark-color: if($is-dark, #686868, #b0b0b0),
   );
 }
 
@@ -42,8 +44,8 @@ $prefix: (mat, full-pseudo-checkbox);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      get-color-tokens(token-definition.$placeholder-color-config),
-      get-typography-tokens(token-definition.$placeholder-typography-config),
-      get-density-tokens(token-definition.$placeholder-density-config)
+      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/core/selection/pseudo-checkbox/_m3-pseudo-checkbox.scss

@@ -0,0 +1,49 @@
+@use 'sass:map';
+@use '../../style/sass-utils';
+@use '../../tokens/m3-utils';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, pseudo-checkbox);
+
+/// Generates custom tokens for the full variant of mat-pseudo-checkbox.
+/// @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 full variant of mat-pseudo-checkbox
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  $tokens: (
+    full-disabled-selected-checkmark-color: map.get($systems, md-sys-color, surface),
+    full-disabled-selected-icon-color: sass-utils.safe-color-change(
+        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+    full-disabled-unselected-icon-color: sass-utils.safe-color-change(
+        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+    full-selected-checkmark-color: map.get($systems, md-sys-color, on-primary),
+    full-selected-icon-color: map.get($systems, md-sys-color, primary),
+    full-unselected-icon-color: map.get($systems, md-sys-color, on-surface-variant),
+    minimal-disabled-selected-checkmark-color: sass-utils.safe-color-change(
+        map.get($systems, md-sys-color, on-surface), $alpha: 0.38),
+    minimal-selected-checkmark-color: map.get($systems, md-sys-color, primary),
+  );
+
+  $variant-tokens: (
+    // Color variants:
+    primary: (), // Default, no overrides needed.
+    secondary: (
+      full-selected-checkmark-color: map.get($systems, md-sys-color, on-secondary),
+      full-selected-icon-color: map.get($systems, md-sys-color, secondary),
+      minimal-selected-checkmark-color: map.get($systems, md-sys-color, secondary),
+    ),
+    tertiary: (
+      full-selected-checkmark-color: map.get($systems, md-sys-color, on-tertiary),
+      full-selected-icon-color: map.get($systems, md-sys-color, tertiary),
+      minimal-selected-checkmark-color: map.get($systems, md-sys-color, tertiary),
+    ),
+    error: (
+      full-selected-checkmark-color: map.get($systems, md-sys-color, on-error),
+      full-selected-icon-color: map.get($systems, md-sys-color, error),
+      minimal-selected-checkmark-color: map.get($systems, md-sys-color, error),
+    )
+  );
+
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
+}

package/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss

@@ -3,18 +3,13 @@
 @use '../../theming/validation';
 @use '../../style/sass-utils';
 @use '../../tokens/token-utils';
-@use '../../tokens/m2/mat/full-pseudo-checkbox' as tokens-mat-full-pseudo-checkbox;
-@use '../../tokens/m2/mat/minimal-pseudo-checkbox' as tokens-mat-minimal-pseudo-checkbox;
+@use './m2-pseudo-checkbox';
 
 @mixin _palette-styles($theme, $palette-name) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values-mixed(
-      tokens-mat-full-pseudo-checkbox.$prefix,
-      tokens-mat-full-pseudo-checkbox.get-color-tokens($theme, $palette-name)
-    );
-    @include token-utils.create-token-values-mixed(
-      tokens-mat-minimal-pseudo-checkbox.$prefix,
-      tokens-mat-minimal-pseudo-checkbox.get-color-tokens($theme, $palette-name)
+      m2-pseudo-checkbox.$prefix,
+      m2-pseudo-checkbox.get-color-tokens($theme, $palette-name)
     );
   }
 }
@@ -23,24 +18,10 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-full-pseudo-checkbox-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-full-pseudo-checkbox.$prefix,
-    $options...
-  );
-  $mat-minimal-pseudo-checkbox-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
-    $options...
-  );
-  @include token-utils.create-token-values-mixed(
-    tokens-mat-full-pseudo-checkbox.$prefix,
-    $mat-full-pseudo-checkbox-tokens
-  );
+  $mat-pseudo-checkbox-tokens: token-utils.get-tokens-for(
+    $tokens, m2-pseudo-checkbox.$prefix, $options...);
   @include token-utils.create-token-values-mixed(
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
-    $mat-minimal-pseudo-checkbox-tokens
-  );
+      m2-pseudo-checkbox.$prefix, $mat-pseudo-checkbox-tokens);
 }
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -51,19 +32,10 @@
 
 /// Defines the tokens that will be available in the `overrides` mixin and for docs extraction.
 @function _define-overrides() {
-  $full-pseudo-checkbox-tokens: tokens-mat-full-pseudo-checkbox.get-token-slots();
-  $minimal-pseudo-checkbox-tokens: tokens-mat-minimal-pseudo-checkbox.get-token-slots();
-
   @return (
     (
-      namespace: tokens-mat-full-pseudo-checkbox.$prefix,
-      tokens: $full-pseudo-checkbox-tokens,
-      prefix: 'full-',
-    ),
-    (
-      namespace: tokens-mat-minimal-pseudo-checkbox.$prefix,
-      tokens: $minimal-pseudo-checkbox-tokens,
-      prefix: 'minimal-',
+      namespace: m2-pseudo-checkbox.$prefix,
+      tokens: m2-pseudo-checkbox.get-token-slots(),
     ),
   );
 }

package/core/testing/index.d.ts

@@ -1,3 +1,3 @@
-export { M as MatOptionHarness, O as OptionHarnessFilters } from '../../option-harness.d-3d33fc9a.js';
-export { M as MatOptgroupHarness, O as OptgroupHarnessFilters } from '../../optgroup-harness.d-7f741f69.js';
+export { M as MatOptionHarness, O as OptionHarnessFilters } from '../../option-harness.d-4f143bc0.js';
+export { M as MatOptgroupHarness, O as OptgroupHarnessFilters } from '../../optgroup-harness.d-c52f5a8b.js';
 import '@angular/cdk/testing';

package/core/theming/_definition.scss

@@ -7,12 +7,12 @@
 @use './config-validation';
 
 // Prefix used for component token fallback variables, e.g.
-// `color: var(--mdc-text-button-label-text-color, var(--mat-sys-primary));`
+// `color: var(--mat-text-button-label-text-color, var(--mat-sys-primary));`
 $system-fallback-prefix: mat-sys;
 
 // Default system level prefix to use when directly calling the `system-level-*` mixins.
 // Prefix used for component token fallback variables, e.g.
-// `color: var(--mdc-text-button-label-text-color, var(--mat-sys-primary));`
+// `color: var(--mat-text-button-label-text-color, var(--mat-sys-primary));`
 // TODO: Remove this variable after internal clients are migrated from "sys"
 $system-level-prefix: mat-sys;
 

package/core/theming/_inspection.scss

@@ -119,7 +119,7 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
   @if not theme-has($theme, color) {
     @error 'Color information is not available on this theme.';
   }
-  $color-roles: map.get($theme, $_internals, color-tokens, (mdc, theme));
+  $color-roles: map.get($theme, $_internals, color-tokens, (mat, theme));
   $result: map.get($color-roles, $color-role-name);
   @if not $result {
     @error #{'Valid color roles are: #{map.keys($color-roles)}. Got:'} $color-role-name;
@@ -185,7 +185,7 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
       font-weight: '-weight'
     ), $property);
     $token-name: '#{$typescale}#{$property-key}';
-    @return map.get($theme, $_internals, typography-tokens, (mdc, typography), $token-name);
+    @return map.get($theme, $_internals, typography-tokens, (mat, typography), $token-name);
   }
   @else {
     @error #{'Unrecognized theme version:'} $version;

package/core/tokens/_density.scss

@@ -7,7 +7,7 @@
 /// systemized density.
 /// Format:
 /// (
-///   (mdc, comp): (
+///   (mat, comp): (
 ///     token: (<scale 0 value>, <scale -1 value>, <scale -2 value>, ...),
 ///     ...
 ///   ),
@@ -15,153 +15,107 @@
 /// )
 // TODO(mmalerba): Add density tokens for remaining components.
 $_density-tokens: (
-  // MDC tokens
-  (mdc, checkbox): (
-    state-layer-size: (40px, 36px, 32px, 28px),
-  ),
-  (mdc, chip): (
-    container-height: (32px, 28px, 24px),
-  ),
-  (mdc, circular-progress): (),
-  (mdc, dialog): (),
-  (mdc, elevated-card): (),
-  (mdc, extended-fab): (),
-  (mdc, fab): (),
-  (mdc, fab-small): (),
-  (mdc, filled-text-field): (),
-  (mdc, text-button): (
-    container-height: (40px, 36px, 32px, 28px),
-  ),
-  (mdc, protected-button): (
-    container-height: (40px, 36px, 32px, 28px),
-  ),
-  (mdc, filled-button): (
-    container-height: (40px, 36px, 32px, 28px),
-  ),
-  (mat, tonal-button): (
-    container-height: (40px, 36px, 32px, 28px),
-    touch-target-display: (block, block, none, none),
-  ),
-  (mdc, outlined-button): (
-    container-height: (40px, 36px, 32px, 28px),
-  ),
-  (mdc, icon-button): (
-    // The size caps out at 24px, because anything lower will be smaller than the icon.
-    state-layer-size: (40px, 36px, 32px, 28px, 24px, 24px),
-  ),
-  (mdc, linear-progress): (),
-  (mdc, list): (
-    list-item-one-line-container-height: (48px, 44px, 40px, 36px, 32px, 24px),
-    list-item-two-line-container-height: (64px, 60px, 56px, 52px, 48px, 48px),
-    list-item-three-line-container-height: (88px, 84px, 80px, 76px, 72px, 56px),
-  ),
-  (mdc, outlined-card): (),
-  (mdc, outlined-text-field): (),
-  (mdc, plain-tooltip): (),
-  (mdc, radio): (
-    state-layer-size: (40px, 36px, 32px, 28px),
-  ),
-  (mdc, slider): (),
-  (mdc, snackbar): (),
-  (mdc, switch): (),
-  (mdc, secondary-navigation-tab): (
-    container-height: (48px, 44px, 40px, 36px, 32px)
-  ),
-  (mdc, tab-indicator): (),
-
-  // Custom Angular Material tokens
-  (mat, autocomplete): (),
-  (mat, badge): (),
-  (mat, bottom-sheet): (),
-  (mat, card): (),
-  (mat, checkbox): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, dialog): (),
-  (mat, datepicker): (),
-  (mat, divider): (),
-  (mat, expansion): (
-    header-collapsed-state-height: (48px, 44px, 40px, 36px),
-    header-expanded-state-height: (64px, 60px, 56px, 48px),
-  ),
-  (mat, fab): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, form-field): (
-    container-height: (56px, 52px, 48px, 44px, 40px, 36px),
-    filled-label-display: (block, block, none, none, none, none),
-    container-vertical-padding: (16px, 14px, 12px, 10px, 8px, 6px),
-    filled-with-label-container-padding-top: (24px, 22px, 12px, 10px, 8px, 6px),
-    filled-with-label-container-padding-bottom: (8px, 6px, 12px, 10px, 8px, 6px),
-  ),
-  (mat, grid-list): (),
-  (mat, icon): (),
-  (mat, icon-button): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, list): (
-    list-item-leading-icon-start-space: (16px, 12px, 8px, 4px),
-    list-item-leading-icon-end-space: (16px, 12px, 8px, 4px),
-  ),
-  (mat, text-button): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, protected-button): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, filled-button): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, outlined-button): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, menu): (),
-  (mat, optgroup): (),
-  (mat, option): (),
-  (mat, full-pseudo-checkbox): (),
-  (mat, minimal-pseudo-checkbox): (),
-  (mat, paginator): (
-    container-size: (56px, 52px, 48px, 40px),
-    form-field-container-height: (40px, 40px, 40px, 40px, 40px, 36px),
-    form-field-container-vertical-padding: (8px, 8px, 8px, 8px, 8px, 6px),
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, radio): (
-    touch-target-display: (block, block, none, none),
-  ),
-  (mat, ripple): (),
-  (mat, select): (
-    arrow-transform: (
-      translateY(-8px),
-      translateY(-8px),
-      none,
-    ),
-  ),
-  (mat, sidenav): (),
-  (mat, slide-toggle): (),
-  (mat, slider): (),
-  (mat, snack-bar): (),
-  (mat, sort): (),
-  (mat, timepicker): (),
-  (mat, standard-button-toggle): (
-    height: (40px, 40px, 40px, 36px, 24px),
-  ),
-  (mat, stepper): (
-    header-height: (72px, 68px, 64px, 60px, 42px),
-  ),
-  (mat, tab-header): (),
-  (mat, table): (
-    header-container-height: (56px, 52px, 48px, 44px, 40px),
-    footer-container-height: (52px, 48px, 44px, 40px, 36px),
-    row-item-container-height: (52px, 48px, 44px, 40px, 36px),
-  ),
-  (mat, toolbar): (
-    standard-height: (64px, 60px, 56px, 52px),
-    mobile-height: (56px, 52px, 48px, 44px),
-  ),
-  (mat, tree): (
-    node-min-height: (48px, 44px, 40px, 36px, 28px),
-  ),
+    (mat, autocomplete): (),
+    (mat, badge): (),
+    (mat, bottom-sheet): (),
+    (mat, card): (),
+    (mat, checkbox): (
+      state-layer-size: (40px, 36px, 32px, 28px),
+      touch-target-display: (block, block, none, none),
+    ),
+    (mat, chip): (
+      container-height: (32px, 28px, 24px),
+    ),
+    (mat, progress-spinner): (),
+    (mat, datepicker): (),
+    (mat, dialog): (),
+    (mat, divider): (),
+    (mat, expansion): (
+      header-collapsed-state-height: (48px, 44px, 40px, 36px),
+      header-expanded-state-height: (64px, 60px, 56px, 48px),
+    ),
+    (mat, fab): (
+      touch-target-display: (block, block, none, none),
+    ),
+    (mat, button): (
+      filled-touch-target-display: (block, block, none, none),
+      filled-container-height: (40px, 36px, 32px, 28px),
+      outlined-container-height: (40px, 36px, 32px, 28px),
+      outlined-touch-target-display: (block, block, none, none),
+      protected-touch-target-display: (block, block, none, none),
+      protected-container-height: (40px, 36px, 32px, 28px),
+      text-touch-target-display: (block, block, none, none),
+      text-container-height: (40px, 36px, 32px, 28px),
+      tonal-container-height: (40px, 36px, 32px, 28px),
+      tonal-touch-target-display: (block, block, none, none),
+    ),
+    (mat, form-field): (
+      container-height: (56px, 52px, 48px, 44px, 40px, 36px),
+      filled-label-display: (block, block, none, none, none, none),
+      container-vertical-padding: (16px, 14px, 12px, 10px, 8px, 6px),
+      filled-with-label-container-padding-top: (24px, 22px, 12px, 10px, 8px, 6px),
+      filled-with-label-container-padding-bottom: (8px, 6px, 12px, 10px, 8px, 6px),
+    ),
+    (mat, grid-list): (),
+    (mat, icon): (),
+    (mat, icon-button): (
+      touch-target-display: (block, block, none, none),
+      // The size caps out at 24px, because anything lower will be smaller than the icon.
+      state-layer-size: (40px, 36px, 32px, 28px, 24px, 24px),
+    ),
+    (mat, progress-bar): (),
+    (mat, list): (
+      list-item-leading-icon-start-space: (16px, 12px, 8px, 4px),
+      list-item-leading-icon-end-space: (16px, 12px, 8px, 4px),
+      list-item-one-line-container-height: (48px, 44px, 40px, 36px, 32px, 24px),
+      list-item-two-line-container-height: (64px, 60px, 56px, 52px, 48px, 48px),
+      list-item-three-line-container-height: (88px, 84px, 80px, 76px, 72px, 56px),
+    ),
+    (mat, menu): (),
+    (mat, optgroup): (),
+    (mat, option): (),
+    (mat, paginator): (
+      container-size: (56px, 52px, 48px, 40px),
+      form-field-container-height: (40px, 40px, 40px, 40px, 40px, 36px),
+      form-field-container-vertical-padding: (8px, 8px, 8px, 8px, 8px, 6px),
+      touch-target-display: (block, block, none, none),
+    ),
+    (mat, tooltip): (),
+    (mat, radio): (
+      touch-target-display: (block, block, none, none),
+      state-layer-size: (40px, 36px, 32px, 28px),
+    ),
+    (mat, ripple): (),
+    (mat, tab): (
+      container-height: (48px, 44px, 40px, 36px, 32px),
+    ),
+    (mat, select): (
+      arrow-transform: (translateY(-8px), translateY(-8px), none),
+    ),
+    (mat, sidenav): (),
+    (mat, slider): (),
+    (mat, snack-bar): (),
+    (mat, sort): (),
+    (mat, button-toggle): (
+      height: (40px, 40px, 40px, 36px, 24px),
+    ),
+    (mat, stepper): (
+      header-height: (72px, 68px, 64px, 60px, 42px),
+    ),
+    (mat, slide-toggle): (),
+    (mat, table): (
+      header-container-height: (56px, 52px, 48px, 44px, 40px),
+      footer-container-height: (52px, 48px, 44px, 40px, 36px),
+      row-item-container-height: (52px, 48px, 44px, 40px, 36px),
+    ),
+    (mat, timepicker): (),
+    (mat, toolbar): (
+      standard-height: (64px, 60px, 56px, 52px),
+      mobile-height: (56px, 52px, 48px, 44px),
+    ),
+    (mat, tree): (
+      node-min-height: (48px, 44px, 40px, 36px, 28px),
+    ),
 );
 
 /// Gets the value for the given density scale from the given set of density values.