@angular/material 20.0.0-next.0 → 20.0.0-next.10

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(
-      tokens-mat-full-pseudo-checkbox.$prefix,
-      tokens-mat-full-pseudo-checkbox.get-color-tokens($theme, $palette-name)
-    );
-    @include token-utils.create-token-values(
-      tokens-mat-minimal-pseudo-checkbox.$prefix,
-      tokens-mat-minimal-pseudo-checkbox.get-color-tokens($theme, $palette-name)
+    @include token-utils.create-token-values-mixed(
+      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(
-    tokens-mat-full-pseudo-checkbox.$prefix,
-    $mat-full-pseudo-checkbox-tokens
-  );
-  @include token-utils.create-token-values(
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
-    $mat-minimal-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(
+      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,11 +1,12 @@
-import { BaseHarnessFilters } from '@angular/cdk/testing';
-import { ComponentHarness } from '@angular/cdk/testing';
-import { ComponentHarnessConstructor } from '@angular/cdk/testing';
-import { ContentContainerComponentHarness } from '@angular/cdk/testing';
-import { HarnessPredicate } from '@angular/cdk/testing';
+import { O as OptionHarnessFilters, M as MatOptionHarness } from '../../option-harness.d-IqsW95GR.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. */
-export declare class MatOptgroupHarness extends ComponentHarness {
+declare class MatOptgroupHarness extends ComponentHarness {
     /** Selector used to locate option group instances. */
     static hostSelector: string;
     private _label;
@@ -27,39 +28,5 @@ export declare class MatOptgroupHarness extends ComponentHarness {
     getOptions(filter?: OptionHarnessFilters): Promise<MatOptionHarness[]>;
 }
 
-/** Harness for interacting with a `mat-option` in tests. */
-export declare class MatOptionHarness extends ContentContainerComponentHarness {
-    /** Selector used to locate option instances. */
-    static hostSelector: string;
-    /** Element containing the option's text. */
-    private _text;
-    /**
-     * Gets a `HarnessPredicate` that can be used to search for an option 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 MatOptionHarness>(this: ComponentHarnessConstructor<T>, options?: OptionHarnessFilters): HarnessPredicate<T>;
-    /** Clicks the option. */
-    click(): Promise<void>;
-    /** Gets the option's label text. */
-    getText(): Promise<string>;
-    /** Gets whether the option is disabled. */
-    isDisabled(): Promise<boolean>;
-    /** Gets whether the option is selected. */
-    isSelected(): Promise<boolean>;
-    /** Gets whether the option is active. */
-    isActive(): Promise<boolean>;
-    /** Gets whether the option is in multiple selection mode. */
-    isMultiple(): Promise<boolean>;
-}
-
-export declare interface OptgroupHarnessFilters extends BaseHarnessFilters {
-    labelText?: string | RegExp;
-}
-
-export declare interface OptionHarnessFilters extends BaseHarnessFilters {
-    text?: string | RegExp;
-    isSelected?: boolean;
-}
-
-export { }
+export { MatOptgroupHarness, MatOptionHarness, OptionHarnessFilters };
+export type { OptgroupHarnessFilters };

package/core/theming/_color-api-backwards-compatibility.scss

@@ -23,7 +23,7 @@
 // from the bundle.
 $_overrides-only: true;
 
-@mixin color-variant-styles($theme, $color-variant) {
+@mixin _color-variant-styles($theme, $color-variant) {
   $primary-options: (color-variant: $color-variant, emit-overrides-only: $_overrides-only);
 
   // Some components use the secondary color rather than primary color for `.mat-primary`.
@@ -33,10 +33,21 @@ $_overrides-only: true;
     emit-overrides-only: $_overrides-only
   );
 
-  @include option-theme.color($theme, $secondary-options...);
-  @include progress-spinner-theme.color($theme, $primary-options...);
-  @include pseudo-checkbox-theme.color($theme, $primary-options...);
-  @include stepper-theme.color($theme, $primary-options...);
+  & {
+    @include option-theme.color($theme, $secondary-options...);
+  }
+
+  & {
+    @include progress-spinner-theme.color($theme, $primary-options...);
+  }
+
+  & {
+    @include pseudo-checkbox-theme.color($theme, $primary-options...);
+  }
+
+  & {
+    @include stepper-theme.color($theme, $primary-options...);
+  }
 
   &.mat-icon {
     @include icon-theme.color($theme, $primary-options...);
@@ -105,7 +116,7 @@ $_overrides-only: true;
 
 @mixin color-variants-backwards-compatibility($theme) {
   .mat-primary {
-    @include color-variant-styles($theme, primary);
+    @include _color-variant-styles($theme, primary);
   }
   .mat-badge {
     @include badge-theme.color($theme, $color-variant: primary,
@@ -113,7 +124,7 @@ $_overrides-only: true;
   }
 
   .mat-accent {
-    @include color-variant-styles($theme, tertiary);
+    @include _color-variant-styles($theme, tertiary);
   }
   .mat-badge-accent {
     @include badge-theme.color($theme, $color-variant: tertiary,
@@ -121,7 +132,7 @@ $_overrides-only: true;
   }
 
   .mat-warn {
-    @include color-variant-styles($theme, error);
+    @include _color-variant-styles($theme, error);
   }
   .mat-badge-warn {
     @include badge-theme.color($theme, $color-variant: error,

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;
 
@@ -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

@@ -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;
@@ -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;
 }
 

package/core/tokens/_m2-tokens.scss

@@ -0,0 +1,131 @@
+@use '../../autocomplete/m2-autocomplete';
+@use '../../badge/m2-badge';
+@use '../../bottom-sheet/m2-bottom-sheet';
+@use '../../button-toggle/m2-button-toggle';
+@use '../../button/m2-button';
+@use '../../button/m2-fab';
+@use '../../button/m2-icon-button';
+@use '../../card/m2-card';
+@use '../../checkbox/m2-checkbox';
+@use '../../chips/m2-chip';
+@use '../../datepicker/m2-datepicker';
+@use '../../dialog/m2-dialog';
+@use '../../divider/m2-divider';
+@use '../../expansion/m2-expansion';
+@use '../../form-field/m2-form-field';
+@use '../../grid-list/m2-grid-list';
+@use '../../icon/m2-icon';
+@use '../../list/m2-list';
+@use '../../menu/m2-menu';
+@use '../../paginator/m2-paginator';
+@use '../../progress-bar/m2-progress-bar';
+@use '../../progress-spinner/m2-progress-spinner';
+@use '../../radio/m2-radio';
+@use '../../select/m2-select';
+@use '../../sidenav/m2-sidenav';
+@use '../../slide-toggle/m2-slide-toggle';
+@use '../../slider/m2-slider';
+@use '../../snack-bar/m2-snack-bar';
+@use '../../sort/m2-sort';
+@use '../../stepper/m2-stepper';
+@use '../../table/m2-table';
+@use '../../tabs/m2-tabs';
+@use '../../timepicker/m2-timepicker';
+@use '../../toolbar/m2-toolbar';
+@use '../../tooltip/m2-tooltip';
+@use '../../tree/m2-tree';
+@use '../m2-app';
+@use '../option/m2-optgroup';
+@use '../option/m2-option';
+@use '../ripple/m2-ripple';
+@use '../selection/pseudo-checkbox/m2-pseudo-checkbox';
+@use '../style/sass-utils';
+@use '../theming/inspection';
+@use 'sass:map';
+@use 'sass:meta';
+
+/// Gets the tokens for the given theme, m2 tokens module, and theming system.
+/// @param {Map} $theme The Angular Material theme object to generate token values from.
+/// @param {String} $module The Sass module containing the token getter functions.
+/// @param {String} $system The theming system to get tokens for. Valid values are: unthemable,
+///     color, typography, density.
+/// @return {Map} The token map by calling the token getter for the given system in the given module
+///    with the given Angular Material theme. Token names are not fully-qualified.
+@function _get-tokens-for-module-and-system($theme, $module, $system) {
+  @if $system == unthemable {
+    @return meta.call(meta.get-function(get-#{$system}-tokens, $module: $module));
+  }
+  @if not inspection.theme-has($theme, $system) {
+    @return ();
+  }
+  @return meta.call(meta.get-function(get-#{$system}-tokens, $module: $module), $theme);
+}
+
+/// Gets the fully qualified tokens map for the given theme and m2 tokens module.
+/// @param {Map} $theme The Angular Material theme object to generate token values from.
+/// @param {String} $module The Sass module containing the token getter functions.
+/// @return {Map} The token map by calling the token getters in the given module with the given
+///     Angular Material theme. Token names are fully-qualified.
+@function _get-tokens-for-module($theme, $module) {
+  $tokens: sass-utils.deep-merge-all(
+    _get-tokens-for-module-and-system($theme, $module, unthemable),
+    _get-tokens-for-module-and-system($theme, $module, color),
+    _get-tokens-for-module-and-system($theme, $module, typography),
+    _get-tokens-for-module-and-system($theme, $module, density)
+  );
+  @return map.set((), map.get(meta.module-variables($module), prefix), $tokens);
+}
+
+/// Gets the full set of M2 tokens for the given theme object.
+/// @param {Map} $theme The Angular Material theme object to generate token values from.
+/// @return {Map} The token map for the given Angular Material theme. Returned format:
+///     (
+///       (fully, qualified, namespace): (
+///         token: value
+///       )
+///     )
+@function m2-tokens-from-theme($theme) {
+  @return sass-utils.deep-merge-all(
+    _get-tokens-for-module($theme, m2-app),
+    _get-tokens-for-module($theme, m2-autocomplete),
+    _get-tokens-for-module($theme, m2-badge),
+    _get-tokens-for-module($theme, m2-bottom-sheet),
+    _get-tokens-for-module($theme, m2-button),
+    _get-tokens-for-module($theme, m2-button-toggle),
+    _get-tokens-for-module($theme, m2-card),
+    _get-tokens-for-module($theme, m2-checkbox),
+    _get-tokens-for-module($theme, m2-chip),
+    _get-tokens-for-module($theme, m2-datepicker),
+    _get-tokens-for-module($theme, m2-dialog),
+    _get-tokens-for-module($theme, m2-divider),
+    _get-tokens-for-module($theme, m2-expansion),
+    _get-tokens-for-module($theme, m2-fab),
+    _get-tokens-for-module($theme, m2-form-field),
+    _get-tokens-for-module($theme, m2-grid-list),
+    _get-tokens-for-module($theme, m2-icon),
+    _get-tokens-for-module($theme, m2-icon-button),
+    _get-tokens-for-module($theme, m2-list),
+    _get-tokens-for-module($theme, m2-menu),
+    _get-tokens-for-module($theme, m2-optgroup),
+    _get-tokens-for-module($theme, m2-option),
+    _get-tokens-for-module($theme, m2-paginator),
+    _get-tokens-for-module($theme, m2-progress-bar),
+    _get-tokens-for-module($theme, m2-progress-spinner),
+    _get-tokens-for-module($theme, m2-pseudo-checkbox),
+    _get-tokens-for-module($theme, m2-radio),
+    _get-tokens-for-module($theme, m2-ripple),
+    _get-tokens-for-module($theme, m2-select),
+    _get-tokens-for-module($theme, m2-sidenav),
+    _get-tokens-for-module($theme, m2-slide-toggle),
+    _get-tokens-for-module($theme, m2-slider),
+    _get-tokens-for-module($theme, m2-snack-bar),
+    _get-tokens-for-module($theme, m2-sort),
+    _get-tokens-for-module($theme, m2-stepper),
+    _get-tokens-for-module($theme, m2-tabs),
+    _get-tokens-for-module($theme, m2-table),
+    _get-tokens-for-module($theme, m2-timepicker),
+    _get-tokens-for-module($theme, m2-toolbar),
+    _get-tokens-for-module($theme, m2-tooltip),
+    _get-tokens-for-module($theme, m2-tree),
+  );
+}

package/core/tokens/_m2-utils.scss

@@ -0,0 +1,109 @@
+@use '../m2/palette';
+@use '../m2/theming';
+@use '../m2/typography';
+@use 'sass:color';
+@use 'sass:math';
+@use 'sass:meta';
+
+$_placeholder-color-palette: theming.define-palette(palette.$red-palette);
+
+// Indicates whether we're building internally. Used for backwards compatibility.
+$private-is-internal-build: false;
+
+// Placeholder color config that can be passed to token getter functions when generating token
+// slots.
+$placeholder-color-config: (
+  primary: $_placeholder-color-palette,
+  accent: $_placeholder-color-palette,
+  warn: $_placeholder-color-palette,
+  is-dark: false,
+  foreground: palette.$light-theme-foreground-palette,
+  background: palette.$light-theme-background-palette,
+);
+
+$_placeholder-typography-level-config: typography.typography-config-level-from-mdc(body1);
+
+// Placeholder typography config that can be passed to token getter functions when generating token
+// slots.
+$placeholder-typography-config: (
+  font-family: 'Roboto, sans-serif',
+  headline-1: $_placeholder-typography-level-config,
+  headline-2: $_placeholder-typography-level-config,
+  headline-3: $_placeholder-typography-level-config,
+  headline-4: $_placeholder-typography-level-config,
+  headline-5: $_placeholder-typography-level-config,
+  headline-6: $_placeholder-typography-level-config,
+  subtitle-1: $_placeholder-typography-level-config,
+  subtitle-2: $_placeholder-typography-level-config,
+  body-1: $_placeholder-typography-level-config,
+  body-2: $_placeholder-typography-level-config,
+  caption: $_placeholder-typography-level-config,
+  button: $_placeholder-typography-level-config,
+  overline: $_placeholder-typography-level-config,
+  subheading-1: $_placeholder-typography-level-config,
+  title: $_placeholder-typography-level-config,
+);
+
+// Placeholder density config that can be passed to token getter functions when generating token
+// slots.
+$placeholder-density-config: 0;
+
+/// Inherited function from MDC that computes which contrast tone to use on top of a color.
+/// This is used only in a narrow set of use cases when generating M2 button tokens to maintain
+/// backwards compatibility.
+/// @param {Color} $value Color for which we're calculating the contrast tone.
+/// @param {Boolean} $is-dark Whether the current theme is dark.
+/// @return {Map} Either `dark` or `light`.
+@function contrast-tone($value, $is-dark) {
+  @if ($value == 'dark') {
+    @return 'light';
+  }
+
+  @if ($value == 'light') {
+    @return 'dark';
+  }
+
+  // Fallback if the app is using a non-color palette (e.g. CSS variable based).
+  @if (meta.type-of($value) != 'color') {
+    @return if($is-dark, 'light', 'dark');
+  }
+
+  $minimum-contrast: 3.1;
+  $light-contrast: _contrast($value, #fff);
+  $dark-contrast: _contrast($value, rgba(0, 0, 0, 0.87));
+
+  @if ($light-contrast < $minimum-contrast) and ($dark-contrast > $light-contrast) {
+    @return 'dark';
+  }
+
+  @return 'light';
+}
+
+@function _linear-channel-value($channel-value) {
+  $normalized-channel-value: math.div($channel-value, 255);
+
+  @if ($normalized-channel-value < 0.03928) {
+    @return math.div($normalized-channel-value, 12.92);
+  }
+
+  @return math.pow(math.div($normalized-channel-value + 0.055, 1.055), 2.4);
+}
+
+// Calculate the luminance for a color.
+// See https://www.w3.org/TR/WCAG20-TECHS/G17.html#G17-tests
+@function _luminance($color) {
+  $red: _linear-channel-value(color.red($color));
+  $green: _linear-channel-value(color.green($color));
+  $blue: _linear-channel-value(color.blue($color));
+
+  @return 0.2126 * $red + 0.7152 * $green + 0.0722 * $blue;
+}
+
+// Calculate the contrast ratio between two colors.
+// See https://www.w3.org/TR/WCAG20-TECHS/G17.html#G17-tests
+@function _contrast($back, $front) {
+  $back-lum: _luminance($back) + 0.05;
+  $fore-lum: _luminance($front) + 0.05;
+
+  @return math.div(math.max($back-lum, $fore-lum), math.min($back-lum, $fore-lum));
+}