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

package/chips/_m2-chip.scss

@@ -0,0 +1,127 @@
+@use 'sass:map';
+@use 'sass:meta';
+@use 'sass:color';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
+@use '../core/m2/palette' as m2-palette;
+@use '../core/theming/theming';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, chip);
+
+// 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 (
+    container-shape-radius: 16px,
+    disabled-container-opacity: 0.4,
+    disabled-outline-color: transparent,
+    flat-selected-outline-width: 0,
+    focus-outline-color: transparent,
+    hover-state-layer-opacity: 0.04,
+    outline-color: transparent,
+    outline-width: 0,
+    selected-hover-state-layer-opacity: 0.04,
+    selected-trailing-action-state-layer-color: transparent,
+    trailing-action-focus-opacity: 1,
+    trailing-action-focus-state-layer-opacity: 0,
+    trailing-action-hover-state-layer-opacity: 0,
+    trailing-action-opacity: 0.54,
+    trailing-action-state-layer-color: transparent,
+    with-avatar-avatar-shape-radius: 14px,
+    with-avatar-avatar-size: 28px,
+    with-avatar-disabled-avatar-opacity: 1,
+    with-icon-disabled-icon-opacity: 1,
+    with-icon-icon-size: 18px,
+    with-trailing-icon-disabled-trailing-icon-opacity: 1,
+  );
+}
+
+// Tokens that can be configured through Angular Material's color theming API.
+@function get-color-tokens($theme, $palette-name: null) {
+  $foreground: null;
+  $background: null;
+  $state-layer-color: inspection.get-theme-color($theme, foreground, base);
+  $state-layer-opacity: 0.12; // 0.12 is a common value in Material Design for opacity.
+  $surface: inspection.get-theme-color($theme, background, card);
+
+  @if $palette-name == null {
+    $is-dark: inspection.get-theme-type($theme) == dark;
+    $grey-50: map.get(m2-palette.$grey-palette, 50);
+    $grey-900: map.get(m2-palette.$grey-palette, 900);
+    $foreground: if($is-dark, $grey-50, $grey-900);
+
+    $surface: inspection.get-theme-color($theme, background, card);
+    $background: if(
+        meta.type-of($state-layer-color) == color and meta.type-of($surface) == color,
+        color.mix($state-layer-color, $surface, 12%),
+        $state-layer-color
+    );
+  }
+  @else {
+    $background: inspection.get-theme-color($theme, $palette-name);
+    $foreground: inspection.get-theme-color($theme, $palette-name, default-contrast);
+  }
+  @return (
+    disabled-label-text-color: $foreground,
+    elevated-container-color: $background,
+    elevated-disabled-container-color: $background,
+    elevated-selected-container-color: $background,
+    flat-disabled-selected-container-color: $background,
+    focus-state-layer-color: $state-layer-color,
+    focus-state-layer-opacity: $state-layer-opacity,
+    hover-state-layer-color: $state-layer-color,
+    label-text-color: $foreground,
+    selected-disabled-trailing-icon-color: $foreground,
+    selected-focus-state-layer-color: $state-layer-color,
+    selected-focus-state-layer-opacity: $state-layer-opacity,
+    selected-hover-state-layer-color: $state-layer-color,
+    selected-label-text-color: $foreground,
+    selected-trailing-icon-color: $foreground,
+    with-icon-disabled-icon-color: $foreground,
+    with-icon-icon-color: $foreground,
+    with-icon-selected-icon-color: $foreground,
+    with-trailing-icon-disabled-trailing-icon-color: $foreground,
+    with-trailing-icon-trailing-icon-color: $foreground,
+  );
+}
+
+// Tokens that can be configured through Angular Material's typography theming API.
+@function get-typography-tokens($theme) {
+  @return (
+    label-text-font: inspection.get-theme-typography($theme, body-2, font-family),
+    label-text-line-height: inspection.get-theme-typography($theme, body-2, line-height),
+    label-text-size: inspection.get-theme-typography($theme, body-2, font-size),
+    label-text-tracking: inspection.get-theme-typography($theme, body-2, letter-spacing),
+    label-text-weight: inspection.get-theme-typography($theme, body-2, font-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), -2);
+  @return (
+    // The height of the chip.
+    container-height:
+    map.get(
+        (
+          0: 32px,
+          -1: 28px,
+          -2: 24px,
+        ),
+        $scale
+    )
+  );
+}
+
+// Combines the tokens generated by the above functions into a single map with placeholder values.
+// This is used to create token slots.
+@function get-token-slots() {
+  @return sass-utils.deep-merge-all(
+      get-unthemable-tokens(),
+      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/chips/_m3-chip.scss

@@ -0,0 +1,129 @@
+@use 'sass:map';
+@use 'sass:list';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
+@use '../core/theming/theming';
+@use '../core/theming/inspection';
+
+// The prefix used to generate the fully qualified name for tokens in this file.
+$prefix: (mat, chip);
+
+/// Generates custom tokens for the mat-chip.
+/// @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 mat-chip
+@function get-tokens($systems, $exclude-hardcoded, $token-slots) {
+  // MDC has a chip component, but they seem to have made up the tokens rather than using ones
+  // generated from the token database, therefore we need a custom token function for it.
+  $tokens: sass-utils.merge-all(
+      m3-utils.generate-typography-tokens($systems, label-text, label-large),
+      (
+        disabled-container-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
+        selected-trailing-icon-color: map.get($systems, md-sys-color, on-secondary-container),
+        selected-disabled-trailing-icon-color: map.get($systems, md-sys-color, on-surface),
+        trailing-action-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
+        selected-trailing-action-state-layer-color:
+        map.get($systems, md-sys-color, on-secondary-container),
+        trailing-action-hover-state-layer-opacity:
+        map.get($systems, md-sys-state, hover-state-layer-opacity),
+        trailing-action-focus-state-layer-opacity:
+        map.get($systems, md-sys-state, focus-state-layer-opacity),
+        trailing-action-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
+        trailing-action-focus-opacity: m3-utils.hardcode(1, $exclude-hardcoded),
+        container-shape-radius: m3-utils.hardcode(8px, $exclude-hardcoded),
+        with-avatar-avatar-size: m3-utils.hardcode(24px, $exclude-hardcoded),
+        with-avatar-avatar-shape-radius: m3-utils.hardcode(24px, $exclude-hardcoded),
+        label-text-color: map.get($systems, md-sys-color, on-surface-variant),
+        disabled-label-text-color: sass-utils.safe-color-change(
+            map.get($systems, md-sys-color, on-surface),
+          $alpha: 0.38,
+        ),
+        with-icon-icon-size: m3-utils.hardcode(18px, $exclude-hardcoded),
+        with-icon-icon-color: map.get($systems, md-sys-color, on-surface-variant),
+        with-icon-disabled-icon-color: map.get($systems, md-sys-color, on-surface),
+        with-icon-selected-icon-color: map.get($systems, md-sys-color, on-secondary-container),
+        with-trailing-icon-trailing-icon-color: map.get($systems, md-sys-color, on-surface-variant),
+        with-trailing-icon-disabled-trailing-icon-color:
+            map.get($systems, md-sys-color, on-surface),
+        focus-state-layer-opacity: map.get($systems, md-sys-state, focus-state-layer-opacity),
+        focus-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
+        outline-width: m3-utils.hardcode(1px, $exclude-hardcoded),
+        outline-color: map.get($systems, md-sys-color, outline),
+        disabled-outline-color: sass-utils.safe-color-change(
+            map.get($systems, md-sys-color, on-surface),
+          $alpha: 0.12,
+        ),
+        focus-outline-color: map.get($systems, md-sys-color, on-surface-variant),
+        hover-state-layer-color: map.get($systems, md-sys-color, on-surface-variant),
+        hover-state-layer-opacity: map.get($systems, md-sys-state, hover-state-layer-opacity),
+        with-avatar-disabled-avatar-opacity: m3-utils.hardcode(0.38, $exclude-hardcoded),
+        elevated-selected-container-color: map.get($systems, md-sys-color, secondary-container),
+        // In the M3 tokens this is a `surface` color, but in the MDC implementation its
+        // never being emitted. We emit `transparent` so consumers override the color.
+        elevated-container-color: m3-utils.hardcode(transparent, $exclude-hardcoded),
+        flat-selected-outline-width: m3-utils.hardcode(0, $exclude-hardcoded),
+        selected-label-text-color: map.get($systems, md-sys-color, on-secondary-container),
+        flat-disabled-selected-container-color: sass-utils.safe-color-change(
+            map.get($systems, md-sys-color, on-surface),
+          $alpha: 0.12,
+        ),
+        selected-hover-state-layer-color: map.get($systems, md-sys-color, on-secondary-container),
+        selected-hover-state-layer-opacity:
+        map.get($systems, md-sys-state, hover-state-layer-opacity),
+        selected-focus-state-layer-color: map.get($systems, md-sys-color, on-secondary-container),
+        selected-focus-state-layer-opacity:
+        map.get($systems, md-sys-state, focus-state-layer-opacity),
+        with-icon-disabled-icon-opacity: m3-utils.hardcode(0.38, $exclude-hardcoded),
+        with-trailing-icon-disabled-trailing-icon-opacity:
+        m3-utils.hardcode(0.38, $exclude-hardcoded),
+      ),
+  );
+
+  $variant-tokens: (
+    // Color variants:
+    primary: (
+      selected-trailing-icon-color: map.get($systems, md-sys-color, on-primary-container),
+      selected-trailing-action-state-layer-color:
+      map.get($systems, md-sys-color, on-primary-container),
+      with-icon-selected-icon-color: map.get($systems, md-sys-color, on-primary-container),
+      elevated-selected-container-color: map.get($systems, md-sys-color, primary-container),
+      selected-label-text-color: map.get($systems, md-sys-color, on-primary-container),
+      selected-hover-state-layer-color: map.get($systems, md-sys-color, on-primary-container),
+      selected-focus-state-layer-color: map.get($systems, md-sys-color, on-primary-container),
+    ),
+    secondary: (), // Default, no overrides needed.
+    tertiary: (
+      selected-trailing-icon-color: map.get($systems, md-sys-color, on-tertiary-container),
+      selected-trailing-action-state-layer-color:
+      map.get($systems, md-sys-color, on-tertiary-container),
+      with-icon-selected-icon-color: map.get($systems, md-sys-color, on-tertiary-container),
+      elevated-selected-container-color: map.get($systems, md-sys-color, tertiary-container),
+      selected-label-text-color: map.get($systems, md-sys-color, on-tertiary-container),
+      selected-hover-state-layer-color: map.get($systems, md-sys-color, on-tertiary-container),
+      selected-focus-state-layer-color: map.get($systems, md-sys-color, on-tertiary-container),
+    ),
+    error: (
+      selected-trailing-icon-color: map.get($systems, md-sys-color, on-error-container),
+      selected-trailing-action-state-layer-color:
+      map.get($systems, md-sys-color, on-error-container),
+      with-icon-selected-icon-color: map.get($systems, md-sys-color, on-error-container),
+      elevated-selected-container-color: map.get($systems, md-sys-color, error-container),
+      selected-label-text-color: map.get($systems, md-sys-color, on-error-container),
+      selected-hover-state-layer-color: map.get($systems, md-sys-color, on-error-container),
+      selected-focus-state-layer-color: map.get($systems, md-sys-color, on-error-container),
+    )
+  );
+
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
+}
+
+// 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), -2);
+  $index: ($scale * -1) + 1;
+
+  @return (
+    container-height: list.nth((32px, 28px, 24px), $index),
+  );
+}

package/chips/index.d.ts

@@ -3,12 +3,12 @@ import { ElementRef, OnInit, AfterViewInit, AfterContentInit, DoCheck, OnDestroy
 import { Subject, Observable } from 'rxjs';
 import { FocusKeyManager } from '@angular/cdk/a11y';
 import { ControlValueAccessor, NgControl } from '@angular/forms';
-import { E as ErrorStateMatcher } from '../error-options.d-448d9046.js';
-import { M as MatFormFieldControl } from '../form-field-control.d-eb86711c.js';
-import { M as MatCommonModule } from '../common-module.d-0e6515ae.js';
-import { M as MatRippleModule } from '../index.d-0536b706.js';
+import { E as ErrorStateMatcher } from '../error-options.d-CGdTZUYk.js';
+import { M as MatFormFieldControl } from '../form-field-control.d-DvB4ZVlf.js';
+import { M as MatCommonModule } from '../common-module.d-C8xzHJDr.js';
+import { M as MatRippleModule } from '../index.d-C5neTPvr.js';
 import '@angular/cdk/bidi';
-import '../ripple.d-2fb57d04.js';
+import '../ripple.d-BT30YVLB.js';
 import '@angular/cdk/platform';
 
 /**
@@ -107,6 +107,7 @@ interface MatChipEvent {
 declare class MatChip implements OnInit, AfterViewInit, AfterContentInit, DoCheck, OnDestroy {
     _changeDetectorRef: ChangeDetectorRef;
     _elementRef: ElementRef<HTMLElement>;
+    private readonly _tagName;
     protected _ngZone: NgZone;
     private _focusMonitor;
     private _globalRippleOptions;
@@ -615,6 +616,8 @@ interface MatChipTextControl {
     empty: boolean;
     /** Focuses the text control. */
     focus(): void;
+    /** Gets the list of ids the input is described by. */
+    readonly describedByIds?: string[];
     /** Sets the list of ids the input is described by. */
     setDescribedByIds(ids: string[]): void;
 }
@@ -744,6 +747,11 @@ declare class MatChipGrid extends MatChipSet implements AfterContentInit, AfterV
      * are no eligible chips.
      */
     focus(): void;
+    /**
+     * Implemented as part of MatFormFieldControl.
+     * @docs-private
+     */
+    get describedByIds(): string[];
     /**
      * Implemented as part of MatFormFieldControl.
      * @docs-private
@@ -837,6 +845,10 @@ declare class MatChipInput implements MatChipTextControl, OnChanges, OnDestroy {
     get disabled(): boolean;
     set disabled(value: boolean);
     private _disabled;
+    /** Whether the input is readonly. */
+    readonly: boolean;
+    /** Whether the input should remain interactive when it is disabled. */
+    disabledInteractive: boolean;
     /** Whether the input is empty. */
     get empty(): boolean;
     /** The native input element to which this directive is attached. */
@@ -856,13 +868,22 @@ declare class MatChipInput implements MatChipTextControl, OnChanges, OnDestroy {
     focus(): void;
     /** Clears the input */
     clear(): void;
+    /**
+     * Implemented as part of MatChipTextControl.
+     * @docs-private
+     */
+    get describedByIds(): string[];
     setDescribedByIds(ids: string[]): void;
     /** Checks whether a keycode is one of the configured separators. */
     private _isSeparatorKey;
+    /** Gets the value to set on the `readonly` attribute. */
+    protected _getReadonlyAttribute(): string | null;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatChipInput, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatChipInput, "input[matChipInputFor]", ["matChipInput", "matChipInputFor"], { "chipGrid": { "alias": "matChipInputFor"; "required": false; }; "addOnBlur": { "alias": "matChipInputAddOnBlur"; "required": false; }; "separatorKeyCodes": { "alias": "matChipInputSeparatorKeyCodes"; "required": false; }; "placeholder": { "alias": "placeholder"; "required": false; }; "id": { "alias": "id"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "chipEnd": "matChipInputTokenEnd"; }, never, never, true, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatChipInput, "input[matChipInputFor]", ["matChipInput", "matChipInputFor"], { "chipGrid": { "alias": "matChipInputFor"; "required": false; }; "addOnBlur": { "alias": "matChipInputAddOnBlur"; "required": false; }; "separatorKeyCodes": { "alias": "matChipInputSeparatorKeyCodes"; "required": false; }; "placeholder": { "alias": "placeholder"; "required": false; }; "id": { "alias": "id"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "readonly": { "alias": "readonly"; "required": false; }; "disabledInteractive": { "alias": "matChipInputDisabledInteractive"; "required": false; }; }, { "chipEnd": "matChipInputTokenEnd"; }, never, never, true, never>;
     static ngAcceptInputType_addOnBlur: unknown;
     static ngAcceptInputType_disabled: unknown;
+    static ngAcceptInputType_readonly: unknown;
+    static ngAcceptInputType_disabledInteractive: unknown;
 }
 
 declare class MatChipsModule {
@@ -877,6 +898,8 @@ interface MatChipsDefaultOptions {
     separatorKeyCodes: readonly number[] | ReadonlySet<number>;
     /** Whether icon indicators should be hidden for single-selection. */
     hideSingleSelectionIndicator?: boolean;
+    /** Whether the chip input should be interactive while disabled by default. */
+    inputDisabledInteractive?: boolean;
 }
 /** Injection token to be used to override the default options for the chips module. */
 declare const MAT_CHIPS_DEFAULT_OPTIONS: InjectionToken<MatChipsDefaultOptions>;
@@ -903,4 +926,5 @@ declare const MAT_CHIP_REMOVE: InjectionToken<unknown>;
  */
 declare const MAT_CHIP: InjectionToken<unknown>;
 
-export { MAT_CHIP, MAT_CHIPS_DEFAULT_OPTIONS, MAT_CHIP_AVATAR, MAT_CHIP_LISTBOX_CONTROL_VALUE_ACCESSOR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON, MatChip, MatChipAvatar, MatChipEditInput, type MatChipEditedEvent, type MatChipEvent, MatChipGrid, MatChipGridChange, MatChipInput, type MatChipInputEvent, MatChipListbox, MatChipListboxChange, MatChipOption, MatChipRemove, MatChipRow, MatChipSelectionChange, MatChipSet, type MatChipTextControl, MatChipTrailingIcon, type MatChipsDefaultOptions, MatChipsModule };
+export { MAT_CHIP, MAT_CHIPS_DEFAULT_OPTIONS, MAT_CHIP_AVATAR, MAT_CHIP_LISTBOX_CONTROL_VALUE_ACCESSOR, MAT_CHIP_REMOVE, MAT_CHIP_TRAILING_ICON, MatChip, MatChipAvatar, MatChipEditInput, MatChipGrid, MatChipGridChange, MatChipInput, MatChipListbox, MatChipListboxChange, MatChipOption, MatChipRemove, MatChipRow, MatChipSelectionChange, MatChipSet, MatChipTrailingIcon, MatChipsModule };
+export type { MatChipEditedEvent, MatChipEvent, MatChipInputEvent, MatChipTextControl, MatChipsDefaultOptions };

package/chips/testing/index.d.ts

@@ -245,4 +245,5 @@ declare class MatChipSetHarness extends ComponentHarness {
     getChips(filter?: ChipHarnessFilters): Promise<MatChipHarness[]>;
 }
 
-export { type ChipAvatarHarnessFilters, type ChipEditInputHarnessFilters, type ChipGridHarnessFilters, type ChipHarnessFilters, type ChipInputHarnessFilters, type ChipListboxHarnessFilters, type ChipOptionHarnessFilters, type ChipRemoveHarnessFilters, type ChipRowHarnessFilters, type ChipSetHarnessFilters, MatChipAvatarHarness, MatChipEditInputHarness, MatChipGridHarness, MatChipHarness, MatChipInputHarness, MatChipListboxHarness, MatChipOptionHarness, MatChipRemoveHarness, MatChipRowHarness, MatChipSetHarness };
+export { MatChipAvatarHarness, MatChipEditInputHarness, MatChipGridHarness, MatChipHarness, MatChipInputHarness, MatChipListboxHarness, MatChipOptionHarness, MatChipRemoveHarness, MatChipRowHarness, MatChipSetHarness };
+export type { ChipAvatarHarnessFilters, ChipEditInputHarnessFilters, ChipGridHarnessFilters, ChipHarnessFilters, ChipInputHarnessFilters, ChipListboxHarnessFilters, ChipOptionHarnessFilters, ChipRemoveHarnessFilters, ChipRowHarnessFilters, ChipSetHarnessFilters };

package/{common-module.d-0e6515ae.d.ts → common-module.d-C8xzHJDr.d.ts}

@@ -40,4 +40,5 @@ declare class MatCommonModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatCommonModule>;
 }
 
-export { type GranularSanityChecks as G, MatCommonModule as M, type SanityChecks as S, MATERIAL_SANITY_CHECKS as a };
+export { MatCommonModule as M, MATERIAL_SANITY_CHECKS as a };
+export type { GranularSanityChecks as G, SanityChecks as S };

package/core/_core-theme.scss

@@ -8,12 +8,11 @@
 @use './style/sass-utils';
 @use './typography/typography';
 @use './tokens/token-utils';
-@use './tokens/m2/mat/app' as tokens-mat-app;
-@use './tokens/m2/mat/ripple' as tokens-mat-ripple;
-@use './tokens/m2/mat/option' as tokens-mat-option;
-@use './tokens/m2/mat/optgroup' as tokens-mat-optgroup;
-@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-app';
+@use 'ripple/m2-ripple';
+@use 'option/m2-option';
+@use 'option/m2-optgroup';
+@use 'selection/pseudo-checkbox/m2-pseudo-checkbox';
 
 @mixin base($theme) {
   @if inspection.get-theme-version($theme) == 1 {
@@ -24,10 +23,8 @@
     @include optgroup-theme.base($theme);
     @include pseudo-checkbox-theme.base($theme);
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mat-app.$prefix,
-        tokens-mat-app.get-unthemable-tokens()
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-app.$prefix, m2-app.get-unthemable-tokens());
     }
   }
 }
@@ -41,10 +38,8 @@
     @include optgroup-theme.color($theme);
     @include pseudo-checkbox-theme.color($theme);
     @include sass-utils.current-selector-or-root() {
-      @include token-utils.create-token-values(
-        tokens-mat-app.$prefix,
-        tokens-mat-app.get-color-tokens($theme)
-      );
+      @include token-utils.create-token-values-mixed(
+        m2-app.$prefix, m2-app.get-color-tokens($theme));
     }
   }
 }
@@ -62,7 +57,7 @@
 
 @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 option-theme.density($theme);
     @include optgroup-theme.density($theme);
@@ -72,28 +67,22 @@
 }
 
 @function _define-overrides() {
-  $app-tokens: tokens-mat-app.get-token-slots();
-  $ripple-tokens: tokens-mat-ripple.get-token-slots();
-  $option-tokens: tokens-mat-option.get-token-slots();
-  $optgroup-tokens: tokens-mat-optgroup.get-token-slots();
-  $full-pseudo-checkbox-tokens: tokens-mat-full-pseudo-checkbox.get-token-slots();
-  $minimal-pseudo-checkbox-tokens: tokens-mat-minimal-pseudo-checkbox.get-token-slots();
+  $app-tokens: m2-app.get-token-slots();
+  $ripple-tokens: m2-ripple.get-token-slots();
+  $option-tokens: m2-option.get-token-slots();
+  $optgroup-tokens: m2-optgroup.get-token-slots();
+  $pseudo-checkbox-tokens: m2-pseudo-checkbox.get-token-slots();
 
   @return (
-    (namespace: tokens-mat-app.$prefix, tokens: $app-tokens, prefix: 'app-'),
-    (namespace: tokens-mat-ripple.$prefix, tokens: $ripple-tokens, prefix: 'ripple-'),
-    (namespace: tokens-mat-option.$prefix, tokens: $option-tokens, prefix: 'option-'),
-    (namespace: tokens-mat-optgroup.$prefix, tokens: $optgroup-tokens, prefix: 'optgroup-'),
+    (namespace: m2-app.$prefix, tokens: $app-tokens, prefix: 'app-'),
+    (namespace: m2-ripple.$prefix, tokens: $ripple-tokens, prefix: 'ripple-'),
+    (namespace: m2-option.$prefix, tokens: $option-tokens, prefix: 'option-'),
+    (namespace: m2-optgroup.$prefix, tokens: $optgroup-tokens, prefix: 'optgroup-'),
     (
-      namespace: tokens-mat-full-pseudo-checkbox.$prefix,
-      tokens: $full-pseudo-checkbox-tokens,
-      prefix: 'pseudo-checkbox-full-'
+      namespace: m2-pseudo-checkbox.$prefix,
+      tokens: m2-pseudo-checkbox.get-token-slots(),
+      prefix: 'pseudo-checkbox-'
     ),
-    (
-      namespace: tokens-mat-minimal-pseudo-checkbox.$prefix,
-      tokens: $minimal-pseudo-checkbox-tokens,
-      prefix: 'pseudo-checkbox-minimal-'
-    )
   );
 }
 
@@ -128,35 +117,26 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-app-tokens: token-utils.get-tokens-for($tokens, tokens-mat-app.$prefix, $options...);
-  $mat-ripple-tokens: token-utils.get-tokens-for($tokens, tokens-mat-ripple.$prefix, $options...);
-  $mat-option-tokens: token-utils.get-tokens-for($tokens, tokens-mat-option.$prefix, $options...);
+  $mat-app-tokens: token-utils.get-tokens-for($tokens, m2-app.$prefix, $options...);
+  $mat-ripple-tokens: token-utils.get-tokens-for($tokens, m2-ripple.$prefix, $options...);
+  $mat-option-tokens: token-utils.get-tokens-for($tokens, m2-option.$prefix, $options...);
   $mat-optgroup-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mat-optgroup.$prefix,
-    $options...
-  );
-  $mat-full-pseudo-checkbox-tokens: token-utils.get-tokens-for(
-    $tokens,
-    tokens-mat-full-pseudo-checkbox.$prefix,
+    m2-optgroup.$prefix,
     $options...
   );
-  $mat-minimal-pseudo-checkbox-tokens: token-utils.get-tokens-for(
+  $mat-pseudo-checkbox-tokens: token-utils.get-tokens-for(
     $tokens,
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
+    m2-pseudo-checkbox.$prefix,
     $options...
   );
 
-  @include token-utils.create-token-values(tokens-mat-app.$prefix, $mat-app-tokens);
-  @include token-utils.create-token-values(tokens-mat-ripple.$prefix, $mat-ripple-tokens);
-  @include token-utils.create-token-values(tokens-mat-option.$prefix, $mat-option-tokens);
-  @include token-utils.create-token-values(tokens-mat-optgroup.$prefix, $mat-optgroup-tokens);
-  @include token-utils.create-token-values(
-    tokens-mat-full-pseudo-checkbox.$prefix,
-    $mat-full-pseudo-checkbox-tokens
-  );
+  @include token-utils.create-token-values(m2-app.$prefix, $mat-app-tokens);
+  @include token-utils.create-token-values(m2-ripple.$prefix, $mat-ripple-tokens);
+  @include token-utils.create-token-values(m2-option.$prefix, $mat-option-tokens);
+  @include token-utils.create-token-values(m2-optgroup.$prefix, $mat-optgroup-tokens);
   @include token-utils.create-token-values(
-    tokens-mat-minimal-pseudo-checkbox.$prefix,
-    $mat-minimal-pseudo-checkbox-tokens
+    m2-pseudo-checkbox.$prefix,
+    $mat-pseudo-checkbox-tokens
   );
 }

package/core/_core.scss

@@ -1,4 +1,4 @@
-@use './tokens/m2/mat/app' as tokens-mat-app;
+@use './m2-app';
 @use './tokens/token-utils';
 @use './style/elevation';
 
@@ -20,10 +20,10 @@
   // user's content isn't inside of a `mat-sidenav-container`.
   @at-root {
     // Note: we need to emit fallback values here to avoid errors in internal builds.
-    @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
+    @include token-utils.use-tokens(m2-app.$prefix, m2-app.get-token-slots()) {
       .mat-app-background {
-        @include token-utils.create-token-slot(background-color, background-color, transparent);
-        @include token-utils.create-token-slot(color, text-color, inherit);
+        background-color: token-utils.slot(background-color, transparent);
+        color: token-utils.slot(text-color, inherit);
       }
     }
   }
@@ -35,7 +35,7 @@
 // Material Design specification.
 @mixin elevation-classes() {
   @at-root {
-    @include token-utils.use-tokens(tokens-mat-app.$prefix, tokens-mat-app.get-token-slots()) {
+    @include token-utils.use-tokens(m2-app.$prefix, m2-app.get-token-slots()) {
       // Provides external CSS classes for each elevation value. Each CSS class is formatted as
       // `mat-elevation-z$z-value` where `$z-value` corresponds to the z-space to which the element
       // is elevated.
@@ -44,7 +44,7 @@
         // We need the `mat-mdc-elevation-specific`, because some MDC mixins
         // come with elevation baked in and we don't have a way of removing it.
         .#{$selector}, .mat-mdc-elevation-specific.#{$selector} {
-          @include token-utils.create-token-slot(box-shadow, 'elevation-shadow-level-#{$z-value}',
+          box-shadow: token-utils.slot('elevation-shadow-level-#{$z-value}',
             none);
         }
       }

package/core/{tokens/m2/mat/_app.scss → _m2-app.scss}

@@ -1,8 +1,9 @@
 @use 'sass:map';
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
-@use '../../../style/elevation';
+@use './tokens/m2-utils';
+@use './theming/inspection';
+@use './style/sass-utils';
+@use './style/elevation';
+
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, app);
@@ -45,8 +46,8 @@ $prefix: (mat, app);
 @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/_app.scss → _m3-app.scss}

@@ -1,7 +1,7 @@
 @use 'sass:map';
 @use 'sass:meta';
-@use '../../../style/elevation';
-@use '../../token-definition';
+@use './style/elevation';
+@use './tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, app);
@@ -12,7 +12,6 @@ $prefix: (mat, app);
 /// @param {Map} $token-slots Possible token slots
 /// @return {Map} A set of custom tokens for the app
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
-  $shadow-color: map.get($systems, md-sys-color, shadow);
   $tokens: (
     background-color: map.get($systems, md-sys-color, background),
     text-color: map.get($systems, md-sys-color, on-background),
@@ -20,6 +19,7 @@ $prefix: (mat, app);
 
   // If the shadow-color is an actual color, convert it to a box-shadow value. Otherwise
   // use the token value as itself (e,g. as a CSS var name).
+  $shadow-color: map.get($systems, md-sys-color, shadow);
   @if (meta.type-of($shadow-color) == color) {
     @for $zValue from 0 through 24 {
       $shadow: elevation.get-box-shadow($zValue, $shadow-color);
@@ -27,5 +27,5 @@ $prefix: (mat, app);
     }
   }
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }