@angular/material 16.2.2 → 17.0.0-next.1

package/menu/testing/index.d.ts

@@ -1,31 +1,20 @@
 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 { HarnessLoader } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
 
 /** Harness for interacting with an MDC-based mat-menu in tests. */
-export declare class MatMenuHarness extends _MatMenuHarnessBase<typeof MatMenuItemHarness, MatMenuItemHarness, MenuItemHarnessFilters> {
+export declare class MatMenuHarness extends ContentContainerComponentHarness<string> {
+    private _documentRootLocator;
     /** The selector for the host element of a `MatMenu` instance. */
     static hostSelector: string;
-    protected _itemClass: typeof MatMenuItemHarness;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a menu with specific attributes.
      * @param options Options for filtering which menu instances are considered a match.
      * @return a `HarnessPredicate` configured with the given options.
      */
     static with<T extends MatMenuHarness>(this: ComponentHarnessConstructor<T>, options?: MenuHarnessFilters): HarnessPredicate<T>;
-}
-
-export declare abstract class _MatMenuHarnessBase<ItemType extends ComponentHarnessConstructor<Item> & {
-    with: (options?: ItemFilters) => HarnessPredicate<Item>;
-}, Item extends ComponentHarness & {
-    click(): Promise<void>;
-    getSubmenu(): Promise<_MatMenuHarnessBase<ItemType, Item, ItemFilters> | null>;
-}, ItemFilters extends BaseHarnessFilters> extends ContentContainerComponentHarness<string> {
-    private _documentRootLocator;
-    protected abstract _itemClass: ItemType;
     /** Whether the menu is disabled. */
     isDisabled(): Promise<boolean>;
     /** Whether the menu is open. */
@@ -46,7 +35,7 @@ export declare abstract class _MatMenuHarnessBase<ItemType extends ComponentHarn
      * Gets a list of `MatMenuItemHarness` representing the items in the menu.
      * @param filters Optionally filters which menu items are included.
      */
-    getItems(filters?: Omit<ItemFilters, 'ancestor'>): Promise<Item[]>;
+    getItems(filters?: Omit<MenuItemHarnessFilters, 'ancestor'>): Promise<MatMenuItemHarness[]>;
     /**
      * Clicks an item in the menu, and optionally continues clicking items in subsequent sub-menus.
      * @param itemFilter A filter used to represent which item in the menu should be clicked. The
@@ -55,7 +44,7 @@ export declare abstract class _MatMenuHarnessBase<ItemType extends ComponentHarn
      *     sub-menus. The first item in the sub-menu matching the corresponding filter in
      *     `subItemFilters` will be clicked.
      */
-    clickItem(itemFilter: Omit<ItemFilters, 'ancestor'>, ...subItemFilters: Omit<ItemFilters, 'ancestor'>[]): Promise<void>;
+    clickItem(itemFilter: Omit<MenuItemHarnessFilters, 'ancestor'>, ...subItemFilters: Omit<MenuItemHarnessFilters, 'ancestor'>[]): Promise<void>;
     protected getRootHarnessLoader(): Promise<HarnessLoader>;
     /** Gets the menu panel associated with this menu. */
     private _getMenuPanel;
@@ -63,21 +52,15 @@ export declare abstract class _MatMenuHarnessBase<ItemType extends ComponentHarn
     private _getPanelId;
 }
 
-/** Harness for interacting with an MDC-based mat-menu-item in tests. */
-export declare class MatMenuItemHarness extends _MatMenuItemHarnessBase<typeof MatMenuHarness, MatMenuHarness> {
+export declare class MatMenuItemHarness extends ContentContainerComponentHarness<string> {
     /** The selector for the host element of a `MatMenuItem` instance. */
     static hostSelector: string;
-    protected _menuClass: typeof MatMenuHarness;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a menu item with specific attributes.
      * @param options Options for filtering which menu item instances are considered a match.
      * @return a `HarnessPredicate` configured with the given options.
      */
     static with<T extends MatMenuItemHarness>(this: ComponentHarnessConstructor<T>, options?: MenuItemHarnessFilters): HarnessPredicate<T>;
-}
-
-export declare abstract class _MatMenuItemHarnessBase<MenuType extends ComponentHarnessConstructor<Menu>, Menu extends ComponentHarness> extends ContentContainerComponentHarness<string> {
-    protected abstract _menuClass: MenuType;
     /** Whether the menu is disabled. */
     isDisabled(): Promise<boolean>;
     /** Gets the text of the menu item. */
@@ -93,7 +76,7 @@ export declare abstract class _MatMenuItemHarnessBase<MenuType extends Component
     /** Whether this item has a submenu. */
     hasSubmenu(): Promise<boolean>;
     /** Gets the submenu associated with this menu item, or null if none. */
-    getSubmenu(): Promise<Menu | null>;
+    getSubmenu(): Promise<MatMenuHarness | null>;
 }
 
 /** A set of criteria that can be used to filter a list of `MatMenuHarness` instances. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/material",
-  "version": "16.2.2",
+  "version": "17.0.0-next.1",
   "description": "Angular Material",
   "repository": {
     "type": "git",
@@ -46,21 +46,6 @@
     "./prebuilt-themes/*": {
       "style": "./prebuilt-themes/*.css"
     },
-    "./legacy-prebuilt-themes/indigo-pink.css": {
-      "style": "./legacy-prebuilt-themes/legacy-indigo-pink.css"
-    },
-    "./legacy-prebuilt-themes/deeppurple-amber.css": {
-      "style": "./legacy-prebuilt-themes/legacy-deeppurple-amber.css"
-    },
-    "./legacy-prebuilt-themes/pink-bluegrey.css": {
-      "style": "./legacy-prebuilt-themes/legacy-pink-bluegrey.css"
-    },
-    "./legacy-prebuilt-themes/purple-green.css": {
-      "style": "./legacy-prebuilt-themes/legacy-purple-green.css"
-    },
-    "./legacy-prebuilt-themes/*": {
-      "style": "./legacy-prebuilt-themes/*.css"
-    },
     "./package.json": {
       "default": "./package.json"
     },
@@ -274,270 +259,6 @@
       "esm": "./esm2022/input/testing/index.mjs",
       "default": "./fesm2022/input/testing.mjs"
     },
-    "./legacy-autocomplete": {
-      "types": "./legacy-autocomplete/index.d.ts",
-      "esm2022": "./esm2022/legacy-autocomplete/legacy-autocomplete_public_index.mjs",
-      "esm": "./esm2022/legacy-autocomplete/legacy-autocomplete_public_index.mjs",
-      "default": "./fesm2022/legacy-autocomplete.mjs"
-    },
-    "./legacy-autocomplete/testing": {
-      "types": "./legacy-autocomplete/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-autocomplete/testing/index.mjs",
-      "esm": "./esm2022/legacy-autocomplete/testing/index.mjs",
-      "default": "./fesm2022/legacy-autocomplete/testing.mjs"
-    },
-    "./legacy-button": {
-      "types": "./legacy-button/index.d.ts",
-      "esm2022": "./esm2022/legacy-button/legacy-button_public_index.mjs",
-      "esm": "./esm2022/legacy-button/legacy-button_public_index.mjs",
-      "default": "./fesm2022/legacy-button.mjs"
-    },
-    "./legacy-button/testing": {
-      "types": "./legacy-button/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-button/testing/index.mjs",
-      "esm": "./esm2022/legacy-button/testing/index.mjs",
-      "default": "./fesm2022/legacy-button/testing.mjs"
-    },
-    "./legacy-card": {
-      "types": "./legacy-card/index.d.ts",
-      "esm2022": "./esm2022/legacy-card/legacy-card_public_index.mjs",
-      "esm": "./esm2022/legacy-card/legacy-card_public_index.mjs",
-      "default": "./fesm2022/legacy-card.mjs"
-    },
-    "./legacy-card/testing": {
-      "types": "./legacy-card/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-card/testing/index.mjs",
-      "esm": "./esm2022/legacy-card/testing/index.mjs",
-      "default": "./fesm2022/legacy-card/testing.mjs"
-    },
-    "./legacy-checkbox": {
-      "types": "./legacy-checkbox/index.d.ts",
-      "esm2022": "./esm2022/legacy-checkbox/legacy-checkbox_public_index.mjs",
-      "esm": "./esm2022/legacy-checkbox/legacy-checkbox_public_index.mjs",
-      "default": "./fesm2022/legacy-checkbox.mjs"
-    },
-    "./legacy-checkbox/testing": {
-      "types": "./legacy-checkbox/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-checkbox/testing/index.mjs",
-      "esm": "./esm2022/legacy-checkbox/testing/index.mjs",
-      "default": "./fesm2022/legacy-checkbox/testing.mjs"
-    },
-    "./legacy-chips": {
-      "types": "./legacy-chips/index.d.ts",
-      "esm2022": "./esm2022/legacy-chips/legacy-chips_public_index.mjs",
-      "esm": "./esm2022/legacy-chips/legacy-chips_public_index.mjs",
-      "default": "./fesm2022/legacy-chips.mjs"
-    },
-    "./legacy-chips/testing": {
-      "types": "./legacy-chips/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-chips/testing/index.mjs",
-      "esm": "./esm2022/legacy-chips/testing/index.mjs",
-      "default": "./fesm2022/legacy-chips/testing.mjs"
-    },
-    "./legacy-core": {
-      "types": "./legacy-core/index.d.ts",
-      "esm2022": "./esm2022/legacy-core/legacy-core_public_index.mjs",
-      "esm": "./esm2022/legacy-core/legacy-core_public_index.mjs",
-      "default": "./fesm2022/legacy-core.mjs"
-    },
-    "./legacy-core/testing": {
-      "types": "./legacy-core/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-core/testing/index.mjs",
-      "esm": "./esm2022/legacy-core/testing/index.mjs",
-      "default": "./fesm2022/legacy-core/testing.mjs"
-    },
-    "./legacy-dialog": {
-      "types": "./legacy-dialog/index.d.ts",
-      "esm2022": "./esm2022/legacy-dialog/legacy-dialog_public_index.mjs",
-      "esm": "./esm2022/legacy-dialog/legacy-dialog_public_index.mjs",
-      "default": "./fesm2022/legacy-dialog.mjs"
-    },
-    "./legacy-dialog/testing": {
-      "types": "./legacy-dialog/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-dialog/testing/index.mjs",
-      "esm": "./esm2022/legacy-dialog/testing/index.mjs",
-      "default": "./fesm2022/legacy-dialog/testing.mjs"
-    },
-    "./legacy-form-field": {
-      "types": "./legacy-form-field/index.d.ts",
-      "esm2022": "./esm2022/legacy-form-field/legacy-form-field_public_index.mjs",
-      "esm": "./esm2022/legacy-form-field/legacy-form-field_public_index.mjs",
-      "default": "./fesm2022/legacy-form-field.mjs"
-    },
-    "./legacy-form-field/testing": {
-      "types": "./legacy-form-field/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-form-field/testing/index.mjs",
-      "esm": "./esm2022/legacy-form-field/testing/index.mjs",
-      "default": "./fesm2022/legacy-form-field/testing.mjs"
-    },
-    "./legacy-input": {
-      "types": "./legacy-input/index.d.ts",
-      "esm2022": "./esm2022/legacy-input/legacy-input_public_index.mjs",
-      "esm": "./esm2022/legacy-input/legacy-input_public_index.mjs",
-      "default": "./fesm2022/legacy-input.mjs"
-    },
-    "./legacy-input/testing": {
-      "types": "./legacy-input/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-input/testing/index.mjs",
-      "esm": "./esm2022/legacy-input/testing/index.mjs",
-      "default": "./fesm2022/legacy-input/testing.mjs"
-    },
-    "./legacy-list": {
-      "types": "./legacy-list/index.d.ts",
-      "esm2022": "./esm2022/legacy-list/legacy-list_public_index.mjs",
-      "esm": "./esm2022/legacy-list/legacy-list_public_index.mjs",
-      "default": "./fesm2022/legacy-list.mjs"
-    },
-    "./legacy-list/testing": {
-      "types": "./legacy-list/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-list/testing/index.mjs",
-      "esm": "./esm2022/legacy-list/testing/index.mjs",
-      "default": "./fesm2022/legacy-list/testing.mjs"
-    },
-    "./legacy-menu": {
-      "types": "./legacy-menu/index.d.ts",
-      "esm2022": "./esm2022/legacy-menu/legacy-menu_public_index.mjs",
-      "esm": "./esm2022/legacy-menu/legacy-menu_public_index.mjs",
-      "default": "./fesm2022/legacy-menu.mjs"
-    },
-    "./legacy-menu/testing": {
-      "types": "./legacy-menu/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-menu/testing/index.mjs",
-      "esm": "./esm2022/legacy-menu/testing/index.mjs",
-      "default": "./fesm2022/legacy-menu/testing.mjs"
-    },
-    "./legacy-paginator": {
-      "types": "./legacy-paginator/index.d.ts",
-      "esm2022": "./esm2022/legacy-paginator/legacy-paginator_public_index.mjs",
-      "esm": "./esm2022/legacy-paginator/legacy-paginator_public_index.mjs",
-      "default": "./fesm2022/legacy-paginator.mjs"
-    },
-    "./legacy-paginator/testing": {
-      "types": "./legacy-paginator/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-paginator/testing/index.mjs",
-      "esm": "./esm2022/legacy-paginator/testing/index.mjs",
-      "default": "./fesm2022/legacy-paginator/testing.mjs"
-    },
-    "./legacy-progress-bar": {
-      "types": "./legacy-progress-bar/index.d.ts",
-      "esm2022": "./esm2022/legacy-progress-bar/legacy-progress-bar_public_index.mjs",
-      "esm": "./esm2022/legacy-progress-bar/legacy-progress-bar_public_index.mjs",
-      "default": "./fesm2022/legacy-progress-bar.mjs"
-    },
-    "./legacy-progress-bar/testing": {
-      "types": "./legacy-progress-bar/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-progress-bar/testing/index.mjs",
-      "esm": "./esm2022/legacy-progress-bar/testing/index.mjs",
-      "default": "./fesm2022/legacy-progress-bar/testing.mjs"
-    },
-    "./legacy-progress-spinner": {
-      "types": "./legacy-progress-spinner/index.d.ts",
-      "esm2022": "./esm2022/legacy-progress-spinner/legacy-progress-spinner_public_index.mjs",
-      "esm": "./esm2022/legacy-progress-spinner/legacy-progress-spinner_public_index.mjs",
-      "default": "./fesm2022/legacy-progress-spinner.mjs"
-    },
-    "./legacy-progress-spinner/testing": {
-      "types": "./legacy-progress-spinner/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-progress-spinner/testing/index.mjs",
-      "esm": "./esm2022/legacy-progress-spinner/testing/index.mjs",
-      "default": "./fesm2022/legacy-progress-spinner/testing.mjs"
-    },
-    "./legacy-radio": {
-      "types": "./legacy-radio/index.d.ts",
-      "esm2022": "./esm2022/legacy-radio/legacy-radio_public_index.mjs",
-      "esm": "./esm2022/legacy-radio/legacy-radio_public_index.mjs",
-      "default": "./fesm2022/legacy-radio.mjs"
-    },
-    "./legacy-radio/testing": {
-      "types": "./legacy-radio/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-radio/testing/index.mjs",
-      "esm": "./esm2022/legacy-radio/testing/index.mjs",
-      "default": "./fesm2022/legacy-radio/testing.mjs"
-    },
-    "./legacy-select": {
-      "types": "./legacy-select/index.d.ts",
-      "esm2022": "./esm2022/legacy-select/legacy-select_public_index.mjs",
-      "esm": "./esm2022/legacy-select/legacy-select_public_index.mjs",
-      "default": "./fesm2022/legacy-select.mjs"
-    },
-    "./legacy-select/testing": {
-      "types": "./legacy-select/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-select/testing/index.mjs",
-      "esm": "./esm2022/legacy-select/testing/index.mjs",
-      "default": "./fesm2022/legacy-select/testing.mjs"
-    },
-    "./legacy-slide-toggle": {
-      "types": "./legacy-slide-toggle/index.d.ts",
-      "esm2022": "./esm2022/legacy-slide-toggle/legacy-slide-toggle_public_index.mjs",
-      "esm": "./esm2022/legacy-slide-toggle/legacy-slide-toggle_public_index.mjs",
-      "default": "./fesm2022/legacy-slide-toggle.mjs"
-    },
-    "./legacy-slide-toggle/testing": {
-      "types": "./legacy-slide-toggle/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-slide-toggle/testing/index.mjs",
-      "esm": "./esm2022/legacy-slide-toggle/testing/index.mjs",
-      "default": "./fesm2022/legacy-slide-toggle/testing.mjs"
-    },
-    "./legacy-slider": {
-      "types": "./legacy-slider/index.d.ts",
-      "esm2022": "./esm2022/legacy-slider/legacy-slider_public_index.mjs",
-      "esm": "./esm2022/legacy-slider/legacy-slider_public_index.mjs",
-      "default": "./fesm2022/legacy-slider.mjs"
-    },
-    "./legacy-slider/testing": {
-      "types": "./legacy-slider/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-slider/testing/index.mjs",
-      "esm": "./esm2022/legacy-slider/testing/index.mjs",
-      "default": "./fesm2022/legacy-slider/testing.mjs"
-    },
-    "./legacy-snack-bar": {
-      "types": "./legacy-snack-bar/index.d.ts",
-      "esm2022": "./esm2022/legacy-snack-bar/legacy-snack-bar_public_index.mjs",
-      "esm": "./esm2022/legacy-snack-bar/legacy-snack-bar_public_index.mjs",
-      "default": "./fesm2022/legacy-snack-bar.mjs"
-    },
-    "./legacy-snack-bar/testing": {
-      "types": "./legacy-snack-bar/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-snack-bar/testing/index.mjs",
-      "esm": "./esm2022/legacy-snack-bar/testing/index.mjs",
-      "default": "./fesm2022/legacy-snack-bar/testing.mjs"
-    },
-    "./legacy-table": {
-      "types": "./legacy-table/index.d.ts",
-      "esm2022": "./esm2022/legacy-table/legacy-table_public_index.mjs",
-      "esm": "./esm2022/legacy-table/legacy-table_public_index.mjs",
-      "default": "./fesm2022/legacy-table.mjs"
-    },
-    "./legacy-table/testing": {
-      "types": "./legacy-table/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-table/testing/index.mjs",
-      "esm": "./esm2022/legacy-table/testing/index.mjs",
-      "default": "./fesm2022/legacy-table/testing.mjs"
-    },
-    "./legacy-tabs": {
-      "types": "./legacy-tabs/index.d.ts",
-      "esm2022": "./esm2022/legacy-tabs/legacy-tabs_public_index.mjs",
-      "esm": "./esm2022/legacy-tabs/legacy-tabs_public_index.mjs",
-      "default": "./fesm2022/legacy-tabs.mjs"
-    },
-    "./legacy-tabs/testing": {
-      "types": "./legacy-tabs/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-tabs/testing/index.mjs",
-      "esm": "./esm2022/legacy-tabs/testing/index.mjs",
-      "default": "./fesm2022/legacy-tabs/testing.mjs"
-    },
-    "./legacy-tooltip": {
-      "types": "./legacy-tooltip/index.d.ts",
-      "esm2022": "./esm2022/legacy-tooltip/legacy-tooltip_public_index.mjs",
-      "esm": "./esm2022/legacy-tooltip/legacy-tooltip_public_index.mjs",
-      "default": "./fesm2022/legacy-tooltip.mjs"
-    },
-    "./legacy-tooltip/testing": {
-      "types": "./legacy-tooltip/testing/index.d.ts",
-      "esm2022": "./esm2022/legacy-tooltip/testing/index.mjs",
-      "esm": "./esm2022/legacy-tooltip/testing/index.mjs",
-      "default": "./fesm2022/legacy-tooltip/testing.mjs"
-    },
     "./list": {
       "types": "./list/index.d.ts",
       "esm2022": "./esm2022/list/list_public_index.mjs",
@@ -756,12 +477,12 @@
     }
   },
   "peerDependencies": {
-    "@angular/animations": "^16.0.0 || ^17.0.0",
-    "@angular/cdk": "16.2.2",
-    "@angular/core": "^16.0.0 || ^17.0.0",
-    "@angular/common": "^16.0.0 || ^17.0.0",
-    "@angular/forms": "^16.0.0 || ^17.0.0",
-    "@angular/platform-browser": "^16.0.0 || ^17.0.0",
+    "@angular/animations": "^17.0.0-0 || ^17.1.0-0 || ^17.2.0-0 || ^17.3.0-0 || ^18.0.0-0",
+    "@angular/cdk": "17.0.0-next.1",
+    "@angular/core": "^17.0.0-0 || ^17.1.0-0 || ^17.2.0-0 || ^17.3.0-0 || ^18.0.0-0",
+    "@angular/common": "^17.0.0-0 || ^17.1.0-0 || ^17.2.0-0 || ^17.3.0-0 || ^18.0.0-0",
+    "@angular/forms": "^17.0.0-0 || ^17.1.0-0 || ^17.2.0-0 || ^17.3.0-0 || ^18.0.0-0",
+    "@angular/platform-browser": "^17.0.0-0 || ^17.1.0-0 || ^17.2.0-0 || ^17.3.0-0 || ^18.0.0-0",
     "rxjs": "^6.5.3 || ^7.4.0"
   },
   "dependencies": {

package/paginator/_paginator-theme.scss

@@ -3,34 +3,30 @@
 @use '../core/style/sass-utils';
 @use '../core/typography/typography';
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/tokens/token-utils';
 @use '../form-field/form-field-density';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-
+@mixin color($theme) {
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-paginator.$prefix,
-      tokens-mat-paginator.get-color-tokens($config));
+      tokens-mat-paginator.get-color-tokens($theme));
   }
 }
 
-@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 token-utils.create-token-values(tokens-mat-paginator.$prefix,
-      tokens-mat-paginator.get-typography-tokens($config));
+      tokens-mat-paginator.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {
-  $density-scale: theming.get-density-config($config-or-theme);
+@mixin density($theme) {
+  $density-scale: inspection.get-theme-density($theme);
 
   @include sass-utils.current-selector-or-root() {
     @include token-utils.create-token-values(tokens-mat-paginator.$prefix,
-      tokens-mat-paginator.get-density-tokens($density-scale));
+      tokens-mat-paginator.get-density-tokens($theme));
   }
 
   // TODO: this should be done through tokens once the form field has been switched over.
@@ -47,21 +43,16 @@
   }
 }
 
-@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-paginator') {
-    $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/paginator/index.d.ts

@@ -25,7 +25,6 @@ declare namespace i1 {
         PageEvent,
         MatPaginatorDefaultOptions,
         MAT_PAGINATOR_DEFAULT_OPTIONS,
-        _MatPaginatorBase,
         MatPaginator
     }
 }
@@ -48,28 +47,13 @@ export declare function MAT_PAGINATOR_INTL_PROVIDER_FACTORY(parentIntl: MatPagin
  * page, user-selectable options to change that size, what items are being shown, and
  * navigational button to go to the previous or next page.
  */
-export declare class MatPaginator extends _MatPaginatorBase<MatPaginatorDefaultOptions> {
+export declare class MatPaginator extends _MatPaginatorMixinBase implements OnInit, OnDestroy, CanDisable, HasInitialized {
+    _intl: MatPaginatorIntl;
+    private _changeDetectorRef;
     /** If set, styles the "page size" form field with the designated style. */
     _formFieldAppearance?: MatFormFieldAppearance;
     /** ID for the DOM node containing the paginator's items per page label. */
     readonly _pageSizeLabelId: string;
-    constructor(intl: MatPaginatorIntl, changeDetectorRef: ChangeDetectorRef, defaults?: MatPaginatorDefaultOptions);
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatPaginator, [null, null, { optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatPaginator, "mat-paginator", ["matPaginator"], { "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, never, false, never>;
-}
-
-/**
- * Base class with all of the `MatPaginator` functionality.
- * @docs-private
- */
-export declare abstract class _MatPaginatorBase<O extends {
-    pageSize?: number;
-    pageSizeOptions?: number[];
-    hidePageSize?: boolean;
-    showFirstLastButtons?: boolean;
-}> extends _MatPaginatorMixinBase implements OnInit, OnDestroy, CanDisable, HasInitialized {
-    _intl: MatPaginatorIntl;
-    private _changeDetectorRef;
     private _initialized;
     private _intlChanges;
     /** Theme color to be used for the underlying form controls. */
@@ -104,7 +88,7 @@ export declare abstract class _MatPaginatorBase<O extends {
     readonly page: EventEmitter<PageEvent>;
     /** Displayed set of page size options. Will be sorted and include current page size. */
     _displayedPageSizeOptions: number[];
-    constructor(_intl: MatPaginatorIntl, _changeDetectorRef: ChangeDetectorRef, defaults?: O);
+    constructor(_intl: MatPaginatorIntl, _changeDetectorRef: ChangeDetectorRef, defaults?: MatPaginatorDefaultOptions);
     ngOnInit(): void;
     ngOnDestroy(): void;
     /** Advances to the next page if it exists. */
@@ -141,8 +125,8 @@ export declare abstract class _MatPaginatorBase<O extends {
     private _updateDisplayedPageSizeOptions;
     /** Emits an event notifying that a change of the paginator's properties has been triggered. */
     private _emitPageEvent;
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatPaginatorBase<any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatPaginatorBase<any>, never, never, { "color": { "alias": "color"; "required": false; }; "pageIndex": { "alias": "pageIndex"; "required": false; }; "length": { "alias": "length"; "required": false; }; "pageSize": { "alias": "pageSize"; "required": false; }; "pageSizeOptions": { "alias": "pageSizeOptions"; "required": false; }; "hidePageSize": { "alias": "hidePageSize"; "required": false; }; "showFirstLastButtons": { "alias": "showFirstLastButtons"; "required": false; }; "selectConfig": { "alias": "selectConfig"; "required": false; }; }, { "page": "page"; }, never, never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatPaginator, [null, null, { optional: true; }]>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatPaginator, "mat-paginator", ["matPaginator"], { "disabled": { "alias": "disabled"; "required": false; }; "color": { "alias": "color"; "required": false; }; "pageIndex": { "alias": "pageIndex"; "required": false; }; "length": { "alias": "length"; "required": false; }; "pageSize": { "alias": "pageSize"; "required": false; }; "pageSizeOptions": { "alias": "pageSizeOptions"; "required": false; }; "hidePageSize": { "alias": "hidePageSize"; "required": false; }; "showFirstLastButtons": { "alias": "showFirstLastButtons"; "required": false; }; "selectConfig": { "alias": "selectConfig"; "required": false; }; }, { "page": "page"; }, never, never, false, never>;
 }
 
 /** Object that can be used to configure the default options for the paginator module. */

package/paginator/testing/index.d.ts

@@ -6,36 +6,23 @@ import { HarnessPredicate } from '@angular/cdk/testing';
 import { MatSelectHarness } from '@angular/material/select/testing';
 import { TestElement } from '@angular/cdk/testing';
 
-/** Harness for interacting with an MDC-based mat-paginator in tests. */
-export declare class MatPaginatorHarness extends _MatPaginatorHarnessBase {
+/** Harness for interacting with a mat-paginator in tests. */
+export declare class MatPaginatorHarness extends ComponentHarness {
     /** Selector used to find paginator instances. */
     static hostSelector: string;
-    protected _nextButton: AsyncFactoryFn<TestElement>;
-    protected _previousButton: AsyncFactoryFn<TestElement>;
-    protected _firstPageButton: AsyncFactoryFn<TestElement | null>;
-    protected _lastPageButton: AsyncFactoryFn<TestElement | null>;
-    protected _select: AsyncFactoryFn<MatSelectHarness | null>;
-    protected _pageSizeFallback: AsyncFactoryFn<TestElement>;
-    protected _rangeLabel: AsyncFactoryFn<TestElement>;
+    private _nextButton;
+    private _previousButton;
+    private _firstPageButton;
+    private _lastPageButton;
+    _select: AsyncFactoryFn<MatSelectHarness | null>;
+    private _pageSizeFallback;
+    _rangeLabel: AsyncFactoryFn<TestElement>;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a paginator with specific attributes.
      * @param options Options for filtering which paginator instances are considered a match.
      * @return a `HarnessPredicate` configured with the given options.
      */
     static with<T extends MatPaginatorHarness>(this: ComponentHarnessConstructor<T>, options?: PaginatorHarnessFilters): HarnessPredicate<T>;
-}
-
-export declare abstract class _MatPaginatorHarnessBase extends ComponentHarness {
-    protected abstract _nextButton: AsyncFactoryFn<TestElement>;
-    protected abstract _previousButton: AsyncFactoryFn<TestElement>;
-    protected abstract _firstPageButton: AsyncFactoryFn<TestElement | null>;
-    protected abstract _lastPageButton: AsyncFactoryFn<TestElement | null>;
-    protected abstract _select: AsyncFactoryFn<(ComponentHarness & {
-        getValueText(): Promise<string>;
-        clickOptions(...filters: unknown[]): Promise<void>;
-    }) | null>;
-    protected abstract _pageSizeFallback: AsyncFactoryFn<TestElement>;
-    protected abstract _rangeLabel: AsyncFactoryFn<TestElement>;
     /** Goes to the next page in the paginator. */
     goToNextPage(): Promise<void>;
     /** Returns whether or not the next page button is disabled. */