@angular/material 20.0.0-next.5 → 20.0.0-next.7

package/core/index.d.ts

@@ -1,21 +1,21 @@
 import * as i0 from '@angular/core';
 import { Version, InjectionToken, Provider } from '@angular/core';
-export { G as GranularSanityChecks, a as MATERIAL_SANITY_CHECKS, M as MatCommonModule, S as SanityChecks } from '../common-module.d-1b789e68.js';
-export { T as ThemePalette } from '../palette.d-f5ca9a2b.js';
+export { GranularSanityChecks, MATERIAL_SANITY_CHECKS, MatCommonModule, SanityChecks } from '../common-module.d-CUT8AqiB.js';
+export { ThemePalette } from '../palette.d-fF1us9u8.js';
 import { NgControl, FormGroupDirective, NgForm } from '@angular/forms';
 import { Subject } from 'rxjs';
-import { E as ErrorStateMatcher$1 } from '../error-options.d-bd1801bf.js';
-export { E as ErrorStateMatcher, S as ShowOnDirtyErrorStateMatcher } from '../error-options.d-bd1801bf.js';
-export { M as MatLine, a as MatLineModule, s as setLines } from '../line.d-ed625688.js';
-export { M as MatOptionModule } from '../index.d-6e895711.js';
-export { M as MatRippleLoader } from '../ripple-loader.d-ef3a5132.js';
-export { M as MatRippleModule } from '../index.d-609609fc.js';
-export { b as MatPseudoCheckbox, M as MatPseudoCheckboxModule, a as MatPseudoCheckboxState } from '../pseudo-checkbox-module.d-efa6959b.js';
-import { D as DateAdapter } from '../date-adapter.d-de8dcff3.js';
-export { D as DateAdapter, M as MAT_DATE_LOCALE, a as MAT_DATE_LOCALE_FACTORY } from '../date-adapter.d-de8dcff3.js';
-export { d as MAT_OPTGROUP, a as MatOptgroup, M as MatOption, b as MatOptionSelectionChange, _ as _countGroupLabelsBeforeOption, c as _getOptionScrollPosition } from '../option.d-be9de0a8.js';
-export { a as MAT_OPTION_PARENT_COMPONENT, M as MatOptionParentComponent } from '../option-parent.d-f2c0c7de.js';
-export { c as MAT_RIPPLE_GLOBAL_OPTIONS, M as MatRipple, g as RippleAnimationConfig, f as RippleConfig, b as RippleGlobalOptions, h as RippleRef, R as RippleRenderer, e as RippleState, a as RippleTarget, d as defaultRippleAnimationConfig } from '../ripple.d-838c5cd6.js';
+import { ErrorStateMatcher as ErrorStateMatcher$1 } from '../error-options.d-C1yXmo10.js';
+export { ShowOnDirtyErrorStateMatcher } from '../error-options.d-C1yXmo10.js';
+export { MatLine, MatLineModule, setLines } from '../line.d-OCn_JHOE.js';
+export { MatOptionModule } from '../index.d-osnm7rw7.js';
+export { MatRippleLoader } from '../ripple-loader.d-DL-hT7NH.js';
+export { MatRippleModule } from '../index.d-_XdEyDn3.js';
+export { MatPseudoCheckbox, MatPseudoCheckboxModule, MatPseudoCheckboxState } from '../pseudo-checkbox-module.d-czRCRd5m.js';
+import { DateAdapter } from '../date-adapter.d-DzP3EMeE.js';
+export { MAT_DATE_LOCALE, MAT_DATE_LOCALE_FACTORY } from '../date-adapter.d-DzP3EMeE.js';
+export { MAT_OPTGROUP, MatOptgroup, MatOption, MatOptionSelectionChange, _countGroupLabelsBeforeOption, _getOptionScrollPosition } from '../option.d-ef4idHSb.js';
+export { MAT_OPTION_PARENT_COMPONENT, MatOptionParentComponent } from '../option-parent.d-CvnRKBST.js';
+export { MAT_RIPPLE_GLOBAL_OPTIONS, MatRipple, RippleAnimationConfig, RippleConfig, RippleGlobalOptions, RippleRef, RippleRenderer, RippleState, RippleTarget, defaultRippleAnimationConfig } from '../ripple.d-DBFnJ3Aa.js';
 import '@angular/cdk/bidi';
 import '@angular/cdk/a11y';
 import '@angular/cdk/platform';
@@ -26,7 +26,7 @@ declare const VERSION: Version;
 /** Object used to configure the animation in Angular Material. */
 interface AnimationsConfig {
     /** Whether all animations should be disabled. */
-    animationsDisabled: boolean;
+    animationsDisabled?: boolean;
 }
 /** Injection token used to configure the animations in Angular Material. */
 declare const MATERIAL_ANIMATIONS: InjectionToken<AnimationsConfig>;
@@ -203,4 +203,5 @@ declare class _MatInternalFormField {
     static ɵcmp: i0.ɵɵComponentDeclaration<_MatInternalFormField, "div[mat-internal-form-field]", never, { "labelPosition": { "alias": "labelPosition"; "required": true; }; }, {}, never, ["*"], true, never>;
 }
 
-export { AnimationCurves, AnimationDurations, type AnimationsConfig, MATERIAL_ANIMATIONS, MAT_DATE_FORMATS, MAT_NATIVE_DATE_FORMATS, type MatDateFormats, MatNativeDateModule, NativeDateAdapter, NativeDateModule, VERSION, _ErrorStateTracker, _MatInternalFormField, _StructuralStylesLoader, _animationsDisabled, provideNativeDateAdapter };
+export { AnimationCurves, AnimationDurations, DateAdapter, ErrorStateMatcher$1 as ErrorStateMatcher, MATERIAL_ANIMATIONS, MAT_DATE_FORMATS, MAT_NATIVE_DATE_FORMATS, MatNativeDateModule, NativeDateAdapter, NativeDateModule, VERSION, _ErrorStateTracker, _MatInternalFormField, _StructuralStylesLoader, _animationsDisabled, provideNativeDateAdapter };
+export type { AnimationsConfig, MatDateFormats };

package/core/{tokens/m2/mat/_optgroup.scss → option/_m2-optgroup.scss}

@@ -1,6 +1,6 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
+@use '../style/sass-utils';
+@use '../theming/inspection';
+@use '../tokens/m2-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, optgroup);
@@ -39,8 +39,8 @@ $prefix: (mat, optgroup);
 @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/{tokens/m2/mat/_option.scss → option/_m2-option.scss}

@@ -1,6 +1,6 @@
-@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, option);
@@ -47,8 +47,8 @@ $prefix: (mat, option);
 @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/{tokens/m3/mat/_optgroup.scss → option/_m3-optgroup.scss}

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../style/sass-utils';
+@use '../tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, optgroup);
@@ -12,11 +12,11 @@ $prefix: (mat, optgroup);
 /// @return {Map} A set of custom tokens for the mat-optgroup
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: sass-utils.merge-all(
-    token-definition.generate-typography-tokens($systems, label-text, title-small),
+    m3-utils.generate-typography-tokens($systems, label-text, title-small),
     (
       label-text-color: map.get($systems, md-sys-color, on-surface-variant),
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/core/{tokens/m3/mat/_option.scss → option/_m3-option.scss}

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../style/sass-utils';
+@use '../tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, option);
@@ -53,5 +53,5 @@ $prefix: (mat, option);
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/core/option/_optgroup-theme.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../tokens/m2/mat/optgroup' as tokens-mat-optgroup;
+@use './m2-optgroup';
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
 @use '../theming/theming';
@@ -20,9 +20,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-optgroup.$prefix,
-        tokens-mat-optgroup.get-color-tokens($theme)
-      );
+        m2-optgroup.$prefix, m2-optgroup.get-color-tokens($theme));
     }
   }
 }
@@ -33,16 +31,14 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-optgroup.$prefix,
-        tokens-mat-optgroup.get-typography-tokens($theme)
-      );
+        m2-optgroup.$prefix, m2-optgroup.get-typography-tokens($theme));
     }
   }
 }
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @else {
   }
 }
@@ -51,8 +47,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-optgroup.$prefix,
-      tokens: tokens-mat-optgroup.get-token-slots(),
+      namespace: m2-optgroup.$prefix,
+      tokens: m2-optgroup.get-token-slots(),
     ),
   );
 }
@@ -86,8 +82,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-optgroup.$prefix,
-      map.get($tokens, tokens-mat-optgroup.$prefix)
+      m2-optgroup.$prefix,
+      map.get($tokens, m2-optgroup.$prefix)
     );
   }
 }

package/core/option/_option-theme.scss

@@ -1,4 +1,4 @@
-@use '../tokens/m2/mat/option' as tokens-mat-option;
+@use './m2-option';
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
 @use '../theming/theming';
@@ -27,23 +27,17 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme)
-      );
+        m2-option.$prefix, m2-option.get-color-tokens($theme));
     }
 
     .mat-accent {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme, accent)
-      );
+        m2-option.$prefix, m2-option.get-color-tokens($theme, accent));
     }
 
     .mat-warn {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-color-tokens($theme, warn)
-      );
+        m2-option.$prefix, m2-option.get-color-tokens($theme, warn));
     }
   }
 }
@@ -56,9 +50,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-option.$prefix,
-        tokens-mat-option.get-typography-tokens($theme)
-      );
+        m2-option.$prefix, m2-option.get-typography-tokens($theme));
     }
   }
 }
@@ -67,7 +59,7 @@
 /// @param {Map} $theme The theme to generate density styles for.
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @else {
   }
 }
@@ -76,8 +68,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-option.$prefix,
-      tokens: tokens-mat-option.get-token-slots(),
+      namespace: m2-option.$prefix,
+      tokens: m2-option.get-token-slots(),
     ),
   );
 }
@@ -116,6 +108,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-option-tokens: token-utils.get-tokens-for($tokens, tokens-mat-option.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mat-option.$prefix, $mat-option-tokens);
+  $mat-option-tokens: token-utils.get-tokens-for($tokens, m2-option.$prefix, $options...);
+  @include token-utils.create-token-values(m2-option.$prefix, $mat-option-tokens);
 }

package/core/{tokens/m2/mat/_ripple.scss → ripple/_m2-ripple.scss}

@@ -1,7 +1,7 @@
 @use 'sass:meta';
-@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, ripple);
@@ -42,8 +42,8 @@ $prefix: (mat, ripple);
 @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/{tokens/m3/mat/_ripple.scss → ripple/_m3-ripple.scss}

@@ -1,6 +1,6 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
+@use '../style/sass-utils';
+@use '../tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, ripple);
@@ -15,5 +15,5 @@ $prefix: (mat, ripple);
     color: sass-utils.safe-color-change(map.get($systems, md-sys-color, on-surface), $alpha: 0.1),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

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)
       );
     }
   }
@@ -41,12 +41,12 @@
 
 @mixin density($theme) {
   @if inspection.get-theme-version($theme) == 1 {
-    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+    // There are no M3 density tokens for this component
   } @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,32 @@
-export { M as MatOptionHarness, O as OptionHarnessFilters } from '../../option-harness.d-047df5c5.js';
-export { M as MatOptgroupHarness, O as OptgroupHarnessFilters } from '../../optgroup-harness.d-fc22ca1c.js';
-import '@angular/cdk/testing';
+import { OptionHarnessFilters, MatOptionHarness } from '../../option-harness.d-BpYClwei.js';
+import { BaseHarnessFilters, ComponentHarness, ComponentHarnessConstructor, HarnessPredicate } from '@angular/cdk/testing';
+
+interface OptgroupHarnessFilters extends BaseHarnessFilters {
+    labelText?: string | RegExp;
+}
+
+/** Harness for interacting with a `mat-optgroup` in tests. */
+declare class MatOptgroupHarness extends ComponentHarness {
+    /** Selector used to locate option group instances. */
+    static hostSelector: string;
+    private _label;
+    /**
+     * Gets a `HarnessPredicate` that can be used to search for a option group with specific
+     * attributes.
+     * @param options Options for filtering which option instances are considered a match.
+     * @return a `HarnessPredicate` configured with the given options.
+     */
+    static with<T extends MatOptgroupHarness>(this: ComponentHarnessConstructor<T>, options?: OptgroupHarnessFilters): HarnessPredicate<T>;
+    /** Gets the option group's label text. */
+    getLabelText(): Promise<string>;
+    /** Gets whether the option group is disabled. */
+    isDisabled(): Promise<boolean>;
+    /**
+     * Gets the options that are inside the group.
+     * @param filter Optionally filters which options are included.
+     */
+    getOptions(filter?: OptionHarnessFilters): Promise<MatOptionHarness[]>;
+}
+
+export { MatOptgroupHarness, MatOptionHarness, OptionHarnessFilters };
+export type { OptgroupHarnessFilters };

package/core/theming/_definition.scss

@@ -121,7 +121,6 @@ $theme-version: 1;
     $internals: (
       theme-version: $theme-version,
       density-scale: $density-scale,
-      density-tokens: m3-tokens.generate-density-tokens($density-scale)
     )
   );
 }

package/core/theming/_inspection.scss

@@ -299,6 +299,7 @@ $_typography-properties: (font, font-family, line-height, font-size, letter-spac
   @each $system in $systems {
     $result: map.deep-merge($result, map.get($theme, $_internals, '#{$system}-tokens') or ());
   }
+
   @return $result;
 }