@angular/material 16.2.2 → 17.0.0-next.1

package/form-field/_form-field-theme.scss

@@ -5,109 +5,66 @@
 @use '../core/tokens/m2/mdc/outlined-text-field' as tokens-mdc-outlined-text-field;
 @use '../core/tokens/m2/mat/form-field' as tokens-mat-form-field;
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/mdc-helpers/mdc-helpers';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 @use './form-field-density';
-@use './form-field-subscript';
-@use './form-field-focus-overlay';
-@use './form-field-native-select';
-@use './mdc-text-field-theme-variable-refresh';
-
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
 
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include mdc-filled-text-field-theme.theme(
-      tokens-mdc-filled-text-field.get-color-tokens($config));
+      tokens-mdc-filled-text-field.get-color-tokens($theme));
     @include mdc-outlined-text-field-theme.theme(
-      tokens-mdc-outlined-text-field.get-color-tokens($config));
+      tokens-mdc-outlined-text-field.get-color-tokens($theme));
     @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
-      tokens-mat-form-field.get-color-tokens($config));
+      tokens-mat-form-field.get-color-tokens($theme));
   }
 
-  @include mdc-helpers.using-mdc-theme($config) {
-    @include mdc-text-field-theme-variable-refresh.private-text-field-refresh-theme-variables() {
-      @include form-field-subscript.private-form-field-subscript-color();
-      @include form-field-focus-overlay.private-form-field-focus-overlay-color();
-      @include form-field-native-select.private-form-field-native-select-color($config);
-
-      .mat-mdc-form-field.mat-accent {
-        @include mdc-filled-text-field-theme.theme(
-          tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($config, accent));
-        @include mdc-outlined-text-field-theme.theme(
-          tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($config, accent));
-      }
-
-      .mat-mdc-form-field.mat-warn {
-        @include mdc-filled-text-field-theme.theme(
-          tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($config, warn));
-        @include mdc-outlined-text-field-theme.theme(
-          tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($config, warn));
-      }
-
-      // This fixes an issue where the notch appears to be thicker than the rest of the outline when
-      // zoomed in on Chrome. The border inconsistency seems to be some kind of rendering artifact
-      // that arises from a combination of the fact that the notch contains text, while the leading
-      // and trailing outline do not, combined with the fact that the border is semi-transparent.
-      // Experimentally, I discovered that adding a transparent left border fixes the inconsistency.
-      // Note: class name is repeated to achieve sufficient specificity over the various MDC states.
-      // (hover, focus, etc.)
-      // TODO(mmalerba): port this fix into MDC
-      // TODO(crisbeto): move this into the structural styles
-      .mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field {
-        &.mat-mdc-form-field.mat-mdc-form-field .mdc-notched-outline__notch {
-          border-left: 1px solid transparent;
-        }
-      }
+  .mat-mdc-form-field.mat-accent {
+    @include mdc-filled-text-field-theme.theme(
+      tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($theme, accent));
+    @include mdc-outlined-text-field-theme.theme(
+      tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($theme, accent));
+    @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
+      tokens-mat-form-field.private-get-color-palette-color-tokens($theme, accent));
+  }
 
-      [dir='rtl'] {
-        .mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field {
-          &.mat-mdc-form-field.mat-mdc-form-field .mdc-notched-outline__notch {
-            border-left: none;
-            border-right: 1px solid transparent;
-          }
-        }
-      }
-    }
+  .mat-mdc-form-field.mat-warn {
+    @include mdc-filled-text-field-theme.theme(
+      tokens-mdc-filled-text-field.private-get-color-palette-color-tokens($theme, warn));
+    @include mdc-outlined-text-field-theme.theme(
+      tokens-mdc-outlined-text-field.private-get-color-palette-color-tokens($theme, warn));
+    @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
+      tokens-mat-form-field.private-get-color-palette-color-tokens($theme, warn));
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-
+@mixin typography($theme) {
   @include sass-utils.current-selector-or-root() {
     @include mdc-filled-text-field-theme.theme(
-      tokens-mdc-filled-text-field.get-typography-tokens($config));
+      tokens-mdc-filled-text-field.get-typography-tokens($theme));
     @include mdc-outlined-text-field-theme.theme(
-      tokens-mdc-outlined-text-field.get-typography-tokens($config));
+      tokens-mdc-outlined-text-field.get-typography-tokens($theme));
     @include token-utils.create-token-values(tokens-mat-form-field.$prefix,
-      tokens-mat-form-field.get-typography-tokens($config));
+      tokens-mat-form-field.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
-  @include form-field-density.private-form-field-density($density-scale);
+@mixin density($theme) {
+  @include form-field-density.private-form-field-density($theme);
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
-    @if $color != null {
-      @include color($color);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
     }
-    @if $density != null {
-      @include density($density);
+    @if inspection.theme-has($theme, density) {
+      @include density($theme);
     }
-    @if $typography != null {
-      @include typography($typography);
+    @if inspection.theme-has($theme, typography) {
+      @include typography($theme);
     }
   }
 }

package/form-field/_mdc-text-field-structure-overrides.scss

@@ -154,4 +154,24 @@
     content: none;
   }
 
+  // This fixes an issue where the notch appears to be thicker than the rest of the outline when
+  // zoomed in on Chrome. The border inconsistency seems to be some kind of rendering artifact
+  // that arises from a combination of the fact that the notch contains text, while the leading
+  // and trailing outline do not, combined with the fact that the border is semi-transparent.
+  // Experimentally, I discovered that adding a transparent left border fixes the inconsistency.
+  // Note: class name is repeated to achieve sufficient specificity over the various MDC states.
+  // (hover, focus, etc.)
+  // TODO(mmalerba): port this fix into MDC
+  .mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field {
+    &.mat-mdc-form-field.mat-mdc-form-field .mdc-notched-outline__notch {
+      border-left: 1px solid transparent;
+    }
+  }
+
+  [dir='rtl'] .mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field.mat-mdc-form-field {
+    &.mat-mdc-form-field.mat-mdc-form-field .mdc-notched-outline__notch {
+      border-left: none;
+      border-right: 1px solid transparent;
+    }
+  }
 }

package/form-field/testing/index.d.ts

@@ -1,4 +1,3 @@
-import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
@@ -8,11 +7,6 @@ import { MatDateRangeInputHarness } from '@angular/material/datepicker/testing';
 import { MatFormFieldControlHarness } from '@angular/material/form-field/testing/control';
 import { MatInputHarness } from '@angular/material/input/testing';
 import { MatSelectHarness } from '@angular/material/select/testing';
-import { TestElement } from '@angular/cdk/testing';
-
-declare interface ErrorBase extends ComponentHarness {
-    getText(): Promise<string>;
-}
 
 /** A set of criteria that can be used to filter a list of error harness instances. */
 export declare interface ErrorHarnessFilters extends BaseHarnessFilters {
@@ -34,7 +28,7 @@ export declare interface FormFieldHarnessFilters extends BaseHarnessFilters {
 }
 
 /** Harness for interacting with an MDC-based `mat-error` in tests. */
-export declare class MatErrorHarness extends _MatErrorHarnessBase {
+export declare class MatErrorHarness extends ComponentHarness {
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for an error with specific
@@ -43,18 +37,24 @@ export declare class MatErrorHarness extends _MatErrorHarnessBase {
      * @return a `HarnessPredicate` configured with the given options.
      */
     static with<T extends MatErrorHarness>(this: ComponentHarnessConstructor<T>, options?: ErrorHarnessFilters): HarnessPredicate<T>;
-}
-
-export declare abstract class _MatErrorHarnessBase extends ComponentHarness {
+    protected static _getErrorPredicate<T extends MatErrorHarness>(type: ComponentHarnessConstructor<T>, options: ErrorHarnessFilters): HarnessPredicate<T>;
     /** Gets a promise for the error's label text. */
     getText(): Promise<string>;
-    protected static _getErrorPredicate<T extends MatErrorHarness>(type: ComponentHarnessConstructor<T>, options: ErrorHarnessFilters): HarnessPredicate<T>;
 }
 
 export { MatFormFieldControlHarness }
 
-/** Harness for interacting with a MDC-based form-field's in tests. */
-export declare class MatFormFieldHarness extends _MatFormFieldHarnessBase<FormFieldControlHarness, typeof MatErrorHarness> {
+export declare class MatFormFieldHarness extends ComponentHarness {
+    private _prefixContainer;
+    private _suffixContainer;
+    private _label;
+    private _hints;
+    private _inputControl;
+    private _selectControl;
+    private _datepickerInputControl;
+    private _dateRangeInputControl;
+    private _textField;
+    private _errorHarness;
     static hostSelector: string;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a form field with specific
@@ -63,42 +63,12 @@ export declare class MatFormFieldHarness extends _MatFormFieldHarnessBase<FormFi
      * @return a `HarnessPredicate` configured with the given options.
      */
     static with<T extends MatFormFieldHarness>(this: ComponentHarnessConstructor<T>, options?: FormFieldHarnessFilters): HarnessPredicate<T>;
-    protected _prefixContainer: AsyncFactoryFn<TestElement | null>;
-    protected _suffixContainer: AsyncFactoryFn<TestElement | null>;
-    protected _label: AsyncFactoryFn<TestElement | null>;
-    protected _hints: AsyncFactoryFn<TestElement[]>;
-    protected _inputControl: AsyncFactoryFn<MatInputHarness | null>;
-    protected _selectControl: AsyncFactoryFn<MatSelectHarness | null>;
-    protected _datepickerInputControl: AsyncFactoryFn<MatDatepickerInputHarness | null>;
-    protected _dateRangeInputControl: AsyncFactoryFn<MatDateRangeInputHarness | null>;
-    protected _errorHarness: typeof MatErrorHarness;
-    private _mdcTextField;
     /** Gets the appearance of the form-field. */
     getAppearance(): Promise<'fill' | 'outline'>;
     /** Whether the form-field has a label. */
     hasLabel(): Promise<boolean>;
     /** Whether the label is currently floating. */
     isLabelFloating(): Promise<boolean>;
-}
-
-export declare abstract class _MatFormFieldHarnessBase<ControlHarness extends MatFormFieldControlHarness, ErrorType extends ComponentHarnessConstructor<ErrorBase> & {
-    with: (options?: ErrorHarnessFilters) => HarnessPredicate<ErrorBase>;
-}> extends ComponentHarness {
-    protected abstract _prefixContainer: AsyncFactoryFn<TestElement | null>;
-    protected abstract _suffixContainer: AsyncFactoryFn<TestElement | null>;
-    protected abstract _label: AsyncFactoryFn<TestElement | null>;
-    protected abstract _hints: AsyncFactoryFn<TestElement[]>;
-    protected abstract _inputControl: AsyncFactoryFn<ControlHarness | null>;
-    protected abstract _selectControl: AsyncFactoryFn<ControlHarness | null>;
-    protected abstract _datepickerInputControl: AsyncFactoryFn<ControlHarness | null>;
-    protected abstract _dateRangeInputControl: AsyncFactoryFn<ControlHarness | null>;
-    protected abstract _errorHarness: ErrorType;
-    /** Gets the appearance of the form-field. */
-    abstract getAppearance(): Promise<string>;
-    /** Whether the label is currently floating. */
-    abstract isLabelFloating(): Promise<boolean>;
-    /** Whether the form-field has a label. */
-    abstract hasLabel(): Promise<boolean>;
     /** Gets the label of the form-field. */
     getLabel(): Promise<string | null>;
     /** Whether the form-field has errors. */
@@ -112,7 +82,7 @@ export declare abstract class _MatFormFieldHarnessBase<ControlHarness extends Ma
      * default controls such as "MatInputHarness" and "MatSelectHarness" are
      * supported.
      */
-    getControl(): Promise<ControlHarness | null>;
+    getControl(): Promise<FormFieldControlHarness | null>;
     /**
      * Gets the harness of the control that is bound to the form-field. Searches
      * for a control that matches the specified harness type.

package/input/_input-theme.scss

@@ -1,35 +1,23 @@
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
-@use '../core/mdc-helpers/mdc-helpers';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-  @include mdc-helpers.using-mdc-theme($config) {}
-}
+@mixin color($theme) {}
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-  @include mdc-helpers.using-mdc-typography($config) {}
-}
+@mixin typography($theme) {}
 
-@mixin density($config-or-theme) {}
+@mixin density($theme) {}
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-input') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
-    @if $color != null {
-      @include color($color);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
     }
-    @if $density != null {
-      @include density($density);
+    @if inspection.theme-has($theme, density) {
+      @include density($theme);
     }
-    @if $typography != null {
-      @include typography($typography);
+    @if inspection.theme-has($theme, typography) {
+      @include typography($theme);
     }
   }
 }

package/list/_list-theme.scss

@@ -4,23 +4,23 @@
 @use '@material/radio/radio-theme' as mdc-radio-theme;
 @use '@material/list/list-theme' as mdc-list-theme;
 
+@use '../core/style/sass-utils';
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/tokens/m2/mdc/checkbox' as tokens-mdc-checkbox;
 @use '../core/tokens/m2/mdc/radio' as tokens-mdc-radio;
 @use '../core/tokens/m2/mdc/list' as tokens-mdc-list;
 @use '../core/typography/typography';
-@use '../core/typography/typography-utils';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-  $primary: map.get($config, primary);
-  $accent: map.get($config, accent);
-  $warn: map.get($config, warn);
-  $mdc-list-color-tokens: tokens-mdc-list.get-color-tokens($config);
-  $inner-control-primary: map.merge($config, (accent: $primary));
-  $inner-control-accent: map.merge($config, (accent: $accent));
-  $inner-control-warn: map.merge($config, (accent: $warn));
+@mixin base($config-or-theme) {
+  // Add default values for tokens not related to color, typography, or density.
+  @include sass-utils.current-selector-or-root() {
+    @include mdc-list-theme.theme(tokens-mdc-list.get-unthemable-tokens());
+  }
+}
 
+@mixin color($theme) {
+  $mdc-list-color-tokens: tokens-mdc-list.get-color-tokens($theme);
 
   // Add values for MDC list tokens.
   .mat-mdc-list-base {
@@ -29,37 +29,37 @@
 
   .mdc-list-item__start,
   .mdc-list-item__end {
-    @include mdc-radio-theme.theme(tokens-mdc-radio.get-color-tokens($inner-control-primary));
+    @include mdc-radio-theme.theme(tokens-mdc-radio.get-color-tokens($theme, primary));
   }
 
   .mat-accent {
     .mdc-list-item__start,
     .mdc-list-item__end {
-      @include mdc-radio-theme.theme(tokens-mdc-radio.get-color-tokens($inner-control-accent));
+      @include mdc-radio-theme.theme(tokens-mdc-radio.get-color-tokens($theme, accent));
     }
   }
 
   .mat-warn {
     .mdc-list-item__start,
     .mdc-list-item__end {
-      @include mdc-radio-theme.theme(tokens-mdc-radio.get-color-tokens($inner-control-warn));
+      @include mdc-radio-theme.theme(tokens-mdc-radio.get-color-tokens($theme, warn));
     }
   }
 
   .mat-mdc-list-option {
-    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($inner-control-primary));
+    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($theme, primary));
   }
   .mat-mdc-list-option.mat-accent {
-    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($inner-control-accent));
+    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($theme, accent));
   }
   .mat-mdc-list-option.mat-warn {
-    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($inner-control-warn));
+    @include mdc-checkbox-theme.theme(tokens-mdc-checkbox.get-color-tokens($theme, warn));
   }
 
   // There is no token for activated color on nav list.
   // TODO(mmalerba): Add a token to MDC or make a custom one.
   .mat-mdc-list-base.mat-mdc-list-base {
-    @include evolution-mixins.list-selected-ink-color(theming.get-color-from-palette($primary));
+    @include evolution-mixins.list-selected-ink-color(inspection.get-theme-color($theme, primary));
   }
 
   // TODO(mmalerba): Leaking styles from the old MDC list mixins used in other components can cause
@@ -74,9 +74,9 @@
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
-  $mdc-list-density-tokens: tokens-mdc-list.get-density-tokens($density-scale);
+@mixin density($theme) {
+  $density-scale: inspection.get-theme-density($theme);
+  $mdc-list-density-tokens: tokens-mdc-list.get-density-tokens($theme);
 
   // Add values for MDC list tokens.
   .mat-mdc-list-base {
@@ -86,7 +86,6 @@
   // TODO(mmalerba): This is added to maintain the same style MDC used prior to the token-based API,
   //  to avoid screenshot diffs. We should remove it in favor of following MDC's current style, or
   //  add custom tokens for it.
-  $clamped-density-scale: theming.clamp-density($density-scale, -5);
   .mat-mdc-list-item {
     &.mdc-list-item--with-leading-avatar,
     &.mdc-list-item--with-leading-checkbox,
@@ -99,7 +98,7 @@
             -3: 44px,
             -4: 40px,
             -5: 40px,
-        ), $clamped-density-scale);
+        ), $density-scale);
       }
 
       &.mdc-list-item--with-two-lines {
@@ -110,16 +109,14 @@
             -3: 60px,
             -4: 56px,
             -5: 56px,
-        ), $clamped-density-scale);
+        ), $density-scale);
       }
     }
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-  $mdc-list-typography-tokens: tokens-mdc-list.get-typography-tokens($config);
+@mixin typography($theme) {
+  $mdc-list-typography-tokens: tokens-mdc-list.get-typography-tokens($theme);
 
   // Add values for MDC list tokens.
   .mat-mdc-list-base {
@@ -129,25 +126,22 @@
   // MDC does not have tokens for the subheader.
   // TODO(mmalerba): Discuss with MDC about adding them, or create custom tokens.
   .mdc-list-group__subheader {
-    @include typography-utils.typography-level($config, subtitle-1);
+    font: inspection.get-theme-typography($theme, subtitle-1, font);
+    letter-spacing: inspection.get-theme-typography($theme, subtitle-1, letter-spacing);
   }
 }
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-list') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
-    @if $color != null {
-      @include color($color);
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
     }
-    @if $density != null {
-      @include density($density);
+    @if inspection.theme-has($theme, density) {
+      @include density($theme);
     }
-    @if $typography != null {
-      @include typography($typography);
+    @if inspection.theme-has($theme, typography) {
+      @include typography($theme);
     }
   }
 }

package/menu/index.d.ts

@@ -48,7 +48,6 @@ declare namespace i1 {
         MenuCloseReason,
         MatMenuDefaultOptions,
         MAT_MENU_DEFAULT_OPTIONS,
-        _MatMenuBase,
         MatMenu
     }
 }
@@ -62,7 +61,6 @@ declare namespace i2 {
 declare namespace i3 {
     export {
         MAT_MENU_CONTENT,
-        _MatMenuContentBase,
         MatMenuContent
     }
 }
@@ -73,7 +71,6 @@ declare namespace i4 {
         MAT_MENU_SCROLL_STRATEGY,
         MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER,
         MENU_PANEL_TOP_PADDING,
-        _MatMenuTriggerBase,
         MatMenuTrigger
     }
 }
@@ -110,27 +107,7 @@ export declare const MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER: {
     useFactory: typeof MAT_MENU_SCROLL_STRATEGY_FACTORY;
 };
 
-export declare class MatMenu extends _MatMenuBase {
-    protected _elevationPrefix: string;
-    protected _baseElevation: number;
-    constructor(elementRef: ElementRef<HTMLElement>, ngZone: NgZone, defaultOptions: MatMenuDefaultOptions);
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenu, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatMenu, "mat-menu", ["matMenu"], {}, {}, never, ["*"], false, never>;
-}
-
-/**
- * Animations used by the mat-menu component.
- * Animation duration and timing values are based on:
- * https://material.io/guidelines/components/menus.html#menus-usage
- * @docs-private
- */
-export declare const matMenuAnimations: {
-    readonly transformMenu: AnimationTriggerMetadata;
-    readonly fadeInItems: AnimationTriggerMetadata;
-};
-
-/** Base class with all of the `MatMenu` functionality. */
-export declare class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatMenuItem>, OnInit, OnDestroy {
+export declare class MatMenu implements AfterContentInit, MatMenuPanel<MatMenuItem>, OnInit, OnDestroy {
     private _elementRef;
     private _ngZone;
     private _changeDetectorRef?;
@@ -139,8 +116,8 @@ export declare class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatM
     private _yPosition;
     private _firstItemFocusSubscription?;
     private _previousElevation;
-    protected _elevationPrefix: string;
-    protected _baseElevation: number;
+    private _elevationPrefix;
+    private _baseElevation;
     /** All items inside the menu. Includes items nested inside another menu. */
     _allItems: QueryList<MatMenuItem>;
     /** Only the direct descendant menu items. */
@@ -280,17 +257,23 @@ export declare class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatM
      * when it comes to maintaining the item order.
      */
     private _updateDirectDescendants;
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatMenuBase, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatMenuBase, never, never, { "backdropClass": { "alias": "backdropClass"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "xPosition": { "alias": "xPosition"; "required": false; }; "yPosition": { "alias": "yPosition"; "required": false; }; "overlapTrigger": { "alias": "overlapTrigger"; "required": false; }; "hasBackdrop": { "alias": "hasBackdrop"; "required": false; }; "panelClass": { "alias": "class"; "required": false; }; "classList": { "alias": "classList"; "required": false; }; }, { "closed": "closed"; "close": "close"; }, ["lazyContent", "_allItems", "items"], never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenu, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatMenu, "mat-menu", ["matMenu"], { "backdropClass": { "alias": "backdropClass"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "xPosition": { "alias": "xPosition"; "required": false; }; "yPosition": { "alias": "yPosition"; "required": false; }; "overlapTrigger": { "alias": "overlapTrigger"; "required": false; }; "hasBackdrop": { "alias": "hasBackdrop"; "required": false; }; "panelClass": { "alias": "class"; "required": false; }; "classList": { "alias": "classList"; "required": false; }; }, { "closed": "closed"; "close": "close"; }, ["lazyContent", "_allItems", "items"], ["*"], false, never>;
 }
 
-/** Menu content that will be rendered lazily once the menu is opened. */
-export declare class MatMenuContent extends _MatMenuContentBase {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuContent, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatMenuContent, "ng-template[matMenuContent]", never, {}, {}, never, never, false, never>;
-}
+/**
+ * Animations used by the mat-menu component.
+ * Animation duration and timing values are based on:
+ * https://material.io/guidelines/components/menus.html#menus-usage
+ * @docs-private
+ */
+export declare const matMenuAnimations: {
+    readonly transformMenu: AnimationTriggerMetadata;
+    readonly fadeInItems: AnimationTriggerMetadata;
+};
 
-export declare abstract class _MatMenuContentBase implements OnDestroy {
+/** Menu content that will be rendered lazily once the menu is opened. */
+export declare class MatMenuContent implements OnDestroy {
     private _template;
     private _componentFactoryResolver;
     private _appRef;
@@ -319,8 +302,8 @@ export declare abstract class _MatMenuContentBase implements OnDestroy {
      */
     detach(): void;
     ngOnDestroy(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatMenuContentBase, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatMenuContentBase, never, never, {}, {}, never, never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuContent, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatMenuContent, "ng-template[matMenuContent]", never, {}, {}, never, never, false, never>;
 }
 
 /** Default `mat-menu` options that can be overridden. */
@@ -430,12 +413,7 @@ export declare interface MatMenuPanel<T = any> {
 }
 
 /** Directive applied to an element that should trigger a `mat-menu`. */
-export declare class MatMenuTrigger extends _MatMenuTriggerBase {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuTrigger, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatMenuTrigger, "[mat-menu-trigger-for], [matMenuTriggerFor]", ["matMenuTrigger"], {}, {}, never, never, false, never>;
-}
-
-export declare abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy {
+export declare class MatMenuTrigger implements AfterContentInit, OnDestroy {
     private _overlay;
     private _element;
     private _viewContainerRef;
@@ -579,8 +557,8 @@ export declare abstract class _MatMenuTriggerBase implements AfterContentInit, O
     private _handleHover;
     /** Gets the portal that should be attached to the overlay. */
     private _getPortal;
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatMenuTriggerBase, [null, null, null, null, { optional: true; }, { optional: true; self: true; }, { optional: true; }, null, null]>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatMenuTriggerBase, never, never, { "_deprecatedMatMenuTriggerFor": { "alias": "mat-menu-trigger-for"; "required": false; }; "menu": { "alias": "matMenuTriggerFor"; "required": false; }; "menuData": { "alias": "matMenuTriggerData"; "required": false; }; "restoreFocus": { "alias": "matMenuTriggerRestoreFocus"; "required": false; }; }, { "menuOpened": "menuOpened"; "onMenuOpen": "onMenuOpen"; "menuClosed": "menuClosed"; "onMenuClose": "onMenuClose"; }, never, never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuTrigger, [null, null, null, null, { optional: true; }, { optional: true; self: true; }, { optional: true; }, null, null]>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatMenuTrigger, "[mat-menu-trigger-for], [matMenuTriggerFor]", ["matMenuTrigger"], { "_deprecatedMatMenuTriggerFor": { "alias": "mat-menu-trigger-for"; "required": false; }; "menu": { "alias": "matMenuTriggerFor"; "required": false; }; "menuData": { "alias": "matMenuTriggerData"; "required": false; }; "restoreFocus": { "alias": "matMenuTriggerRestoreFocus"; "required": false; }; }, { "menuOpened": "menuOpened"; "onMenuOpen": "onMenuOpen"; "menuClosed": "menuClosed"; "onMenuClose": "onMenuClose"; }, never, never, false, never>;
 }
 
 /**