@angular/material 17.1.0-next.0 → 17.1.0-next.2

package/core/index.d.ts

@@ -313,6 +313,25 @@ export declare class ErrorStateMatcher {
     static ɵprov: i0.ɵɵInjectableDeclaration<ErrorStateMatcher>;
 }
 
+/**
+ * Class that tracks the error state of a component.
+ * @docs-private
+ */
+export declare class _ErrorStateTracker {
+    private _defaultMatcher;
+    ngControl: NgControl | null;
+    private _parentFormGroup;
+    private _parentForm;
+    private _stateChanges;
+    /** Whether the tracker is currently in an error state. */
+    errorState: boolean;
+    /** User-defined matcher for the error state. */
+    matcher: ErrorStateMatcher;
+    constructor(_defaultMatcher: ErrorStateMatcher | null, ngControl: NgControl | null, _parentFormGroup: FormGroupDirective | null, _parentForm: NgForm | null, _stateChanges: Subject<void>);
+    /** Updates the error state based on the provided error state matcher. */
+    updateErrorState(): void;
+}
+
 /**
  * Determines the position to which to scroll a panel in order for an option to be into view.
  * @param optionOffset Offset of the option from the top of the panel.
@@ -386,14 +405,21 @@ declare namespace i1_2 {
 
 declare namespace i1_3 {
     export {
-        _countGroupLabelsBeforeOption,
-        _getOptionScrollPosition,
-        MatOptionSelectionChange,
-        MatOption
+        MatRippleModule,
+        RippleGlobalOptions,
+        MAT_RIPPLE_GLOBAL_OPTIONS,
+        MatRipple,
+        RippleState,
+        RippleConfig,
+        RippleAnimationConfig,
+        RippleRef,
+        RippleTarget,
+        defaultRippleAnimationConfig,
+        RippleRenderer
     }
 }
 
-declare namespace i1_4 {
+declare namespace i2 {
     export {
         RippleGlobalOptions,
         MAT_RIPPLE_GLOBAL_OPTIONS,
@@ -401,39 +427,32 @@ declare namespace i1_4 {
     }
 }
 
-declare namespace i1_5 {
+declare namespace i2_2 {
     export {
         MatPseudoCheckboxState,
         MatPseudoCheckbox
     }
 }
 
-declare namespace i2 {
+declare namespace i3 {
     export {
-        MAT_OPTGROUP,
-        MatOptgroup
+        MatPseudoCheckboxModule
     }
 }
 
-declare namespace i3 {
+declare namespace i4 {
     export {
-        MatRippleModule,
-        RippleGlobalOptions,
-        MAT_RIPPLE_GLOBAL_OPTIONS,
-        MatRipple,
-        RippleState,
-        RippleConfig,
-        RippleAnimationConfig,
-        RippleRef,
-        RippleTarget,
-        defaultRippleAnimationConfig,
-        RippleRenderer
+        _countGroupLabelsBeforeOption,
+        _getOptionScrollPosition,
+        MatOptionSelectionChange,
+        MatOption
     }
 }
 
 declare namespace i5 {
     export {
-        MatPseudoCheckboxModule
+        MAT_OPTGROUP,
+        MatOptgroup
     }
 }
 
@@ -500,6 +519,18 @@ export declare const MATERIAL_SANITY_CHECKS: InjectionToken<SanityChecks>;
 /** @docs-private */
 declare function MATERIAL_SANITY_CHECKS_FACTORY(): SanityChecks;
 
+/**
+ * Internal shared component used as a container in form field controls.
+ * Not to be confused with `mat-form-field` which MDC calls a "text field".
+ * @docs-private
+ */
+export declare class _MatInternalFormField {
+    /** Position of the label relative to the content. */
+    labelPosition: 'before' | 'after';
+    static ɵfac: i0.ɵɵFactoryDeclaration<_MatInternalFormField, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<_MatInternalFormField, "div[mat-internal-form-field]", never, { "labelPosition": { "alias": "labelPosition"; "required": true; }; }, {}, never, ["*"], true, never>;
+}
+
 /**
  * Shared directive to count lines inside a text area, such as a list item.
  * Line elements can be extracted with a @ContentChildren(MatLine) query, then
@@ -507,12 +538,12 @@ declare function MATERIAL_SANITY_CHECKS_FACTORY(): SanityChecks;
  */
 export declare class MatLine {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatLine, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatLine, "[mat-line], [matLine]", never, {}, {}, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatLine, "[mat-line], [matLine]", never, {}, {}, never, never, true, never>;
 }
 
 export declare class MatLineModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatLineModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatLineModule, [typeof MatLine], [typeof i1_2.MatCommonModule], [typeof MatLine, typeof i1_2.MatCommonModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatLineModule, never, [typeof i1_2.MatCommonModule, typeof MatLine], [typeof MatLine, typeof i1_2.MatCommonModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MatLineModule>;
 }
 
@@ -536,7 +567,7 @@ export declare class MatOptgroup {
     _inert: boolean;
     constructor(parent?: MatOptionParentComponent);
     static ɵfac: i0.ɵɵFactoryDeclaration<MatOptgroup, [{ optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatOptgroup, "mat-optgroup", ["matOptgroup"], { "label": { "alias": "label"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, ["*", "mat-option, ng-container"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatOptgroup, "mat-optgroup", ["matOptgroup"], { "label": { "alias": "label"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, ["*", "mat-option, ng-container"], true, never>;
     static ngAcceptInputType_disabled: unknown;
 }
 
@@ -622,13 +653,13 @@ export declare class MatOption<T = any> implements FocusableOption, AfterViewChe
     /** Emits the selection change event. */
     private _emitSelectionChangeEvent;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatOption<any>, [null, null, { optional: true; }, { optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatOption<any>, "mat-option", ["matOption"], { "value": { "alias": "value"; "required": false; }; "id": { "alias": "id"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "onSelectionChange": "onSelectionChange"; }, never, ["mat-icon", "*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatOption<any>, "mat-option", ["matOption"], { "value": { "alias": "value"; "required": false; }; "id": { "alias": "id"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "onSelectionChange": "onSelectionChange"; }, never, ["mat-icon", "*"], true, never>;
     static ngAcceptInputType_disabled: unknown;
 }
 
 export declare class MatOptionModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatOptionModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatOptionModule, [typeof i1_3.MatOption, typeof i2.MatOptgroup], [typeof i3.MatRippleModule, typeof i1_2.MatCommonModule, typeof i5.MatPseudoCheckboxModule], [typeof i1_3.MatOption, typeof i2.MatOptgroup]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatOptionModule, never, [typeof i1_3.MatRippleModule, typeof i1_2.MatCommonModule, typeof i3.MatPseudoCheckboxModule, typeof i4.MatOption, typeof i5.MatOptgroup], [typeof i4.MatOption, typeof i5.MatOptgroup]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MatOptionModule>;
 }
 
@@ -683,12 +714,12 @@ export declare class MatPseudoCheckbox {
     appearance: 'minimal' | 'full';
     constructor(_animationMode?: string | undefined);
     static ɵfac: i0.ɵɵFactoryDeclaration<MatPseudoCheckbox, [{ optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatPseudoCheckbox, "mat-pseudo-checkbox", never, { "state": { "alias": "state"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "appearance": { "alias": "appearance"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatPseudoCheckbox, "mat-pseudo-checkbox", never, { "state": { "alias": "state"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "appearance": { "alias": "appearance"; "required": false; }; }, {}, never, never, true, never>;
 }
 
 export declare class MatPseudoCheckboxModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatPseudoCheckboxModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatPseudoCheckboxModule, [typeof i1_5.MatPseudoCheckbox], [typeof i1_2.MatCommonModule], [typeof i1_5.MatPseudoCheckbox]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatPseudoCheckboxModule, never, [typeof i1_2.MatCommonModule, typeof i2_2.MatPseudoCheckbox], [typeof i2_2.MatPseudoCheckbox]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MatPseudoCheckboxModule>;
 }
 
@@ -776,7 +807,7 @@ export declare class MatRipple implements OnInit, OnDestroy, RippleTarget {
      */
     launch(x: number, y: number, config?: RippleConfig): RippleRef;
     static ɵfac: i0.ɵɵFactoryDeclaration<MatRipple, [null, null, null, { optional: true; }, { optional: true; }]>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatRipple, "[mat-ripple], [matRipple]", ["matRipple"], { "color": { "alias": "matRippleColor"; "required": false; }; "unbounded": { "alias": "matRippleUnbounded"; "required": false; }; "centered": { "alias": "matRippleCentered"; "required": false; }; "radius": { "alias": "matRippleRadius"; "required": false; }; "animation": { "alias": "matRippleAnimation"; "required": false; }; "disabled": { "alias": "matRippleDisabled"; "required": false; }; "trigger": { "alias": "matRippleTrigger"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatRipple, "[mat-ripple], [matRipple]", ["matRipple"], { "color": { "alias": "matRippleColor"; "required": false; }; "unbounded": { "alias": "matRippleUnbounded"; "required": false; }; "centered": { "alias": "matRippleCentered"; "required": false; }; "radius": { "alias": "matRippleRadius"; "required": false; }; "animation": { "alias": "matRippleAnimation"; "required": false; }; "disabled": { "alias": "matRippleDisabled"; "required": false; }; "trigger": { "alias": "matRippleTrigger"; "required": false; }; }, {}, never, never, true, never>;
 }
 
 /**
@@ -819,7 +850,7 @@ export declare class MatRippleLoader implements OnDestroy {
 
 export declare class MatRippleModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatRippleModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatRippleModule, [typeof i1_4.MatRipple], [typeof i1_2.MatCommonModule], [typeof i1_4.MatRipple, typeof i1_2.MatCommonModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatRippleModule, never, [typeof i1_2.MatCommonModule, typeof i2.MatRipple], [typeof i2.MatRipple, typeof i1_2.MatCommonModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MatRippleModule>;
 }
 

package/core/internal-form-field/_internal-form-field-theme.scss

@@ -0,0 +1,37 @@
+@use '@material/form-field/form-field-theme' as mdc-form-field-theme;
+@use '../tokens/m2/mdc/form-field' as tokens-mdc-form-field;
+@use '../style/sass-utils';
+@use '../theming/theming';
+@use '../theming/inspection';
+@use '../typography/typography';
+
+@mixin base($theme) {}
+
+@mixin color($theme) {
+  @include sass-utils.current-selector-or-root() {
+    @include mdc-form-field-theme.theme(tokens-mdc-form-field.get-color-tokens($theme));
+  }
+}
+
+@mixin typography($theme) {
+  @include sass-utils.current-selector-or-root() {
+    @include mdc-form-field-theme.theme(tokens-mdc-form-field.get-typography-tokens($theme));
+  }
+}
+
+@mixin density($theme) {}
+
+@mixin theme($theme) {
+  @include theming.private-check-duplicate-theme-styles($theme, 'mat-internal-form-field') {
+    @include base($theme);
+      @if inspection.theme-has($theme, color) {
+        @include color($theme);
+      }
+      @if inspection.theme-has($theme, density) {
+        @include density($theme);
+      }
+      @if inspection.theme-has($theme, typography) {
+        @include typography($theme);
+      }
+  }
+}

package/core/option/_optgroup-theme.scss

@@ -1,41 +1,72 @@
+@use 'sass:map';
 @use '../tokens/m2/mat/optgroup' as tokens-mat-optgroup;
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
-
 @use '../theming/theming';
 @use '../theming/inspection';
 @use '../typography/typography';
 
-@mixin base($theme) {}
+@mixin base($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+  }
+  @else {}
+}
 
 @mixin color($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
-      tokens-mat-optgroup.get-color-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
+        tokens-mat-optgroup.get-color-tokens($theme));
+    }
   }
 }
 
 @mixin typography($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
-      tokens-mat-optgroup.get-typography-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-optgroup.$prefix,
+        tokens-mat-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));
+  }
+  @else {}
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-optgroup') {
-    @include base($theme);
-    @if inspection.theme-has($theme, color) {
-      @include color($theme);
-    }
-    @if inspection.theme-has($theme, density) {
-      @include density($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
     }
-    @if inspection.theme-has($theme, typography) {
-      @include typography($theme);
+    @else {
+      @include base($theme);
+      @if inspection.theme-has($theme, color) {
+        @include color($theme);
+      }
+      @if inspection.theme-has($theme, density) {
+        @include density($theme);
+      }
+      @if inspection.theme-has($theme, typography) {
+        @include typography($theme);
+      }
     }
   }
 }
+
+@mixin _theme-from-tokens($tokens) {
+  @if ($tokens != ()) {
+    @include token-utils.create-token-values(
+        tokens-mat-optgroup.$prefix, map.get($tokens, tokens-mat-optgroup.$prefix));
+  }
+}

package/core/option/_option-theme.scss

@@ -1,51 +1,82 @@
+@use 'sass:map';
 @use '../tokens/m2/mat/option' as tokens-mat-option;
 @use '../tokens/token-utils';
 @use '../style/sass-utils';
-
 @use '../theming/theming';
 @use '../theming/inspection';
 @use '../typography/typography';
 
-@mixin base($theme) {}
+@mixin base($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, base));
+  }
+  @else {}
+}
 
 @mixin color($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-option.$prefix,
-      tokens-mat-option.get-color-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, color));
   }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-option.$prefix,
+        tokens-mat-option.get-color-tokens($theme));
+    }
 
-  .mat-accent {
-    @include token-utils.create-token-values(tokens-mat-option.$prefix,
-      tokens-mat-option.get-color-tokens($theme, accent));
-  }
+    .mat-accent {
+      @include token-utils.create-token-values(tokens-mat-option.$prefix,
+        tokens-mat-option.get-color-tokens($theme, accent));
+    }
 
-  .mat-warn {
-    @include token-utils.create-token-values(tokens-mat-option.$prefix,
-      tokens-mat-option.get-color-tokens($theme, warn));
+    .mat-warn {
+      @include token-utils.create-token-values(tokens-mat-option.$prefix,
+        tokens-mat-option.get-color-tokens($theme, warn));
+    }
   }
 }
 
 @mixin typography($theme) {
-  @include sass-utils.current-selector-or-root() {
-    @include token-utils.create-token-values(tokens-mat-option.$prefix,
-      tokens-mat-option.get-typography-tokens($theme));
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, typography));
+  }
+  @else {
+    @include sass-utils.current-selector-or-root() {
+      @include token-utils.create-token-values(tokens-mat-option.$prefix,
+        tokens-mat-option.get-typography-tokens($theme));
+    }
   }
 }
 
 @mixin density($theme) {
+  @if inspection.get-theme-version($theme) == 1 {
+    @include _theme-from-tokens(inspection.get-theme-tokens($theme, density));
+  }
+  @else {}
 }
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-option') {
-    @include base($theme);
-    @if inspection.theme-has($theme, color) {
-      @include color($theme);
-    }
-    @if inspection.theme-has($theme, density) {
-      @include density($theme);
+    @if inspection.get-theme-version($theme) == 1 {
+      @include _theme-from-tokens(inspection.get-theme-tokens($theme));
     }
-    @if inspection.theme-has($theme, typography) {
-      @include typography($theme);
+    @else {
+      @include base($theme);
+      @if inspection.theme-has($theme, color) {
+        @include color($theme);
+      }
+      @if inspection.theme-has($theme, density) {
+        @include density($theme);
+      }
+      @if inspection.theme-has($theme, typography) {
+        @include typography($theme);
+      }
     }
   }
 }
+
+@mixin _theme-from-tokens($tokens) {
+  @if ($tokens != ()) {
+    @include token-utils.create-token-values(
+        tokens-mat-option.$prefix, map.get($tokens, tokens-mat-option.$prefix));
+  }
+}

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

@@ -1,53 +1,24 @@
 @use '../../theming/theming';
 @use '../../theming/inspection';
-
-@mixin _psuedo-checkbox-styles-with-color($text-color, $background) {
-  .mat-pseudo-checkbox-checked,
-  .mat-pseudo-checkbox-indeterminate {
-    &.mat-pseudo-checkbox-minimal::after {
-      color: $text-color;
-    }
-
-    // Full (checkbox) appearance inverts colors of text and background.
-    &.mat-pseudo-checkbox-full {
-      &::after {
-        color: $background;
-      }
-
-      background: $text-color;
-    }
+@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;
+
+@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));
   }
 }
 
-@mixin base($theme) {
-  // TODO(mmalerba): Move pseudo checkbox base tokens here
-}
+@mixin base($theme) {}
 
 @mixin color($theme) {
-  $is-dark-theme: inspection.get-theme-type($theme) == dark;
-  $primary: inspection.get-theme-color($theme, primary);
-  $accent: inspection.get-theme-color($theme, accent);
-  $warn: inspection.get-theme-color($theme, warn);
-  $background: inspection.get-theme-color($theme, background, background);
-  $secondary-text: inspection.get-theme-color($theme, foreground, secondary-text);
-
-  // NOTE(traviskaufman): While the spec calls for translucent blacks/whites for disabled colors,
-  // this does not work well with elements layered on top of one another. To get around this we
-  // blend the colors together based on the base color and the theme background.
-  $white-30pct-opacity-on-dark: #686868;
-  $black-26pct-opacity-on-light: #b0b0b0;
-  $disabled-color: if($is-dark-theme, $white-30pct-opacity-on-dark, $black-26pct-opacity-on-light);
-  $colored-box-selector: '.mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate';
-
-  .mat-pseudo-checkbox-full {
-    color: $secondary-text;
-    &.mat-pseudo-checkbox-disabled {
-      color: $disabled-color;
-    }
-  }
-
   .mat-primary {
-    @include _psuedo-checkbox-styles-with-color($primary, $background);
+    @include _palette-styles($theme, primary);
   }
 
   // Default to the accent color. Note that the pseudo checkboxes are meant to inherit the
@@ -55,30 +26,19 @@
   // don't attach to the `mat-*` classes. Also note that this needs to be below `.mat-primary`
   // in order to allow for the color to be overwritten if the checkbox is inside a parent that
   // has `mat-accent` and is placed inside another parent that has `mat-primary`.
-  @include _psuedo-checkbox-styles-with-color($accent, $background);
+  @include _palette-styles($theme, accent);
   .mat-accent {
-    @include _psuedo-checkbox-styles-with-color($accent, $background);
+    @include _palette-styles($theme, accent);
   }
 
   .mat-warn {
-    @include _psuedo-checkbox-styles-with-color($warn, $background);
-  }
-
-  .mat-pseudo-checkbox-disabled.mat-pseudo-checkbox-checked,
-  .mat-pseudo-checkbox-disabled.mat-pseudo-checkbox-indeterminate {
-    &.mat-pseudo-checkbox-minimal::after {
-      color: $disabled-color;
-    }
-
-    &.mat-pseudo-checkbox-full {
-      background: $disabled-color;
-    }
+    @include _palette-styles($theme, warn);
   }
 }
 
 @mixin typography($theme) {}
 
-@mixin _density($theme) {}
+@mixin density($theme) {}
 
 @mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-pseudo-checkbox') {
@@ -87,7 +47,7 @@
       @include color($theme);
     }
     @if inspection.theme-has($theme, density) {
-      @include _density($theme);
+      @include density($theme);
     }
     @if inspection.theme-has($theme, typography) {
       @include typography($theme);

package/core/tokens/m2/_index.scss

@@ -1,15 +1,31 @@
 @use 'sass:map';
 @use 'sass:meta';
 @use '../../style/sass-utils';
+@use './mat/autocomplete' as tokens-mat-autocomplete;
+@use './mat/badge' as tokens-mat-badge;
+@use './mat/bottom-sheet' as tokens-mat-bottom-sheet;
 @use './mat/card' as tokens-mat-card;
+@use './mat/datepicker' as tokens-mat-datepicker;
+@use './mat/divider' as tokens-mat-divider;
+@use './mat/expansion' as tokens-mat-expansion;
+@use './mat/fab' as tokens-mat-fab;
 @use './mat/form-field' as tokens-mat-form-field;
 @use './mat/grid-list' as tokens-mat-grid-list;
+@use './mat/icon' as tokens-mat-icon;
+@use './mat/icon-button' as tokens-mat-icon-button;
+@use './mat/menu' as tokens-mat-menu;
+@use './mat/option' as tokens-mat-option;
+@use './mat/optgroup' as tokens-mat-optgroup;
+@use './mat/paginator' as tokens-mat-paginator;
 @use './mat/radio' as tokens-mat-radio;
 @use './mat/ripple' as tokens-mat-ripple;
+@use './mat/select' as tokens-mat-select;
+@use './mat/sidenav' as tokens-mat-sidenav;
 @use './mat/slide-toggle' as tokens-mat-slide-toggle;
 @use './mat/slider' as tokens-mat-slider;
 @use './mat/snack-bar' as tokens-mat-snack-bar;
 @use './mat/sort' as tokens-mat-sort;
+@use './mat/standard-button-toggle' as tokens-mat-button-toggle;
 @use './mat/stepper' as tokens-mat-stepper;
 @use './mat/tab-header' as tokens-mat-tab-header;
 @use './mat/tab-header-with-background' as tokens-mat-tab-header-with-background;
@@ -17,9 +33,12 @@
 @use './mat/toolbar' as tokens-mat-toolbar;
 @use './mat/tree' as tokens-mat-tree;
 @use './mdc/checkbox' as tokens-mdc-checkbox;
+@use './mdc/chip' as tokens-mdc-chip;
 @use './mdc/circular-progress' as tokens-mdc-circular-progress;
 @use './mdc/dialog' as tokens-mdc-dialog;
 @use './mdc/elevated-card' as tokens-mdc-elevated-card;
+@use './mdc/extended-fab' as tokens-mdc-extended-fab;
+@use './mdc/fab' as tokens-mdc-fab;
 @use './mdc/filled-text-field' as tokens-mdc-filled-text-field;
 @use './mdc/icon-button' as tokens-mdc-icon-button;
 @use './mdc/linear-progress' as tokens-mdc-linear-progress;
@@ -77,11 +96,27 @@
 ///     )
 @function m2-tokens-from-theme($theme) {
   @return sass-utils.deep-merge-all(
+      _get-tokens-for-module($theme, tokens-mat-autocomplete),
+      _get-tokens-for-module($theme, tokens-mat-badge),
+      _get-tokens-for-module($theme, tokens-mat-bottom-sheet),
+      _get-tokens-for-module($theme, tokens-mat-button-toggle),
       _get-tokens-for-module($theme, tokens-mat-card),
+      _get-tokens-for-module($theme, tokens-mat-datepicker),
+      _get-tokens-for-module($theme, tokens-mat-divider),
+      _get-tokens-for-module($theme, tokens-mat-expansion),
+      _get-tokens-for-module($theme, tokens-mat-fab),
       _get-tokens-for-module($theme, tokens-mat-form-field),
       _get-tokens-for-module($theme, tokens-mat-grid-list),
+      _get-tokens-for-module($theme, tokens-mat-icon),
+      _get-tokens-for-module($theme, tokens-mat-icon-button),
+      _get-tokens-for-module($theme, tokens-mat-menu),
+      _get-tokens-for-module($theme, tokens-mat-optgroup),
+      _get-tokens-for-module($theme, tokens-mat-option),
+      _get-tokens-for-module($theme, tokens-mat-paginator),
       _get-tokens-for-module($theme, tokens-mat-radio),
       _get-tokens-for-module($theme, tokens-mat-ripple),
+      _get-tokens-for-module($theme, tokens-mat-select),
+      _get-tokens-for-module($theme, tokens-mat-sidenav),
       _get-tokens-for-module($theme, tokens-mat-slide-toggle),
       _get-tokens-for-module($theme, tokens-mat-slider),
       _get-tokens-for-module($theme, tokens-mat-snack-bar),
@@ -93,9 +128,12 @@
       _get-tokens-for-module($theme, tokens-mat-toolbar),
       _get-tokens-for-module($theme, tokens-mat-tree),
       _get-tokens-for-module($theme, tokens-mdc-checkbox),
+      _get-tokens-for-module($theme, tokens-mdc-chip),
       _get-tokens-for-module($theme, tokens-mdc-circular-progress),
       _get-tokens-for-module($theme, tokens-mdc-dialog),
       _get-tokens-for-module($theme, tokens-mdc-elevated-card),
+      _get-tokens-for-module($theme, tokens-mdc-extended-fab),
+      _get-tokens-for-module($theme, tokens-mdc-fab),
       _get-tokens-for-module($theme, tokens-mdc-filled-text-field),
       _get-tokens-for-module($theme, tokens-mdc-icon-button),
       _get-tokens-for-module($theme, tokens-mdc-linear-progress),