From 968d89b95786bb39bdbb34ba78033411a1b0b9be Mon Sep 17 00:00:00 2001
From: Andrew Seguin <andrewjs@google.com>
Date: Fri, 11 Aug 2023 16:23:23 -0600
Subject: [PATCH] fix(multiple): update API goldens

---
 .../material/autocomplete-testing.md          |  35 +---
 .../public_api_guard/material/autocomplete.md | 105 ++++-------
 .../material/checkbox-testing.md              |  24 +--
 tools/public_api_guard/material/checkbox.md   |  54 ++----
 tools/public_api_guard/material/core.md       |  37 +---
 .../material/dialog-testing.md                |  24 +--
 tools/public_api_guard/material/dialog.md     |  81 +++-----
 .../material/form-field-testing.md            |  73 ++------
 .../public_api_guard/material/menu-testing.md |  40 +---
 tools/public_api_guard/material/menu.md       |  61 ++----
 .../material/paginator-testing.md             |  44 +----
 tools/public_api_guard/material/paginator.md  |  26 +--
 .../material/radio-testing.md                 |  47 ++---
 tools/public_api_guard/material/radio.md      |  48 ++---
 .../material/select-testing.md                |  37 +---
 tools/public_api_guard/material/select.md     |  77 ++------
 .../material/slide-toggle-testing.md          |  28 +--
 .../public_api_guard/material/slide-toggle.md |  46 ++---
 .../material/snack-bar-testing.md             |  21 +--
 tools/public_api_guard/material/snack-bar.md  |  64 ++-----
 .../material/table-testing.md                 |  34 +---
 tools/public_api_guard/material/table.md      |  37 +---
 tools/public_api_guard/material/tabs.md       | 173 +++++-------------
 .../material/tooltip-testing.md               |  32 +---
 tools/public_api_guard/material/tooltip.md    |  74 ++------
 25 files changed, 305 insertions(+), 1017 deletions(-)

diff --git a/tools/public_api_guard/material/autocomplete-testing.md b/tools/public_api_guard/material/autocomplete-testing.md
index 48cfcb73d04b..ed3f78f2057a 100644
--- a/tools/public_api_guard/material/autocomplete-testing.md
+++ b/tools/public_api_guard/material/autocomplete-testing.md
@@ -19,45 +19,22 @@ export interface AutocompleteHarnessFilters extends BaseHarnessFilters {
     value?: string | RegExp;
 }
 
-// @public
-export class MatAutocompleteHarness extends _MatAutocompleteHarnessBase<typeof MatOptionHarness, MatOptionHarness, OptionHarnessFilters, typeof MatOptgroupHarness, MatOptgroupHarness, OptgroupHarnessFilters> {
-    protected _getPanelSelector(): Promise<string>;
-    static hostSelector: string;
-    // (undocumented)
-    protected _optionClass: typeof MatOptionHarness;
-    // (undocumented)
-    protected _optionGroupClass: typeof MatOptgroupHarness;
-    // (undocumented)
-    protected _prefix: string;
-    static with<T extends MatAutocompleteHarness>(this: ComponentHarnessConstructor<T>, options?: AutocompleteHarnessFilters): HarnessPredicate<T>;
-}
-
 // @public (undocumented)
-export abstract class _MatAutocompleteHarnessBase<OptionType extends ComponentHarnessConstructor<Option> & {
-    with: (options?: OptionFilters) => HarnessPredicate<Option>;
-}, Option extends ComponentHarness & {
-    click(): Promise<void>;
-}, OptionFilters extends BaseHarnessFilters, OptionGroupType extends ComponentHarnessConstructor<OptionGroup> & {
-    with: (options?: OptionGroupFilters) => HarnessPredicate<OptionGroup>;
-}, OptionGroup extends ComponentHarness, OptionGroupFilters extends BaseHarnessFilters> extends ComponentHarness {
+export class MatAutocompleteHarness extends ComponentHarness {
     blur(): Promise<void>;
     clear(): Promise<void>;
     enterText(value: string): Promise<void>;
     focus(): Promise<void>;
-    getOptionGroups(filters?: Omit<OptionGroupFilters, 'ancestor'>): Promise<OptionGroup[]>;
-    getOptions(filters?: Omit<OptionFilters, 'ancestor'>): Promise<Option[]>;
+    getOptionGroups(filters?: Omit<OptgroupHarnessFilters, 'ancestor'>): Promise<MatOptgroupHarness[]>;
+    getOptions(filters?: Omit<OptionHarnessFilters, 'ancestor'>): Promise<MatOptionHarness[]>;
     protected _getPanelSelector(): Promise<string>;
     getValue(): Promise<string>;
+    static hostSelector: string;
     isDisabled(): Promise<boolean>;
     isFocused(): Promise<boolean>;
     isOpen(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _optionClass: OptionType;
-    // (undocumented)
-    protected abstract _optionGroupClass: OptionGroupType;
-    // (undocumented)
-    protected abstract _prefix: string;
-    selectOption(filters: OptionFilters): Promise<void>;
+    selectOption(filters: OptionHarnessFilters): Promise<void>;
+    static with<T extends MatAutocompleteHarness>(this: ComponentHarnessConstructor<T>, options?: AutocompleteHarnessFilters): HarnessPredicate<T>;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/tools/public_api_guard/material/autocomplete.md b/tools/public_api_guard/material/autocomplete.md
index aadcf50793a1..28ab2622239a 100644
--- a/tools/public_api_guard/material/autocomplete.md
+++ b/tools/public_api_guard/material/autocomplete.md
@@ -25,9 +25,7 @@ import * as i7 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
 import { MatFormField } from '@angular/material/form-field';
 import { MatOptgroup } from '@angular/material/core';
-import { _MatOptgroupBase } from '@angular/material/core';
 import { MatOption } from '@angular/material/core';
-import { _MatOptionBase } from '@angular/material/core';
 import { MatOptionSelectionChange } from '@angular/material/core';
 import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
@@ -68,39 +66,10 @@ export const MAT_AUTOCOMPLETE_SCROLL_STRATEGY_FACTORY_PROVIDER: {
 // @public
 export const MAT_AUTOCOMPLETE_VALUE_ACCESSOR: any;
 
-// @public (undocumented)
-export class MatAutocomplete extends _MatAutocompleteBase implements OnDestroy {
-    // (undocumented)
-    _animationDone: EventEmitter<AnimationEvent_2>;
-    // (undocumented)
-    protected _hiddenClass: string;
-    get hideSingleSelectionIndicator(): boolean;
-    set hideSingleSelectionIndicator(value: BooleanInput);
-    // (undocumented)
-    ngOnDestroy(): void;
-    optionGroups: QueryList<MatOptgroup>;
-    options: QueryList<MatOption>;
-    // (undocumented)
-    protected _skipPredicate(_option: _MatOptionBase): boolean;
-    _syncParentProperties(): void;
-    // (undocumented)
-    protected _visibleClass: string;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatAutocomplete, "mat-autocomplete", ["matAutocomplete"], { "disableRipple": { "alias": "disableRipple"; "required": false; }; "hideSingleSelectionIndicator": { "alias": "hideSingleSelectionIndicator"; "required": false; }; }, {}, ["optionGroups", "options"], ["*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatAutocomplete, never>;
-}
-
 // @public
-export interface MatAutocompleteActivatedEvent {
-    option: _MatOptionBase | null;
-    source: _MatAutocompleteBase;
-}
-
-// @public
-export abstract class _MatAutocompleteBase extends _MatAutocompleteMixinBase implements AfterContentInit, CanDisableRipple, OnDestroy {
+export class MatAutocomplete extends _MatAutocompleteMixinBase implements AfterContentInit, CanDisableRipple, OnDestroy {
     constructor(_changeDetectorRef: ChangeDetectorRef, _elementRef: ElementRef<HTMLElement>, _defaults: MatAutocompleteDefaultOptions, platform?: Platform);
-    abstract _animationDone: EventEmitter<AnimationEvent_2> | null;
+    _animationDone: EventEmitter<AnimationEvent_2>;
     ariaLabel: string;
     ariaLabelledby: string;
     get autoActiveFirstOption(): boolean;
@@ -116,24 +85,25 @@ export abstract class _MatAutocompleteBase extends _MatAutocompleteMixinBase imp
     // (undocumented)
     protected _defaults: MatAutocompleteDefaultOptions;
     displayWith: ((value: any) => string) | null;
-    _emitSelectEvent(option: _MatOptionBase): void;
+    _emitSelectEvent(option: MatOption): void;
     _getPanelAriaLabelledby(labelId: string | null): string | null;
     _getScrollTop(): number;
-    protected abstract _hiddenClass: string;
+    get hideSingleSelectionIndicator(): boolean;
+    set hideSingleSelectionIndicator(value: BooleanInput);
     id: string;
     readonly inertGroups: boolean;
     get isOpen(): boolean;
     // (undocumented)
     _isOpen: boolean;
-    _keyManager: ActiveDescendantKeyManager<_MatOptionBase>;
+    _keyManager: ActiveDescendantKeyManager<MatOption>;
     // (undocumented)
     ngAfterContentInit(): void;
     // (undocumented)
     ngOnDestroy(): void;
     readonly opened: EventEmitter<void>;
     readonly optionActivated: EventEmitter<MatAutocompleteActivatedEvent>;
-    abstract optionGroups: QueryList<_MatOptgroupBase>;
-    abstract options: QueryList<_MatOptionBase>;
+    optionGroups: QueryList<MatOptgroup>;
+    options: QueryList<MatOption>;
     readonly optionSelected: EventEmitter<MatAutocompleteSelectedEvent>;
     panel: ElementRef;
     panelWidth: string | number;
@@ -144,13 +114,19 @@ export abstract class _MatAutocompleteBase extends _MatAutocompleteMixinBase imp
     _setVisibility(): void;
     showPanel: boolean;
     // (undocumented)
-    protected _skipPredicate(option: _MatOptionBase): boolean;
+    protected _skipPredicate(): boolean;
+    _syncParentProperties(): void;
     template: TemplateRef<any>;
-    protected abstract _visibleClass: string;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatAutocompleteBase, never, never, { "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "displayWith": { "alias": "displayWith"; "required": false; }; "autoActiveFirstOption": { "alias": "autoActiveFirstOption"; "required": false; }; "autoSelectActiveOption": { "alias": "autoSelectActiveOption"; "required": false; }; "requireSelection": { "alias": "requireSelection"; "required": false; }; "panelWidth": { "alias": "panelWidth"; "required": false; }; "classList": { "alias": "class"; "required": false; }; }, { "optionSelected": "optionSelected"; "opened": "opened"; "closed": "closed"; "optionActivated": "optionActivated"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatAutocomplete, "mat-autocomplete", ["matAutocomplete"], { "disableRipple": { "alias": "disableRipple"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "displayWith": { "alias": "displayWith"; "required": false; }; "autoActiveFirstOption": { "alias": "autoActiveFirstOption"; "required": false; }; "autoSelectActiveOption": { "alias": "autoSelectActiveOption"; "required": false; }; "requireSelection": { "alias": "requireSelection"; "required": false; }; "panelWidth": { "alias": "panelWidth"; "required": false; }; "classList": { "alias": "class"; "required": false; }; "hideSingleSelectionIndicator": { "alias": "hideSingleSelectionIndicator"; "required": false; }; }, { "optionSelected": "optionSelected"; "opened": "opened"; "closed": "closed"; "optionActivated": "optionActivated"; }, ["options", "optionGroups"], ["*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatAutocompleteBase, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatAutocomplete, never>;
+}
+
+// @public
+export interface MatAutocompleteActivatedEvent {
+    option: MatOption | null;
+    source: MatAutocomplete;
 }
 
 // @public
@@ -173,54 +149,35 @@ export class MatAutocompleteModule {
 }
 
 // @public
-export class MatAutocompleteOrigin extends _MatAutocompleteOriginBase {
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatAutocompleteOrigin, "[matAutocompleteOrigin]", ["matAutocompleteOrigin"], {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatAutocompleteOrigin, never>;
-}
-
-// @public
-export abstract class _MatAutocompleteOriginBase {
+export class MatAutocompleteOrigin {
     constructor(
     elementRef: ElementRef<HTMLElement>);
     elementRef: ElementRef<HTMLElement>;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatAutocompleteOriginBase, never, never, {}, {}, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatAutocompleteOrigin, "[matAutocompleteOrigin]", ["matAutocompleteOrigin"], {}, {}, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatAutocompleteOriginBase, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatAutocompleteOrigin, never>;
 }
 
 // @public
 export class MatAutocompleteSelectedEvent {
     constructor(
-    source: _MatAutocompleteBase,
-    option: _MatOptionBase);
-    option: _MatOptionBase;
-    source: _MatAutocompleteBase;
-}
-
-// @public (undocumented)
-export class MatAutocompleteTrigger extends _MatAutocompleteTriggerBase {
-    // (undocumented)
-    protected _aboveClass: string;
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatAutocompleteTrigger, "input[matAutocomplete], textarea[matAutocomplete]", ["matAutocompleteTrigger"], {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatAutocompleteTrigger, never>;
+    source: MatAutocomplete,
+    option: MatOption);
+    option: MatOption;
+    source: MatAutocomplete;
 }
 
 // @public
-export abstract class _MatAutocompleteTriggerBase implements ControlValueAccessor, AfterViewInit, OnChanges, OnDestroy {
+export class MatAutocompleteTrigger implements ControlValueAccessor, AfterViewInit, OnChanges, OnDestroy {
     constructor(_element: ElementRef<HTMLInputElement>, _overlay: Overlay, _viewContainerRef: ViewContainerRef, _zone: NgZone, _changeDetectorRef: ChangeDetectorRef, scrollStrategy: any, _dir: Directionality | null, _formField: MatFormField | null, _document: any, _viewportRuler: ViewportRuler, _defaults?: MatAutocompleteDefaultOptions | null | undefined);
-    protected abstract _aboveClass: string;
-    get activeOption(): _MatOptionBase | null;
-    autocomplete: _MatAutocompleteBase;
+    get activeOption(): MatOption | null;
+    autocomplete: MatAutocomplete;
     autocompleteAttribute: string;
     get autocompleteDisabled(): boolean;
     set autocompleteDisabled(value: BooleanInput);
     closePanel(): void;
-    connectedTo: _MatAutocompleteOriginBase;
+    connectedTo: MatAutocompleteOrigin;
     // (undocumented)
     _handleClick(): void;
     // (undocumented)
@@ -252,9 +209,9 @@ export abstract class _MatAutocompleteTriggerBase implements ControlValueAccesso
     // (undocumented)
     writeValue(value: any): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatAutocompleteTriggerBase, never, never, { "autocomplete": { "alias": "matAutocomplete"; "required": false; }; "position": { "alias": "matAutocompletePosition"; "required": false; }; "connectedTo": { "alias": "matAutocompleteConnectedTo"; "required": false; }; "autocompleteAttribute": { "alias": "autocomplete"; "required": false; }; "autocompleteDisabled": { "alias": "matAutocompleteDisabled"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatAutocompleteTrigger, "input[matAutocomplete], textarea[matAutocomplete]", ["matAutocompleteTrigger"], { "autocomplete": { "alias": "matAutocomplete"; "required": false; }; "position": { "alias": "matAutocompletePosition"; "required": false; }; "connectedTo": { "alias": "matAutocompleteConnectedTo"; "required": false; }; "autocompleteAttribute": { "alias": "autocomplete"; "required": false; }; "autocompleteDisabled": { "alias": "matAutocompleteDisabled"; "required": false; }; }, {}, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatAutocompleteTriggerBase, [null, null, null, null, null, null, { optional: true; }, { optional: true; host: true; }, { optional: true; }, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatAutocompleteTrigger, [null, null, null, null, null, null, { optional: true; }, { optional: true; host: true; }, { optional: true; }, null, { optional: true; }]>;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/tools/public_api_guard/material/checkbox-testing.md b/tools/public_api_guard/material/checkbox-testing.md
index b78658c7632c..2a2424dfbbbf 100644
--- a/tools/public_api_guard/material/checkbox-testing.md
+++ b/tools/public_api_guard/material/checkbox-testing.md
@@ -4,12 +4,10 @@
 
 ```ts
 
-import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { TestElement } from '@angular/cdk/testing';
 
 // @public
 export interface CheckboxHarnessFilters extends BaseHarnessFilters {
@@ -20,20 +18,7 @@ export interface CheckboxHarnessFilters extends BaseHarnessFilters {
 }
 
 // @public
-export class MatCheckboxHarness extends _MatCheckboxHarnessBase {
-    // (undocumented)
-    static hostSelector: string;
-    // (undocumented)
-    protected _input: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected _label: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    toggle(): Promise<void>;
-    static with<T extends MatCheckboxHarness>(this: ComponentHarnessConstructor<T>, options?: CheckboxHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatCheckboxHarnessBase extends ComponentHarness {
+export class MatCheckboxHarness extends ComponentHarness {
     blur(): Promise<void>;
     check(): Promise<void>;
     focus(): Promise<void>;
@@ -43,17 +28,16 @@ export abstract class _MatCheckboxHarnessBase extends ComponentHarness {
     getName(): Promise<string | null>;
     getValue(): Promise<string | null>;
     // (undocumented)
-    protected abstract _input: AsyncFactoryFn<TestElement>;
+    static hostSelector: string;
     isChecked(): Promise<boolean>;
     isDisabled(): Promise<boolean>;
     isFocused(): Promise<boolean>;
     isIndeterminate(): Promise<boolean>;
     isRequired(): Promise<boolean>;
     isValid(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _label: AsyncFactoryFn<TestElement>;
-    abstract toggle(): Promise<void>;
+    toggle(): Promise<void>;
     uncheck(): Promise<void>;
+    static with<T extends MatCheckboxHarness>(this: ComponentHarnessConstructor<T>, options?: CheckboxHarnessFilters): HarnessPredicate<T>;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/tools/public_api_guard/material/checkbox.md b/tools/public_api_guard/material/checkbox.md
index 0fad2552d274..7fc291c9746c 100644
--- a/tools/public_api_guard/material/checkbox.md
+++ b/tools/public_api_guard/material/checkbox.md
@@ -17,7 +17,6 @@ import { ControlValueAccessor } from '@angular/forms';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusableOption } from '@angular/cdk/a11y';
-import { FocusOrigin } from '@angular/cdk/a11y';
 import { HasTabIndex } from '@angular/material/core';
 import * as i0 from '@angular/core';
 import * as i3 from '@angular/material/core';
@@ -40,9 +39,8 @@ export function MAT_CHECKBOX_DEFAULT_OPTIONS_FACTORY(): MatCheckboxDefaultOption
 export const MAT_CHECKBOX_REQUIRED_VALIDATOR: Provider;
 
 // @public (undocumented)
-export class MatCheckbox extends _MatCheckboxBase<MatCheckboxChange> implements ControlValueAccessor, CanColor, CanDisable {
-    constructor(elementRef: ElementRef<HTMLElement>, changeDetectorRef: ChangeDetectorRef, ngZone: NgZone, tabIndex: string, animationMode?: string, options?: MatCheckboxDefaultOptions);
-    // (undocumented)
+export class MatCheckbox extends _MatCheckboxMixinBase implements AfterViewInit, ControlValueAccessor, CanColor, CanDisable, HasTabIndex, CanDisableRipple, FocusableOption {
+    constructor(elementRef: ElementRef<HTMLElement>, _changeDetectorRef: ChangeDetectorRef, _ngZone: NgZone, tabIndex: string, _animationMode?: string | undefined, _options?: MatCheckboxDefaultOptions | undefined);
     protected _animationClasses: {
         uncheckedToChecked: string;
         uncheckedToIndeterminate: string;
@@ -52,47 +50,18 @@ export class MatCheckbox extends _MatCheckboxBase<MatCheckboxChange> implements
         indeterminateToUnchecked: string;
     };
     // (undocumented)
-    protected _createChangeEvent(isChecked: boolean): MatCheckboxChange;
-    focus(): void;
-    // (undocumented)
-    protected _getAnimationTargetElement(): HTMLInputElement;
-    // (undocumented)
-    _onInputClick(): void;
-    // (undocumented)
-    _onTouchTargetClick(): void;
-    _preventBubblingFromLabel(event: MouseEvent): void;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatCheckbox, "mat-checkbox", ["matCheckbox"], { "disableRipple": { "alias": "disableRipple"; "required": false; }; "color": { "alias": "color"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; }, {}, never, ["*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatCheckbox, [null, null, null, { attribute: "tabindex"; }, { optional: true; }, { optional: true; }]>;
-}
-
-// @public (undocumented)
-export abstract class _MatCheckboxBase<E> extends _MatCheckboxMixinBase implements AfterViewInit, ControlValueAccessor, CanColor, CanDisable, HasTabIndex, CanDisableRipple, FocusableOption {
-    constructor(idPrefix: string, elementRef: ElementRef<HTMLElement>, _changeDetectorRef: ChangeDetectorRef, _ngZone: NgZone, tabIndex: string, _animationMode?: string | undefined, _options?: MatCheckboxDefaultOptions | undefined);
-    protected abstract _animationClasses: {
-        uncheckedToChecked: string;
-        uncheckedToIndeterminate: string;
-        checkedToUnchecked: string;
-        checkedToIndeterminate: string;
-        indeterminateToChecked: string;
-        indeterminateToUnchecked: string;
-    };
-    // (undocumented)
     _animationMode?: string | undefined;
     ariaDescribedby: string;
     ariaLabel: string;
     ariaLabelledby: string | null;
-    readonly change: EventEmitter<E>;
-    // (undocumented)
-    protected _changeDetectorRef: ChangeDetectorRef;
+    readonly change: EventEmitter<MatCheckboxChange>;
     get checked(): boolean;
     set checked(value: BooleanInput);
-    protected abstract _createChangeEvent(isChecked: boolean): E;
+    protected _createChangeEvent(isChecked: boolean): MatCheckboxChange;
     get disabled(): boolean;
     set disabled(value: BooleanInput);
-    abstract focus(origin?: FocusOrigin): void;
-    protected abstract _getAnimationTargetElement(): HTMLElement | null;
+    focus(): void;
+    protected _getAnimationTargetElement(): HTMLInputElement;
     // (undocumented)
     protected _handleInputClick(): void;
     id: string;
@@ -109,15 +78,16 @@ export abstract class _MatCheckboxBase<E> extends _MatCheckboxMixinBase implemen
     // (undocumented)
     ngAfterViewInit(): void;
     // (undocumented)
-    protected _ngZone: NgZone;
-    // (undocumented)
     _onBlur(): void;
     // (undocumented)
+    _onInputClick(): void;
+    // (undocumented)
     _onInteractionEvent(event: Event): void;
     _onLabelTextChange(): void;
     _onTouched: () => any;
     // (undocumented)
-    protected _options?: MatCheckboxDefaultOptions | undefined;
+    _onTouchTargetClick(): void;
+    _preventBubblingFromLabel(event: MouseEvent): void;
     // (undocumented)
     registerOnChange(fn: (value: any) => void): void;
     // (undocumented)
@@ -133,9 +103,9 @@ export abstract class _MatCheckboxBase<E> extends _MatCheckboxMixinBase implemen
     // (undocumented)
     writeValue(value: any): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatCheckboxBase<any>, never, never, { "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "id": { "alias": "id"; "required": false; }; "required": { "alias": "required"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "name": { "alias": "name"; "required": false; }; "value": { "alias": "value"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "indeterminate": { "alias": "indeterminate"; "required": false; }; }, { "change": "change"; "indeterminateChange": "indeterminateChange"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatCheckbox, "mat-checkbox", ["matCheckbox"], { "disableRipple": { "alias": "disableRipple"; "required": false; }; "color": { "alias": "color"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "id": { "alias": "id"; "required": false; }; "required": { "alias": "required"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "name": { "alias": "name"; "required": false; }; "value": { "alias": "value"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "indeterminate": { "alias": "indeterminate"; "required": false; }; }, { "change": "change"; "indeterminateChange": "indeterminateChange"; }, never, ["*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatCheckboxBase<any>, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatCheckbox, [null, null, null, { attribute: "tabindex"; }, { optional: true; }, { optional: true; }]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/core.md b/tools/public_api_guard/material/core.md
index 4844f95ca2f0..880c0f6d8177 100644
--- a/tools/public_api_guard/material/core.md
+++ b/tools/public_api_guard/material/core.md
@@ -240,37 +240,20 @@ export class MatNativeDateModule {
 }
 
 // @public
-export class MatOptgroup extends _MatOptgroupBase {
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatOptgroup, "mat-optgroup", ["matOptgroup"], { "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, ["*", "mat-option, ng-container"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatOptgroup, never>;
-}
-
-// @public (undocumented)
-export class _MatOptgroupBase extends _MatOptgroupMixinBase implements CanDisable {
+export class MatOptgroup extends _MatOptgroupMixinBase implements CanDisable {
     constructor(parent?: MatOptionParentComponent);
     _inert: boolean;
     label: string;
     _labelId: string;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatOptgroupBase, never, never, { "label": { "alias": "label"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatOptgroup, "mat-optgroup", ["matOptgroup"], { "disabled": { "alias": "disabled"; "required": false; }; "label": { "alias": "label"; "required": false; }; }, {}, never, ["*", "mat-option, ng-container"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatOptgroupBase, [{ optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatOptgroup, [{ optional: true; }]>;
 }
 
 // @public
-export class MatOption<T = any> extends _MatOptionBase<T> {
-    constructor(element: ElementRef<HTMLElement>, changeDetectorRef: ChangeDetectorRef, parent: MatOptionParentComponent, group: MatOptgroup);
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatOption<any>, "mat-option", ["matOption"], {}, {}, never, ["mat-icon", "*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatOption<any>, [null, null, { optional: true; }, { optional: true; }]>;
-}
-
-// @public (undocumented)
-export class _MatOptionBase<T = any> implements FocusableOption, AfterViewChecked, OnDestroy {
-    constructor(_element: ElementRef<HTMLElement>, _changeDetectorRef: ChangeDetectorRef, _parent: MatOptionParentComponent, group: _MatOptgroupBase);
+export class MatOption<T = any> implements FocusableOption, AfterViewChecked, OnDestroy {
+    constructor(_element: ElementRef<HTMLElement>, _changeDetectorRef: ChangeDetectorRef, _parent: MatOptionParentComponent, group: MatOptgroup);
     get active(): boolean;
     // (undocumented)
     _changeDetectorRef: ChangeDetectorRef;
@@ -283,7 +266,7 @@ export class _MatOptionBase<T = any> implements FocusableOption, AfterViewChecke
     getLabel(): string;
     _getTabIndex(): string;
     // (undocumented)
-    readonly group: _MatOptgroupBase;
+    group: MatOptgroup;
     _handleKeydown(event: KeyboardEvent): void;
     get hideSingleSelectionIndicator(): boolean;
     id: string;
@@ -303,9 +286,9 @@ export class _MatOptionBase<T = any> implements FocusableOption, AfterViewChecke
     value: T;
     get viewValue(): string;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatOptionBase<any>, never, never, { "value": { "alias": "value"; "required": false; }; "id": { "alias": "id"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "onSelectionChange": "onSelectionChange"; }, never, never, 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", "*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatOptionBase<any>, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatOption<any>, [null, null, { optional: true; }, { optional: true; }]>;
 }
 
 // @public (undocumented)
@@ -333,10 +316,10 @@ export interface MatOptionParentComponent {
 // @public
 export class MatOptionSelectionChange<T = any> {
     constructor(
-    source: _MatOptionBase<T>,
+    source: MatOption<T>,
     isUserInput?: boolean);
     isUserInput: boolean;
-    source: _MatOptionBase<T>;
+    source: MatOption<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/dialog-testing.md b/tools/public_api_guard/material/dialog-testing.md
index e9fd4144e519..b9487e71534b 100644
--- a/tools/public_api_guard/material/dialog-testing.md
+++ b/tools/public_api_guard/material/dialog-testing.md
@@ -12,10 +12,7 @@ import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { DialogRole } from '@angular/material/dialog';
 import { HarnessPredicate } from '@angular/cdk/testing';
 import { MatDialog } from '@angular/material/dialog';
-import { _MatDialogBase } from '@angular/material/dialog';
 import { MatDialogConfig } from '@angular/material/dialog';
-import { MatDialogContainer } from '@angular/material/dialog';
-import { _MatDialogContainerBase } from '@angular/material/dialog';
 import { MatDialogRef } from '@angular/material/dialog';
 import { OnDestroy } from '@angular/core';
 import { TestElement } from '@angular/cdk/testing';
@@ -25,13 +22,7 @@ export interface DialogHarnessFilters extends BaseHarnessFilters {
 }
 
 // @public
-export class MatDialogHarness extends _MatDialogHarnessBase {
-    static hostSelector: string;
-    static with<T extends MatDialogHarness>(this: ComponentHarnessConstructor<T>, options?: DialogHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public
-export class _MatDialogHarnessBase extends ContentContainerComponentHarness<MatDialogSection | string> {
+export class MatDialogHarness extends ContentContainerComponentHarness<MatDialogSection | string> {
     // (undocumented)
     protected _actions: AsyncFactoryFn<TestElement | null>;
     close(): Promise<void>;
@@ -46,8 +37,10 @@ export class _MatDialogHarnessBase extends ContentContainerComponentHarness<MatD
     getRole(): Promise<DialogRole | null>;
     getText(): Promise<string>;
     getTitleText(): Promise<string>;
+    static hostSelector: string;
     // (undocumented)
     protected _title: AsyncFactoryFn<TestElement | null>;
+    static with<T extends MatDialogHarness>(this: ComponentHarnessConstructor<T>, options?: DialogHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
@@ -61,22 +54,17 @@ export const enum MatDialogSection {
 }
 
 // @public
-export class MatTestDialogOpener<T = unknown, R = unknown> extends _MatTestDialogOpenerBase<MatDialogContainer, T, R> {
+export class MatTestDialogOpener<T, R> implements OnDestroy {
     constructor(dialog: MatDialog);
-    static withComponent<T = unknown, R = unknown>(component: ComponentType<T>, config?: MatDialogConfig): ComponentType<MatTestDialogOpener<T, R>>;
-}
-
-// @public
-export class _MatTestDialogOpenerBase<C extends _MatDialogContainerBase, T, R> implements OnDestroy {
-    constructor(dialog: _MatDialogBase<C>);
     closedResult: R | undefined;
     protected static component: ComponentType<unknown> | undefined;
     protected static config: MatDialogConfig | undefined;
     // (undocumented)
-    dialog: _MatDialogBase<C>;
+    dialog: MatDialog;
     dialogRef: MatDialogRef<T, R>;
     // (undocumented)
     ngOnDestroy(): void;
+    static withComponent<T = unknown, R = unknown>(component: ComponentType<T>, config?: MatDialogConfig): ComponentType<MatTestDialogOpener<T, R>>;
 }
 
 // @public (undocumented)
diff --git a/tools/public_api_guard/material/dialog.md b/tools/public_api_guard/material/dialog.md
index e6900371e87b..c459d3eb63dc 100644
--- a/tools/public_api_guard/material/dialog.md
+++ b/tools/public_api_guard/material/dialog.md
@@ -37,7 +37,6 @@ import { ScrollStrategy } from '@angular/cdk/overlay';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
 import { TemplateRef } from '@angular/core';
-import { Type } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
 
 // @public
@@ -74,9 +73,6 @@ export const MAT_DIALOG_DEFAULT_OPTIONS: InjectionToken<MatDialogConfig<any>>;
 // @public
 export const MAT_DIALOG_SCROLL_STRATEGY: InjectionToken<() => ScrollStrategy>;
 
-// @public
-export function MAT_DIALOG_SCROLL_STRATEGY_FACTORY(overlay: Overlay): () => ScrollStrategy;
-
 // @public
 export const MAT_DIALOG_SCROLL_STRATEGY_PROVIDER: {
     provide: InjectionToken<() => ScrollStrategy>;
@@ -88,11 +84,24 @@ export const MAT_DIALOG_SCROLL_STRATEGY_PROVIDER: {
 export function MAT_DIALOG_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay): () => ScrollStrategy;
 
 // @public
-export class MatDialog extends _MatDialogBase<MatDialogContainer> {
-    constructor(overlay: Overlay, injector: Injector,
-    location: Location_2, defaultOptions: MatDialogConfig, scrollStrategy: any, parentDialog: MatDialog,
-    overlayContainer: OverlayContainer,
-    animationMode?: 'NoopAnimations' | 'BrowserAnimations');
+export class MatDialog implements OnDestroy {
+    constructor(_overlay: Overlay, injector: Injector,
+    location: Location_2, _defaultOptions: MatDialogConfig, _scrollStrategy: any, _parentDialog: MatDialog,
+    _overlayContainer: OverlayContainer,
+    _animationMode?: 'NoopAnimations' | 'BrowserAnimations');
+    readonly afterAllClosed: Observable<void>;
+    get afterOpened(): Subject<MatDialogRef<any>>;
+    closeAll(): void;
+    // (undocumented)
+    protected dialogConfigClass: typeof MatDialogConfig;
+    getDialogById(id: string): MatDialogRef<any> | undefined;
+    // (undocumented)
+    ngOnDestroy(): void;
+    open<T, D = any, R = any>(component: ComponentType<T>, config?: MatDialogConfig<D>): MatDialogRef<T, R>;
+    open<T, D = any, R = any>(template: TemplateRef<T>, config?: MatDialogConfig<D>): MatDialogRef<T, R>;
+    // (undocumented)
+    open<T, D = any, R = any>(template: ComponentType<T> | TemplateRef<T>, config?: MatDialogConfig<D>): MatDialogRef<T, R>;
+    get openDialogs(): MatDialogRef<any>[];
     // (undocumented)
     static ɵfac: i0.ɵɵFactoryDeclaration<MatDialog, [null, null, { optional: true; }, { optional: true; }, null, { optional: true; skipSelf: true; }, null, { optional: true; }]>;
     // (undocumented)
@@ -113,32 +122,6 @@ export const matDialogAnimations: {
     readonly dialogContainer: AnimationTriggerMetadata;
 };
 
-// @public
-export abstract class _MatDialogBase<C extends _MatDialogContainerBase> implements OnDestroy {
-    constructor(_overlay: Overlay, injector: Injector, _defaultOptions: MatDialogConfig | undefined, _parentDialog: _MatDialogBase<C> | undefined,
-    _overlayContainer: OverlayContainer, scrollStrategy: any, _dialogRefConstructor: Type<MatDialogRef<any>>, _dialogContainerType: Type<C>, _dialogDataToken: InjectionToken<any>,
-    _animationMode?: 'NoopAnimations' | 'BrowserAnimations');
-    readonly afterAllClosed: Observable<void>;
-    get afterOpened(): Subject<MatDialogRef<any>>;
-    closeAll(): void;
-    // (undocumented)
-    protected dialogConfigClass: typeof MatDialogConfig;
-    getDialogById(id: string): MatDialogRef<any> | undefined;
-    // (undocumented)
-    protected _idPrefix: string;
-    // (undocumented)
-    ngOnDestroy(): void;
-    open<T, D = any, R = any>(component: ComponentType<T>, config?: MatDialogConfig<D>): MatDialogRef<T, R>;
-    open<T, D = any, R = any>(template: TemplateRef<T>, config?: MatDialogConfig<D>): MatDialogRef<T, R>;
-    // (undocumented)
-    open<T, D = any, R = any>(template: ComponentType<T> | TemplateRef<T>, config?: MatDialogConfig<D>): MatDialogRef<T, R>;
-    get openDialogs(): MatDialogRef<any>[];
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatDialogBase<any>, never>;
-    // (undocumented)
-    static ɵprov: i0.ɵɵInjectableDeclaration<_MatDialogBase<any>>;
-}
-
 // @public
 export class MatDialogClose implements OnInit, OnChanges {
     constructor(dialogRef: MatDialogRef<any>, _elementRef: ElementRef<HTMLElement>, _dialog: MatDialog);
@@ -194,14 +177,18 @@ export class MatDialogConfig<D = any> {
     width?: string;
 }
 
-// @public
-export class MatDialogContainer extends _MatDialogContainerBase implements OnDestroy {
-    constructor(elementRef: ElementRef, focusTrapFactory: FocusTrapFactory, document: any, dialogConfig: MatDialogConfig, checker: InteractivityChecker, ngZone: NgZone, overlayRef: OverlayRef, _animationMode?: string | undefined, focusMonitor?: FocusMonitor);
+// @public (undocumented)
+export class MatDialogContainer extends CdkDialogContainer<MatDialogConfig> implements OnDestroy {
+    constructor(elementRef: ElementRef, focusTrapFactory: FocusTrapFactory, _document: any, dialogConfig: MatDialogConfig, interactivityChecker: InteractivityChecker, ngZone: NgZone, overlayRef: OverlayRef, _animationMode?: string | undefined, focusMonitor?: FocusMonitor);
     _animationsEnabled: boolean;
+    _animationStateChanged: EventEmitter<LegacyDialogAnimationEvent>;
+    // (undocumented)
+    protected _captureInitialFocus(): void;
     // (undocumented)
     protected _contentAttached(): void;
     // (undocumented)
     ngOnDestroy(): void;
+    protected _openAnimationDone(totalTime: number): void;
     _startExitAnimation(): void;
     // (undocumented)
     static ɵcmp: i0.ɵɵComponentDeclaration<MatDialogContainer, "mat-dialog-container", never, {}, {}, never, never, false, never>;
@@ -209,20 +196,6 @@ export class MatDialogContainer extends _MatDialogContainerBase implements OnDes
     static ɵfac: i0.ɵɵFactoryDeclaration<MatDialogContainer, [null, null, { optional: true; }, null, null, null, null, { optional: true; }, null]>;
 }
 
-// @public
-export abstract class _MatDialogContainerBase extends CdkDialogContainer<MatDialogConfig> {
-    constructor(elementRef: ElementRef, focusTrapFactory: FocusTrapFactory, _document: any, dialogConfig: MatDialogConfig, interactivityChecker: InteractivityChecker, ngZone: NgZone, overlayRef: OverlayRef, focusMonitor?: FocusMonitor);
-    _animationStateChanged: EventEmitter<LegacyDialogAnimationEvent>;
-    // (undocumented)
-    protected _captureInitialFocus(): void;
-    protected _openAnimationDone(totalTime: number): void;
-    abstract _startExitAnimation(): void;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<_MatDialogContainerBase, "ng-component", never, {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatDialogContainerBase, [null, null, { optional: true; }, null, null, null, null, null]>;
-}
-
 // @public
 export class MatDialogContent {
     // (undocumented)
@@ -243,7 +216,7 @@ export class MatDialogModule {
 
 // @public
 export class MatDialogRef<T, R = any> {
-    constructor(_ref: DialogRef<R, T>, config: MatDialogConfig, _containerInstance: _MatDialogContainerBase);
+    constructor(_ref: DialogRef<R, T>, config: MatDialogConfig, _containerInstance: MatDialogContainer);
     addPanelClass(classes: string | string[]): this;
     afterClosed(): Observable<R | undefined>;
     afterOpened(): Observable<void>;
@@ -253,7 +226,7 @@ export class MatDialogRef<T, R = any> {
     componentInstance: T;
     readonly componentRef: ComponentRef<T> | null;
     // (undocumented)
-    _containerInstance: _MatDialogContainerBase;
+    _containerInstance: MatDialogContainer;
     disableClose: boolean | undefined;
     getState(): MatDialogState;
     id: string;
diff --git a/tools/public_api_guard/material/form-field-testing.md b/tools/public_api_guard/material/form-field-testing.md
index 63bc03460e3c..5b5ce6dd5c17 100644
--- a/tools/public_api_guard/material/form-field-testing.md
+++ b/tools/public_api_guard/material/form-field-testing.md
@@ -4,7 +4,6 @@
 
 ```ts
 
-import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
@@ -14,7 +13,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';
 
 // @public
 export interface ErrorHarnessFilters extends BaseHarnessFilters {
@@ -32,61 +30,21 @@ export interface FormFieldHarnessFilters extends BaseHarnessFilters {
 }
 
 // @public
-export class MatErrorHarness extends _MatErrorHarnessBase {
-    // (undocumented)
-    static hostSelector: string;
-    static with<T extends MatErrorHarness>(this: ComponentHarnessConstructor<T>, options?: ErrorHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatErrorHarnessBase extends ComponentHarness {
+export class MatErrorHarness extends ComponentHarness {
     // (undocumented)
     protected static _getErrorPredicate<T extends MatErrorHarness>(type: ComponentHarnessConstructor<T>, options: ErrorHarnessFilters): HarnessPredicate<T>;
     getText(): Promise<string>;
-}
-
-export { MatFormFieldControlHarness }
-
-// @public
-export class MatFormFieldHarness extends _MatFormFieldHarnessBase<FormFieldControlHarness, typeof MatErrorHarness> {
-    // (undocumented)
-    protected _datepickerInputControl: AsyncFactoryFn<MatDatepickerInputHarness | null>;
-    // (undocumented)
-    protected _dateRangeInputControl: AsyncFactoryFn<MatDateRangeInputHarness | null>;
-    // (undocumented)
-    protected _errorHarness: typeof MatErrorHarness;
-    getAppearance(): Promise<'fill' | 'outline'>;
-    hasLabel(): Promise<boolean>;
-    // (undocumented)
-    protected _hints: AsyncFactoryFn<TestElement[]>;
     // (undocumented)
     static hostSelector: string;
-    // (undocumented)
-    protected _inputControl: AsyncFactoryFn<MatInputHarness | null>;
-    isLabelFloating(): Promise<boolean>;
-    // (undocumented)
-    protected _label: AsyncFactoryFn<TestElement | null>;
-    // (undocumented)
-    protected _prefixContainer: AsyncFactoryFn<TestElement | null>;
-    // (undocumented)
-    protected _selectControl: AsyncFactoryFn<MatSelectHarness | null>;
-    // (undocumented)
-    protected _suffixContainer: AsyncFactoryFn<TestElement | null>;
-    static with<T extends MatFormFieldHarness>(this: ComponentHarnessConstructor<T>, options?: FormFieldHarnessFilters): HarnessPredicate<T>;
+    static with<T extends MatErrorHarness>(this: ComponentHarnessConstructor<T>, options?: ErrorHarnessFilters): HarnessPredicate<T>;
 }
 
+export { MatFormFieldControlHarness }
+
 // @public (undocumented)
-export abstract class _MatFormFieldHarnessBase<ControlHarness extends MatFormFieldControlHarness, ErrorType extends ComponentHarnessConstructor<ErrorBase> & {
-    with: (options?: ErrorHarnessFilters) => HarnessPredicate<ErrorBase>;
-}> extends ComponentHarness {
-    // (undocumented)
-    protected abstract _datepickerInputControl: AsyncFactoryFn<ControlHarness | null>;
-    // (undocumented)
-    protected abstract _dateRangeInputControl: AsyncFactoryFn<ControlHarness | null>;
-    // (undocumented)
-    protected abstract _errorHarness: ErrorType;
-    abstract getAppearance(): Promise<string>;
-    getControl(): Promise<ControlHarness | null>;
+export class MatFormFieldHarness extends ComponentHarness {
+    getAppearance(): Promise<'fill' | 'outline'>;
+    getControl(): Promise<FormFieldControlHarness | null>;
     getControl<X extends MatFormFieldControlHarness>(type: ComponentHarnessConstructor<X>): Promise<X | null>;
     getControl<X extends MatFormFieldControlHarness>(type: HarnessPredicate<X>): Promise<X | null>;
     getErrors(filter?: ErrorHarnessFilters): Promise<MatErrorHarness[]>;
@@ -97,26 +55,17 @@ export abstract class _MatFormFieldHarnessBase<ControlHarness extends MatFormFie
     getTextHints(): Promise<string[]>;
     getThemeColor(): Promise<'primary' | 'accent' | 'warn'>;
     hasErrors(): Promise<boolean>;
-    abstract hasLabel(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _hints: AsyncFactoryFn<TestElement[]>;
+    hasLabel(): Promise<boolean>;
     // (undocumented)
-    protected abstract _inputControl: AsyncFactoryFn<ControlHarness | null>;
+    static hostSelector: string;
     isAutofilled(): Promise<boolean>;
     isControlDirty(): Promise<boolean | null>;
     isControlPending(): Promise<boolean | null>;
     isControlTouched(): Promise<boolean | null>;
     isControlValid(): Promise<boolean | null>;
     isDisabled(): Promise<boolean>;
-    abstract isLabelFloating(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _label: AsyncFactoryFn<TestElement | null>;
-    // (undocumented)
-    protected abstract _prefixContainer: AsyncFactoryFn<TestElement | null>;
-    // (undocumented)
-    protected abstract _selectControl: AsyncFactoryFn<ControlHarness | null>;
-    // (undocumented)
-    protected abstract _suffixContainer: AsyncFactoryFn<TestElement | null>;
+    isLabelFloating(): Promise<boolean>;
+    static with<T extends MatFormFieldHarness>(this: ComponentHarnessConstructor<T>, options?: FormFieldHarnessFilters): HarnessPredicate<T>;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/tools/public_api_guard/material/menu-testing.md b/tools/public_api_guard/material/menu-testing.md
index 71a2bdb5f018..1960e5499203 100644
--- a/tools/public_api_guard/material/menu-testing.md
+++ b/tools/public_api_guard/material/menu-testing.md
@@ -5,63 +5,41 @@
 ```ts
 
 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';
 
 // @public
-export class MatMenuHarness extends _MatMenuHarnessBase<typeof MatMenuItemHarness, MatMenuItemHarness, MenuItemHarnessFilters> {
-    static hostSelector: string;
-    // (undocumented)
-    protected _itemClass: typeof MatMenuItemHarness;
-    static with<T extends MatMenuHarness>(this: ComponentHarnessConstructor<T>, options?: MenuHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export 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> {
+export class MatMenuHarness extends ContentContainerComponentHarness<string> {
     blur(): Promise<void>;
-    clickItem(itemFilter: Omit<ItemFilters, 'ancestor'>, ...subItemFilters: Omit<ItemFilters, 'ancestor'>[]): Promise<void>;
+    clickItem(itemFilter: Omit<MenuItemHarnessFilters, 'ancestor'>, ...subItemFilters: Omit<MenuItemHarnessFilters, 'ancestor'>[]): Promise<void>;
     close(): Promise<void>;
     focus(): Promise<void>;
-    getItems(filters?: Omit<ItemFilters, 'ancestor'>): Promise<Item[]>;
+    getItems(filters?: Omit<MenuItemHarnessFilters, 'ancestor'>): Promise<MatMenuItemHarness[]>;
     // (undocumented)
     protected getRootHarnessLoader(): Promise<HarnessLoader>;
     getTriggerText(): Promise<string>;
+    static hostSelector: string;
     isDisabled(): Promise<boolean>;
     isFocused(): Promise<boolean>;
     isOpen(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _itemClass: ItemType;
     open(): Promise<void>;
-}
-
-// @public
-export class MatMenuItemHarness extends _MatMenuItemHarnessBase<typeof MatMenuHarness, MatMenuHarness> {
-    static hostSelector: string;
-    // (undocumented)
-    protected _menuClass: typeof MatMenuHarness;
-    static with<T extends MatMenuItemHarness>(this: ComponentHarnessConstructor<T>, options?: MenuItemHarnessFilters): HarnessPredicate<T>;
+    static with<T extends MatMenuHarness>(this: ComponentHarnessConstructor<T>, options?: MenuHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public (undocumented)
-export abstract class _MatMenuItemHarnessBase<MenuType extends ComponentHarnessConstructor<Menu>, Menu extends ComponentHarness> extends ContentContainerComponentHarness<string> {
+export class MatMenuItemHarness extends ContentContainerComponentHarness<string> {
     blur(): Promise<void>;
     click(): Promise<void>;
     focus(): Promise<void>;
-    getSubmenu(): Promise<Menu | null>;
+    getSubmenu(): Promise<MatMenuHarness | null>;
     getText(): Promise<string>;
     hasSubmenu(): Promise<boolean>;
+    static hostSelector: string;
     isDisabled(): Promise<boolean>;
     isFocused(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _menuClass: MenuType;
+    static with<T extends MatMenuItemHarness>(this: ComponentHarnessConstructor<T>, options?: MenuItemHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/menu.md b/tools/public_api_guard/material/menu.md
index 9c0b5bdbf9b3..1f5162c528eb 100644
--- a/tools/public_api_guard/material/menu.md
+++ b/tools/public_api_guard/material/menu.md
@@ -64,26 +64,7 @@ export const MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER: {
 };
 
 // @public (undocumented)
-export class MatMenu extends _MatMenuBase {
-    constructor(elementRef: ElementRef<HTMLElement>, ngZone: NgZone, defaultOptions: MatMenuDefaultOptions);
-    // (undocumented)
-    protected _baseElevation: number;
-    // (undocumented)
-    protected _elevationPrefix: string;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatMenu, "mat-menu", ["matMenu"], {}, {}, never, ["*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenu, never>;
-}
-
-// @public
-export const matMenuAnimations: {
-    readonly transformMenu: AnimationTriggerMetadata;
-    readonly fadeInItems: AnimationTriggerMetadata;
-};
-
-// @public
-export class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatMenuItem>, OnInit, OnDestroy {
+export class MatMenu implements AfterContentInit, MatMenuPanel<MatMenuItem>, OnInit, OnDestroy {
     constructor(elementRef: ElementRef<HTMLElement>, ngZone: NgZone, defaultOptions: MatMenuDefaultOptions, changeDetectorRef: ChangeDetectorRef);
     // @deprecated
     constructor(elementRef: ElementRef<HTMLElement>, ngZone: NgZone, defaultOptions: MatMenuDefaultOptions, changeDetectorRef?: ChangeDetectorRef);
@@ -95,8 +76,6 @@ export class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatMenuItem>
     ariaLabel: string;
     ariaLabelledby: string;
     backdropClass: string;
-    // (undocumented)
-    protected _baseElevation: number;
     // @deprecated
     get classList(): string;
     set classList(classes: string);
@@ -108,8 +87,6 @@ export class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatMenuItem>
     readonly closed: EventEmitter<MenuCloseReason>;
     _directDescendantItems: QueryList<MatMenuItem>;
     direction: Direction;
-    // (undocumented)
-    protected _elevationPrefix: string;
     focusFirstItem(origin?: FocusOrigin): void;
     _handleKeydown(event: KeyboardEvent): void;
     get hasBackdrop(): boolean | undefined;
@@ -149,21 +126,19 @@ export class _MatMenuBase implements AfterContentInit, MatMenuPanel<MatMenuItem>
     get yPosition(): MenuPositionY;
     set yPosition(value: MenuPositionY);
     // (undocumented)
-    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 ɵ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>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatMenuBase, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenu, never>;
 }
 
 // @public
-export class MatMenuContent extends _MatMenuContentBase {
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatMenuContent, "ng-template[matMenuContent]", never, {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuContent, never>;
-}
+export const matMenuAnimations: {
+    readonly transformMenu: AnimationTriggerMetadata;
+    readonly fadeInItems: AnimationTriggerMetadata;
+};
 
-// @public (undocumented)
-export abstract class _MatMenuContentBase implements OnDestroy {
+// @public
+export class MatMenuContent implements OnDestroy {
     constructor(template: TemplateRef<any>, componentFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector, viewContainerRef: ViewContainerRef, document: any, changeDetectorRef: ChangeDetectorRef);
     // @deprecated
     constructor(template: TemplateRef<any>, componentFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector, viewContainerRef: ViewContainerRef, document: any, changeDetectorRef?: ChangeDetectorRef);
@@ -173,9 +148,9 @@ export abstract class _MatMenuContentBase implements OnDestroy {
     // (undocumented)
     ngOnDestroy(): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatMenuContentBase, never, never, {}, {}, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatMenuContent, "ng-template[matMenuContent]", never, {}, {}, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatMenuContentBase, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuContent, never>;
 }
 
 // @public
@@ -273,15 +248,7 @@ export interface MatMenuPanel<T = any> {
 }
 
 // @public
-export class MatMenuTrigger extends _MatMenuTriggerBase {
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatMenuTrigger, "[mat-menu-trigger-for], [matMenuTriggerFor]", ["matMenuTrigger"], {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuTrigger, never>;
-}
-
-// @public (undocumented)
-export abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy {
+export class MatMenuTrigger implements AfterContentInit, OnDestroy {
     constructor(overlay: Overlay, element: ElementRef<HTMLElement>, viewContainerRef: ViewContainerRef, scrollStrategy: any, parentMenu: MatMenuPanel, menuItemInstance: MatMenuItem, dir: Directionality, focusMonitor: FocusMonitor, ngZone: NgZone);
     // @deprecated
     constructor(overlay: Overlay, element: ElementRef<HTMLElement>, viewContainerRef: ViewContainerRef, scrollStrategy: any, parentMenu: MatMenuPanel, menuItemInstance: MatMenuItem, dir: Directionality, focusMonitor?: FocusMonitor | null);
@@ -318,9 +285,9 @@ export abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy
     triggersSubmenu(): boolean;
     updatePosition(): void;
     // (undocumented)
-    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 ɵ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>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatMenuTriggerBase, [null, null, null, null, { optional: true; }, { optional: true; self: true; }, { optional: true; }, null, null]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuTrigger, [null, null, null, null, { optional: true; }, { optional: true; self: true; }, { optional: true; }, null, null]>;
 }
 
 // @public @deprecated
diff --git a/tools/public_api_guard/material/paginator-testing.md b/tools/public_api_guard/material/paginator-testing.md
index 3269ddffd70e..928f6e3fea75 100644
--- a/tools/public_api_guard/material/paginator-testing.md
+++ b/tools/public_api_guard/material/paginator-testing.md
@@ -4,63 +4,25 @@
 
 ```ts
 
-import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatSelectHarness } from '@angular/material/select/testing';
-import { TestElement } from '@angular/cdk/testing';
 
 // @public
-export class MatPaginatorHarness extends _MatPaginatorHarnessBase {
-    // (undocumented)
-    protected _firstPageButton: AsyncFactoryFn<TestElement | null>;
-    static hostSelector: string;
-    // (undocumented)
-    protected _lastPageButton: AsyncFactoryFn<TestElement | null>;
-    // (undocumented)
-    protected _nextButton: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected _pageSizeFallback: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected _previousButton: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected _rangeLabel: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected _select: AsyncFactoryFn<MatSelectHarness | null>;
-    static with<T extends MatPaginatorHarness>(this: ComponentHarnessConstructor<T>, options?: PaginatorHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatPaginatorHarnessBase extends ComponentHarness {
-    // (undocumented)
-    protected abstract _firstPageButton: AsyncFactoryFn<TestElement | null>;
+export class MatPaginatorHarness extends ComponentHarness {
     getPageSize(): Promise<number>;
     getRangeLabel(): Promise<string>;
     goToFirstPage(): Promise<void>;
     goToLastPage(): Promise<void>;
     goToNextPage(): Promise<void>;
     goToPreviousPage(): Promise<void>;
+    static hostSelector: string;
     isNextPageDisabled(): Promise<boolean>;
     // (undocumented)
     isPreviousPageDisabled(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _lastPageButton: AsyncFactoryFn<TestElement | null>;
-    // (undocumented)
-    protected abstract _nextButton: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected abstract _pageSizeFallback: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected abstract _previousButton: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected abstract _rangeLabel: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    protected abstract _select: AsyncFactoryFn<(ComponentHarness & {
-        getValueText(): Promise<string>;
-        clickOptions(...filters: unknown[]): Promise<void>;
-    }) | null>;
     setPageSize(size: number): Promise<void>;
+    static with<T extends MatPaginatorHarness>(this: ComponentHarnessConstructor<T>, options?: PaginatorHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/paginator.md b/tools/public_api_guard/material/paginator.md
index 2959e73d2760..7e161bbe7dee 100644
--- a/tools/public_api_guard/material/paginator.md
+++ b/tools/public_api_guard/material/paginator.md
@@ -39,28 +39,13 @@ export const MAT_PAGINATOR_INTL_PROVIDER: {
 export function MAT_PAGINATOR_INTL_PROVIDER_FACTORY(parentIntl: MatPaginatorIntl): MatPaginatorIntl;
 
 // @public
-export class MatPaginator extends _MatPaginatorBase<MatPaginatorDefaultOptions> {
-    constructor(intl: MatPaginatorIntl, changeDetectorRef: ChangeDetectorRef, defaults?: MatPaginatorDefaultOptions);
-    _formFieldAppearance?: MatFormFieldAppearance;
-    readonly _pageSizeLabelId: string;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatPaginator, "mat-paginator", ["matPaginator"], { "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatPaginator, [null, null, { optional: true; }]>;
-}
-
-// @public
-export abstract class _MatPaginatorBase<O extends {
-    pageSize?: number;
-    pageSizeOptions?: number[];
-    hidePageSize?: boolean;
-    showFirstLastButtons?: boolean;
-}> extends _MatPaginatorMixinBase implements OnInit, OnDestroy, CanDisable, HasInitialized {
-    constructor(_intl: MatPaginatorIntl, _changeDetectorRef: ChangeDetectorRef, defaults?: O);
+export class MatPaginator extends _MatPaginatorMixinBase implements OnInit, OnDestroy, CanDisable, HasInitialized {
+    constructor(_intl: MatPaginatorIntl, _changeDetectorRef: ChangeDetectorRef, defaults?: MatPaginatorDefaultOptions);
     _changePageSize(pageSize: number): void;
     color: ThemePalette;
     _displayedPageSizeOptions: number[];
     firstPage(): void;
+    _formFieldAppearance?: MatFormFieldAppearance;
     getNumberOfPages(): number;
     hasNextPage(): boolean;
     hasPreviousPage(): boolean;
@@ -82,6 +67,7 @@ export abstract class _MatPaginatorBase<O extends {
     set pageIndex(value: NumberInput);
     get pageSize(): number;
     set pageSize(value: NumberInput);
+    readonly _pageSizeLabelId: string;
     get pageSizeOptions(): number[];
     set pageSizeOptions(value: number[] | readonly number[]);
     _previousButtonsDisabled(): boolean;
@@ -90,9 +76,9 @@ export abstract class _MatPaginatorBase<O extends {
     get showFirstLastButtons(): boolean;
     set showFirstLastButtons(value: BooleanInput);
     // (undocumented)
-    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 ɵ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>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatPaginatorBase<any>, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatPaginator, [null, null, { optional: true; }]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/radio-testing.md b/tools/public_api_guard/material/radio-testing.md
index cf6790d76a91..bf688b3381fd 100644
--- a/tools/public_api_guard/material/radio-testing.md
+++ b/tools/public_api_guard/material/radio-testing.md
@@ -12,60 +12,37 @@ import { HarnessPredicate } from '@angular/cdk/testing';
 import { TestElement } from '@angular/cdk/testing';
 
 // @public
-export class MatRadioButtonHarness extends _MatRadioButtonHarnessBase {
-    // (undocumented)
-    protected _clickLabel: AsyncFactoryFn<TestElement>;
-    static hostSelector: string;
-    // (undocumented)
-    protected _textLabel: AsyncFactoryFn<TestElement>;
-    static with<T extends MatRadioButtonHarness>(this: ComponentHarnessConstructor<T>, options?: RadioButtonHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatRadioButtonHarnessBase extends ComponentHarness {
+export class MatRadioButtonHarness extends ComponentHarness {
     blur(): Promise<void>;
     check(): Promise<void>;
     // (undocumented)
-    protected abstract _clickLabel: AsyncFactoryFn<TestElement>;
+    protected _clickLabel: AsyncFactoryFn<TestElement>;
     focus(): Promise<void>;
     getId(): Promise<string | null>;
     getLabelText(): Promise<string>;
     getName(): Promise<string | null>;
     getValue(): Promise<string | null>;
+    static hostSelector: string;
     isChecked(): Promise<boolean>;
     isDisabled(): Promise<boolean>;
     isFocused(): Promise<boolean>;
     isRequired(): Promise<boolean>;
     // (undocumented)
-    protected abstract _textLabel: AsyncFactoryFn<TestElement>;
+    protected _textLabel: AsyncFactoryFn<TestElement>;
+    static with<T extends MatRadioButtonHarness>(this: ComponentHarnessConstructor<T>, options?: RadioButtonHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
-export class MatRadioGroupHarness extends _MatRadioGroupHarnessBase<typeof MatRadioButtonHarness, MatRadioButtonHarness, RadioButtonHarnessFilters> {
-    // (undocumented)
-    protected _buttonClass: typeof MatRadioButtonHarness;
-    static hostSelector: string;
-    static with<T extends MatRadioGroupHarness>(this: ComponentHarnessConstructor<T>, options?: RadioGroupHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatRadioGroupHarnessBase<ButtonType extends ComponentHarnessConstructor<Button> & {
-    with: (options?: ButtonFilters) => HarnessPredicate<Button>;
-}, Button extends ComponentHarness & {
-    isChecked(): Promise<boolean>;
-    getValue(): Promise<string | null>;
-    getName(): Promise<string | null>;
-    check(): Promise<void>;
-}, ButtonFilters extends BaseHarnessFilters> extends ComponentHarness {
-    // (undocumented)
-    protected abstract _buttonClass: ButtonType;
-    checkRadioButton(filter?: ButtonFilters): Promise<void>;
-    protected static _checkRadioGroupName(harness: _MatRadioGroupHarnessBase<any, any, any>, name: string): Promise<boolean>;
-    getCheckedRadioButton(): Promise<Button | null>;
+export class MatRadioGroupHarness extends ComponentHarness {
+    checkRadioButton(filter?: RadioButtonHarnessFilters): Promise<void>;
+    protected static _checkRadioGroupName(harness: MatRadioGroupHarness, name: string): Promise<boolean>;
+    getCheckedRadioButton(): Promise<MatRadioButtonHarness | null>;
     getCheckedValue(): Promise<string | null>;
     getId(): Promise<string | null>;
     getName(): Promise<string | null>;
-    getRadioButtons(filter?: ButtonFilters): Promise<Button[]>;
+    getRadioButtons(filter?: RadioButtonHarnessFilters): Promise<MatRadioButtonHarness[]>;
+    static hostSelector: string;
+    static with<T extends MatRadioGroupHarness>(this: ComponentHarnessConstructor<T>, options?: RadioGroupHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/radio.md b/tools/public_api_guard/material/radio.md
index 5eade5af5fb8..d5d1d1060378 100644
--- a/tools/public_api_guard/material/radio.md
+++ b/tools/public_api_guard/material/radio.md
@@ -35,29 +35,18 @@ export const MAT_RADIO_DEFAULT_OPTIONS: InjectionToken<MatRadioDefaultOptions>;
 export function MAT_RADIO_DEFAULT_OPTIONS_FACTORY(): MatRadioDefaultOptions;
 
 // @public
-export const MAT_RADIO_GROUP: InjectionToken<_MatRadioGroupBase<_MatRadioButtonBase>>;
+export const MAT_RADIO_GROUP: InjectionToken<MatRadioGroup>;
 
 // @public
 export const MAT_RADIO_GROUP_CONTROL_VALUE_ACCESSOR: any;
 
 // @public (undocumented)
-export class MatRadioButton extends _MatRadioButtonBase {
-    constructor(radioGroup: MatRadioGroup, elementRef: ElementRef, _changeDetector: ChangeDetectorRef, _focusMonitor: FocusMonitor, _radioDispatcher: UniqueSelectionDispatcher, animationMode?: string, _providerOverride?: MatRadioDefaultOptions, tabIndex?: string);
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatRadioButton, "mat-radio-button", ["matRadioButton"], { "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; }, {}, never, ["*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatRadioButton, [{ optional: true; }, null, null, null, null, { optional: true; }, { optional: true; }, { attribute: "tabindex"; }]>;
-}
-
-// @public
-export abstract class _MatRadioButtonBase extends _MatRadioButtonMixinBase implements OnInit, AfterViewInit, DoCheck, OnDestroy, CanDisableRipple, HasTabIndex {
-    constructor(radioGroup: _MatRadioGroupBase<_MatRadioButtonBase>, elementRef: ElementRef, _changeDetector: ChangeDetectorRef, _focusMonitor: FocusMonitor, _radioDispatcher: UniqueSelectionDispatcher, animationMode?: string, _providerOverride?: MatRadioDefaultOptions | undefined, tabIndex?: string);
+export class MatRadioButton extends _MatRadioButtonMixinBase implements OnInit, AfterViewInit, DoCheck, OnDestroy, CanDisableRipple, HasTabIndex {
+    constructor(radioGroup: MatRadioGroup, elementRef: ElementRef, _changeDetector: ChangeDetectorRef, _focusMonitor: FocusMonitor, _radioDispatcher: UniqueSelectionDispatcher, animationMode?: string, _providerOverride?: MatRadioDefaultOptions | undefined, tabIndex?: string);
     ariaDescribedby: string;
     ariaLabel: string;
     ariaLabelledby: string;
     readonly change: EventEmitter<MatRadioChange>;
-    // (undocumented)
-    protected _changeDetector: ChangeDetectorRef;
     get checked(): boolean;
     set checked(value: BooleanInput);
     get color(): ThemePalette;
@@ -87,24 +76,24 @@ export abstract class _MatRadioButtonBase extends _MatRadioButtonMixinBase imple
     _onInputClick(event: Event): void;
     _onInputInteraction(event: Event): void;
     _onTouchTargetClick(event: Event): void;
-    radioGroup: _MatRadioGroupBase<_MatRadioButtonBase>;
+    radioGroup: MatRadioGroup;
     get required(): boolean;
     set required(value: BooleanInput);
     protected _setDisabled(value: boolean): void;
     get value(): any;
     set value(value: any);
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatRadioButtonBase, never, never, { "id": { "alias": "id"; "required": false; }; "name": { "alias": "name"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "value": { "alias": "value"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "required": { "alias": "required"; "required": false; }; "color": { "alias": "color"; "required": false; }; }, { "change": "change"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatRadioButton, "mat-radio-button", ["matRadioButton"], { "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "id": { "alias": "id"; "required": false; }; "name": { "alias": "name"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "value": { "alias": "value"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "required": { "alias": "required"; "required": false; }; "color": { "alias": "color"; "required": false; }; }, { "change": "change"; }, never, ["*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatRadioButtonBase, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatRadioButton, [{ optional: true; }, null, null, null, null, { optional: true; }, { optional: true; }, { attribute: "tabindex"; }]>;
 }
 
 // @public
 export class MatRadioChange {
     constructor(
-    source: _MatRadioButtonBase,
+    source: MatRadioButton,
     value: any);
-    source: _MatRadioButtonBase;
+    source: MatRadioButton;
     value: any;
 }
 
@@ -115,16 +104,7 @@ export interface MatRadioDefaultOptions {
 }
 
 // @public
-export class MatRadioGroup extends _MatRadioGroupBase<MatRadioButton> {
-    _radios: QueryList<MatRadioButton>;
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatRadioGroup, "mat-radio-group", ["matRadioGroup"], {}, {}, ["_radios"], never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatRadioGroup, never>;
-}
-
-// @public
-export abstract class _MatRadioGroupBase<T extends _MatRadioButtonBase> implements AfterContentInit, OnDestroy, ControlValueAccessor {
+export class MatRadioGroup implements AfterContentInit, OnDestroy, ControlValueAccessor {
     constructor(_changeDetector: ChangeDetectorRef);
     readonly change: EventEmitter<MatRadioChange>;
     // (undocumented)
@@ -144,22 +124,22 @@ export abstract class _MatRadioGroupBase<T extends _MatRadioButtonBase> implemen
     // (undocumented)
     ngOnDestroy(): void;
     onTouched: () => any;
-    abstract _radios: QueryList<T>;
+    _radios: QueryList<MatRadioButton>;
     registerOnChange(fn: (value: any) => void): void;
     registerOnTouched(fn: any): void;
     get required(): boolean;
     set required(value: BooleanInput);
-    get selected(): T | null;
-    set selected(selected: T | null);
+    get selected(): MatRadioButton | null;
+    set selected(selected: MatRadioButton | null);
     setDisabledState(isDisabled: boolean): void;
     _touch(): void;
     get value(): any;
     set value(newValue: any);
     writeValue(value: any): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatRadioGroupBase<any>, never, never, { "color": { "alias": "color"; "required": false; }; "name": { "alias": "name"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "value": { "alias": "value"; "required": false; }; "selected": { "alias": "selected"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "required": { "alias": "required"; "required": false; }; }, { "change": "change"; }, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatRadioGroup, "mat-radio-group", ["matRadioGroup"], { "color": { "alias": "color"; "required": false; }; "name": { "alias": "name"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "value": { "alias": "value"; "required": false; }; "selected": { "alias": "selected"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "required": { "alias": "required"; "required": false; }; }, { "change": "change"; }, ["_radios"], never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatRadioGroupBase<any>, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatRadioGroup, never>;
 }
 
 // @public (undocumented)
diff --git a/tools/public_api_guard/material/select-testing.md b/tools/public_api_guard/material/select-testing.md
index f0c4d9ab79db..ac912e6f2665 100644
--- a/tools/public_api_guard/material/select-testing.md
+++ b/tools/public_api_guard/material/select-testing.md
@@ -5,7 +5,6 @@
 ```ts
 
 import { BaseHarnessFilters } from '@angular/cdk/testing';
-import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
 import { MatFormFieldControlHarness } from '@angular/material/form-field/testing/control';
@@ -15,33 +14,16 @@ import { OptgroupHarnessFilters } from '@angular/material/core/testing';
 import { OptionHarnessFilters } from '@angular/material/core/testing';
 
 // @public
-export class MatSelectHarness extends _MatSelectHarnessBase<typeof MatOptionHarness, MatOptionHarness, OptionHarnessFilters, typeof MatOptgroupHarness, MatOptgroupHarness, OptgroupHarnessFilters> {
-    // (undocumented)
-    static hostSelector: string;
-    // (undocumented)
-    protected _optionClass: typeof MatOptionHarness;
-    // (undocumented)
-    protected _optionGroupClass: typeof MatOptgroupHarness;
-    // (undocumented)
-    protected _prefix: string;
-    static with<T extends MatSelectHarness>(this: ComponentHarnessConstructor<T>, options?: SelectHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatSelectHarnessBase<OptionType extends ComponentHarnessConstructor<Option> & {
-    with: (options?: OptionFilters) => HarnessPredicate<Option>;
-}, Option extends ComponentHarness & {
-    click(): Promise<void>;
-}, OptionFilters extends BaseHarnessFilters, OptionGroupType extends ComponentHarnessConstructor<OptionGroup> & {
-    with: (options?: OptionGroupFilters) => HarnessPredicate<OptionGroup>;
-}, OptionGroup extends ComponentHarness, OptionGroupFilters extends BaseHarnessFilters> extends MatFormFieldControlHarness {
+export class MatSelectHarness extends MatFormFieldControlHarness {
     blur(): Promise<void>;
-    clickOptions(filter?: OptionFilters): Promise<void>;
+    clickOptions(filter?: OptionHarnessFilters): Promise<void>;
     close(): Promise<void>;
     focus(): Promise<void>;
-    getOptionGroups(filter?: Omit<OptionGroupFilters, 'ancestor'>): Promise<OptionGroup[]>;
-    getOptions(filter?: Omit<OptionFilters, 'ancestor'>): Promise<Option[]>;
+    getOptionGroups(filter?: Omit<OptgroupHarnessFilters, 'ancestor'>): Promise<MatOptgroupHarness[]>;
+    getOptions(filter?: Omit<OptionHarnessFilters, 'ancestor'>): Promise<MatOptionHarness[]>;
     getValueText(): Promise<string>;
+    // (undocumented)
+    static hostSelector: string;
     isDisabled(): Promise<boolean>;
     isEmpty(): Promise<boolean>;
     isFocused(): Promise<boolean>;
@@ -50,12 +32,7 @@ export abstract class _MatSelectHarnessBase<OptionType extends ComponentHarnessC
     isRequired(): Promise<boolean>;
     isValid(): Promise<boolean>;
     open(): Promise<void>;
-    // (undocumented)
-    protected abstract _optionClass: OptionType;
-    // (undocumented)
-    protected abstract _optionGroupClass: OptionGroupType;
-    // (undocumented)
-    protected abstract _prefix: string;
+    static with<T extends MatSelectHarness>(this: ComponentHarnessConstructor<T>, options?: SelectHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/select.md b/tools/public_api_guard/material/select.md
index 8d5837c95218..9d9c403299d4 100644
--- a/tools/public_api_guard/material/select.md
+++ b/tools/public_api_guard/material/select.md
@@ -37,7 +37,6 @@ import { MatFormField } from '@angular/material/form-field';
 import { MatFormFieldControl } from '@angular/material/form-field';
 import { MatOptgroup } from '@angular/material/core';
 import { MatOption } from '@angular/material/core';
-import { _MatOptionBase } from '@angular/material/core';
 import { MatOptionSelectionChange } from '@angular/material/core';
 import { NgControl } from '@angular/forms';
 import { NgForm } from '@angular/forms';
@@ -75,50 +74,7 @@ export function MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay): (
 export const MAT_SELECT_TRIGGER: InjectionToken<MatSelectTrigger>;
 
 // @public (undocumented)
-export class MatSelect extends _MatSelectBase<MatSelectChange> implements OnInit {
-    // (undocumented)
-    close(): void;
-    // (undocumented)
-    customTrigger: MatSelectTrigger;
-    // (undocumented)
-    protected _getChangeEvent(value: any): MatSelectChange;
-    get hideSingleSelectionIndicator(): boolean;
-    set hideSingleSelectionIndicator(value: BooleanInput);
-    // (undocumented)
-    ngOnInit(): void;
-    // (undocumented)
-    open(): void;
-    // (undocumented)
-    optionGroups: QueryList<MatOptgroup>;
-    // (undocumented)
-    options: QueryList<MatOption>;
-    _overlayWidth: string | number;
-    panelWidth: string | number | null;
-    // (undocumented)
-    protected _positioningSettled(): void;
-    // (undocumented)
-    _positions: ConnectedPosition[];
-    _preferredOverlayOrigin: CdkOverlayOrigin | ElementRef | undefined;
-    protected _scrollOptionIntoView(index: number): void;
-    // (undocumented)
-    get shouldLabelFloat(): boolean;
-    // (undocumented)
-    protected _skipPredicate: (option: MatOption) => boolean;
-    _syncParentProperties(): void;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatSelect, "mat-select", ["matSelect"], { "disabled": { "alias": "disabled"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "panelWidth": { "alias": "panelWidth"; "required": false; }; "hideSingleSelectionIndicator": { "alias": "hideSingleSelectionIndicator"; "required": false; }; }, {}, ["customTrigger", "options", "optionGroups"], ["mat-select-trigger", "*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatSelect, never>;
-}
-
-// @public
-export const matSelectAnimations: {
-    readonly transformPanelWrap: AnimationTriggerMetadata;
-    readonly transformPanel: AnimationTriggerMetadata;
-};
-
-// @public
-export abstract class _MatSelectBase<C> extends _MatSelectMixinBase implements AfterContentInit, OnChanges, OnDestroy, OnInit, DoCheck, ControlValueAccessor, CanDisable, HasTabIndex, MatFormFieldControl<any>, CanUpdateErrorState, CanDisableRipple {
+export class MatSelect extends _MatSelectMixinBase implements AfterContentInit, OnChanges, OnDestroy, OnInit, DoCheck, ControlValueAccessor, CanDisable, HasTabIndex, MatFormFieldControl<any>, CanUpdateErrorState, CanDisableRipple {
     constructor(_viewportRuler: ViewportRuler, _changeDetectorRef: ChangeDetectorRef, _ngZone: NgZone, _defaultErrorStateMatcher: ErrorStateMatcher, elementRef: ElementRef, _dir: Directionality, _parentForm: NgForm, _parentFormGroup: FormGroupDirective, _parentFormField: MatFormField, ngControl: NgControl, tabIndex: string, scrollStrategyFactory: any, _liveAnnouncer: LiveAnnouncer, _defaultOptions?: MatSelectConfig | undefined);
     ariaLabel: string;
     ariaLabelledby: string;
@@ -130,7 +86,7 @@ export abstract class _MatSelectBase<C> extends _MatSelectMixinBase implements A
     get compareWith(): (o1: any, o2: any) => boolean;
     set compareWith(fn: (o1: any, o2: any) => boolean);
     controlType: string;
-    abstract customTrigger: {};
+    customTrigger: MatSelectTrigger;
     // (undocumented)
     protected _defaultOptions?: MatSelectConfig | undefined;
     protected readonly _destroy: Subject<void>;
@@ -141,10 +97,11 @@ export abstract class _MatSelectBase<C> extends _MatSelectMixinBase implements A
     focus(options?: FocusOptions): void;
     get focused(): boolean;
     _getAriaActiveDescendant(): string | null;
-    protected abstract _getChangeEvent(value: any): C;
     _getPanelAriaLabelledby(): string | null;
     _getPanelTheme(): string;
     _handleKeydown(event: KeyboardEvent): void;
+    get hideSingleSelectionIndicator(): boolean;
+    set hideSingleSelectionIndicator(value: BooleanInput);
     get id(): string;
     set id(value: string);
     _isRtl(): boolean;
@@ -173,12 +130,13 @@ export abstract class _MatSelectBase<C> extends _MatSelectMixinBase implements A
     open(): void;
     readonly openedChange: EventEmitter<boolean>;
     readonly _openedStream: Observable<void>;
-    abstract optionGroups: QueryList<MatOptgroup>;
-    abstract options: QueryList<_MatOptionBase>;
+    optionGroups: QueryList<MatOptgroup>;
+    options: QueryList<MatOption>;
     readonly optionSelectionChanges: Observable<MatOptionSelectionChange>;
     protected _overlayDir: CdkConnectedOverlay;
     // (undocumented)
     _overlayPanelClass: string | string[];
+    _overlayWidth: string | number;
     panel: ElementRef;
     panelClass: string | string[] | Set<string> | {
         [key: string]: any;
@@ -186,27 +144,26 @@ export abstract class _MatSelectBase<C> extends _MatSelectMixinBase implements A
     protected _panelDoneAnimating(isOpen: boolean): void;
     readonly _panelDoneAnimatingStream: Subject<string>;
     get panelOpen(): boolean;
+    panelWidth: string | number | null;
     // (undocumented)
     protected _parentFormField: MatFormField;
     get placeholder(): string;
     set placeholder(value: string);
-    protected abstract _positioningSettled(): void;
-    abstract _positions: ConnectedPosition[];
+    _positions: ConnectedPosition[];
+    _preferredOverlayOrigin: CdkOverlayOrigin | ElementRef | undefined;
     registerOnChange(fn: (value: any) => void): void;
     registerOnTouched(fn: () => {}): void;
     get required(): boolean;
     set required(value: BooleanInput);
-    protected abstract _scrollOptionIntoView(index: number): void;
     _scrollStrategy: ScrollStrategy;
     get selected(): MatOption | MatOption[];
-    readonly selectionChange: EventEmitter<C>;
+    readonly selectionChange: EventEmitter<MatSelectChange>;
     _selectionModel: SelectionModel<MatOption>;
     setDescribedByIds(ids: string[]): void;
     setDisabledState(isDisabled: boolean): void;
     get shouldLabelFloat(): boolean;
-    // (undocumented)
-    protected _skipPredicate(item: MatOption): boolean;
     sortComparator: (a: MatOption, b: MatOption, options: MatOption[]) => number;
+    _syncParentProperties(): void;
     toggle(): void;
     trigger: ElementRef;
     get triggerValue(): string;
@@ -221,11 +178,17 @@ export abstract class _MatSelectBase<C> extends _MatSelectMixinBase implements A
     protected _viewportRuler: ViewportRuler;
     writeValue(value: any): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatSelectBase<any>, never, never, { "userAriaDescribedBy": { "alias": "aria-describedby"; "required": false; }; "panelClass": { "alias": "panelClass"; "required": false; }; "placeholder": { "alias": "placeholder"; "required": false; }; "required": { "alias": "required"; "required": false; }; "multiple": { "alias": "multiple"; "required": false; }; "disableOptionCentering": { "alias": "disableOptionCentering"; "required": false; }; "compareWith": { "alias": "compareWith"; "required": false; }; "value": { "alias": "value"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "errorStateMatcher": { "alias": "errorStateMatcher"; "required": false; }; "typeaheadDebounceInterval": { "alias": "typeaheadDebounceInterval"; "required": false; }; "sortComparator": { "alias": "sortComparator"; "required": false; }; "id": { "alias": "id"; "required": false; }; }, { "openedChange": "openedChange"; "_openedStream": "opened"; "_closedStream": "closed"; "selectionChange": "selectionChange"; "valueChange": "valueChange"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatSelect, "mat-select", ["matSelect"], { "disabled": { "alias": "disabled"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "userAriaDescribedBy": { "alias": "aria-describedby"; "required": false; }; "panelClass": { "alias": "panelClass"; "required": false; }; "hideSingleSelectionIndicator": { "alias": "hideSingleSelectionIndicator"; "required": false; }; "placeholder": { "alias": "placeholder"; "required": false; }; "required": { "alias": "required"; "required": false; }; "multiple": { "alias": "multiple"; "required": false; }; "disableOptionCentering": { "alias": "disableOptionCentering"; "required": false; }; "compareWith": { "alias": "compareWith"; "required": false; }; "value": { "alias": "value"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "errorStateMatcher": { "alias": "errorStateMatcher"; "required": false; }; "typeaheadDebounceInterval": { "alias": "typeaheadDebounceInterval"; "required": false; }; "sortComparator": { "alias": "sortComparator"; "required": false; }; "id": { "alias": "id"; "required": false; }; "panelWidth": { "alias": "panelWidth"; "required": false; }; }, { "openedChange": "openedChange"; "_openedStream": "opened"; "_closedStream": "closed"; "selectionChange": "selectionChange"; "valueChange": "valueChange"; }, ["customTrigger", "options", "optionGroups"], ["mat-select-trigger", "*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatSelectBase<any>, [null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }, { optional: true; }, { optional: true; self: true; }, { attribute: "tabindex"; }, null, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSelect, [null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }, { optional: true; }, { optional: true; self: true; }, { attribute: "tabindex"; }, null, null, { optional: true; }]>;
 }
 
+// @public
+export const matSelectAnimations: {
+    readonly transformPanelWrap: AnimationTriggerMetadata;
+    readonly transformPanel: AnimationTriggerMetadata;
+};
+
 // @public
 export class MatSelectChange {
     constructor(
diff --git a/tools/public_api_guard/material/slide-toggle-testing.md b/tools/public_api_guard/material/slide-toggle-testing.md
index 88f25fd802f9..8d39ba884e57 100644
--- a/tools/public_api_guard/material/slide-toggle-testing.md
+++ b/tools/public_api_guard/material/slide-toggle-testing.md
@@ -4,30 +4,13 @@
 
 ```ts
 
-import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { TestElement } from '@angular/cdk/testing';
 
 // @public
-export class MatSlideToggleHarness extends _MatSlideToggleHarnessBase {
-    // (undocumented)
-    static hostSelector: string;
-    // (undocumented)
-    isChecked(): Promise<boolean>;
-    // (undocumented)
-    isRequired(): Promise<boolean>;
-    // (undocumented)
-    protected _nativeElement: AsyncFactoryFn<TestElement>;
-    // (undocumented)
-    toggle(): Promise<void>;
-    static with<T extends MatSlideToggleHarness>(this: ComponentHarnessConstructor<T>, options?: SlideToggleHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatSlideToggleHarnessBase extends ComponentHarness {
+export class MatSlideToggleHarness extends ComponentHarness {
     blur(): Promise<void>;
     check(): Promise<void>;
     focus(): Promise<void>;
@@ -35,15 +18,16 @@ export abstract class _MatSlideToggleHarnessBase extends ComponentHarness {
     getAriaLabelledby(): Promise<string | null>;
     getLabelText(): Promise<string>;
     getName(): Promise<string | null>;
-    abstract isChecked(): Promise<boolean>;
+    // (undocumented)
+    static hostSelector: string;
+    isChecked(): Promise<boolean>;
     isDisabled(): Promise<boolean>;
     isFocused(): Promise<boolean>;
     isRequired(): Promise<boolean>;
     isValid(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _nativeElement: AsyncFactoryFn<TestElement>;
-    abstract toggle(): Promise<void>;
+    toggle(): Promise<void>;
     uncheck(): Promise<void>;
+    static with<T extends MatSlideToggleHarness>(this: ComponentHarnessConstructor<T>, options?: SlideToggleHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/slide-toggle.md b/tools/public_api_guard/material/slide-toggle.md
index 1a118680ac7b..ff52962f1752 100644
--- a/tools/public_api_guard/material/slide-toggle.md
+++ b/tools/public_api_guard/material/slide-toggle.md
@@ -17,7 +17,6 @@ import { ControlValueAccessor } from '@angular/forms';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusMonitor } from '@angular/cdk/a11y';
-import { FocusOrigin } from '@angular/cdk/a11y';
 import { HasTabIndex } from '@angular/material/core';
 import * as i0 from '@angular/core';
 import * as i3 from '@angular/material/core';
@@ -42,48 +41,30 @@ export const MAT_SLIDE_TOGGLE_VALUE_ACCESSOR: {
 };
 
 // @public (undocumented)
-export class MatSlideToggle extends _MatSlideToggleBase<MatSlideToggleChange> {
-    constructor(elementRef: ElementRef, focusMonitor: FocusMonitor, changeDetectorRef: ChangeDetectorRef, tabIndex: string, defaults: MatSlideToggleDefaultOptions, animationMode?: string);
-    get buttonId(): string;
-    // (undocumented)
-    protected _createChangeEvent(isChecked: boolean): MatSlideToggleChange;
-    focus(): void;
-    // (undocumented)
-    _getAriaLabelledBy(): string | null;
-    _handleClick(): void;
-    _labelId: string;
-    _switchElement: ElementRef<HTMLElement>;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatSlideToggle, "mat-slide-toggle", ["matSlideToggle"], { "disabled": { "alias": "disabled"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "color": { "alias": "color"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; }, {}, never, ["*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatSlideToggle, [null, null, null, { attribute: "tabindex"; }, null, { optional: true; }]>;
-}
-
-// @public (undocumented)
-export abstract class _MatSlideToggleBase<T> extends _MatSlideToggleMixinBase implements OnDestroy, AfterContentInit, ControlValueAccessor, CanDisable, CanColor, HasTabIndex, CanDisableRipple {
-    constructor(elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string, defaults: MatSlideToggleDefaultOptions, animationMode: string | undefined, idPrefix: string);
+export class MatSlideToggle extends _MatSlideToggleMixinBase implements OnDestroy, AfterContentInit, ControlValueAccessor, CanDisable, CanColor, HasTabIndex, CanDisableRipple {
+    constructor(elementRef: ElementRef, _focusMonitor: FocusMonitor, _changeDetectorRef: ChangeDetectorRef, tabIndex: string, _defaults: MatSlideToggleDefaultOptions, animationMode?: string);
     ariaDescribedby: string;
     ariaLabel: string | null;
     ariaLabelledby: string | null;
-    readonly change: EventEmitter<T>;
+    get buttonId(): string;
+    readonly change: EventEmitter<MatSlideToggleChange>;
     // (undocumented)
     protected _changeDetectorRef: ChangeDetectorRef;
     get checked(): boolean;
     set checked(value: BooleanInput);
-    // (undocumented)
-    protected abstract _createChangeEvent(isChecked: boolean): T;
-    // (undocumented)
-    defaults: MatSlideToggleDefaultOptions;
     protected _emitChangeEvent(): void;
-    // (undocumented)
-    abstract focus(options?: FocusOptions, origin?: FocusOrigin): void;
+    focus(): void;
     _focused: boolean;
     // (undocumented)
     protected _focusMonitor: FocusMonitor;
+    // (undocumented)
+    _getAriaLabelledBy(): string | null;
+    _handleClick(): void;
     get hideIcon(): boolean;
     set hideIcon(value: BooleanInput);
     id: string;
     get inputId(): string;
+    _labelId: string;
     labelPosition: 'before' | 'after';
     name: string | null;
     // (undocumented)
@@ -91,22 +72,19 @@ export abstract class _MatSlideToggleBase<T> extends _MatSlideToggleMixinBase im
     // (undocumented)
     ngOnDestroy(): void;
     _noopAnimations: boolean;
-    // (undocumented)
-    protected _onChange: (_: any) => void;
     registerOnChange(fn: any): void;
     registerOnTouched(fn: any): void;
     get required(): boolean;
     set required(value: BooleanInput);
     setDisabledState(isDisabled: boolean): void;
+    _switchElement: ElementRef<HTMLElement>;
     toggle(): void;
     readonly toggleChange: EventEmitter<void>;
-    // (undocumented)
-    protected _uniqueId: string;
     writeValue(value: any): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatSlideToggleBase<any>, never, never, { "name": { "alias": "name"; "required": false; }; "id": { "alias": "id"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "required": { "alias": "required"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "hideIcon": { "alias": "hideIcon"; "required": false; }; }, { "change": "change"; "toggleChange": "toggleChange"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatSlideToggle, "mat-slide-toggle", ["matSlideToggle"], { "disabled": { "alias": "disabled"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "color": { "alias": "color"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "name": { "alias": "name"; "required": false; }; "id": { "alias": "id"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "required": { "alias": "required"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "hideIcon": { "alias": "hideIcon"; "required": false; }; }, { "change": "change"; "toggleChange": "toggleChange"; }, never, ["*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatSlideToggleBase<any>, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSlideToggle, [null, null, null, { attribute: "tabindex"; }, null, { optional: true; }]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/snack-bar-testing.md b/tools/public_api_guard/material/snack-bar-testing.md
index 69306db61429..22c26be05262 100644
--- a/tools/public_api_guard/material/snack-bar-testing.md
+++ b/tools/public_api_guard/material/snack-bar-testing.md
@@ -10,22 +10,7 @@ import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
 
 // @public
-export class MatSnackBarHarness extends _MatSnackBarHarnessBase {
-    // (undocumented)
-    protected _actionButtonSelector: string;
-    protected _assertContentAnnotated(): Promise<void>;
-    static hostSelector: string;
-    // (undocumented)
-    protected _messageSelector: string;
-    static with(options?: SnackBarHarnessFilters): HarnessPredicate<MatSnackBarHarness>;
-}
-
-// @public (undocumented)
-export abstract class _MatSnackBarHarnessBase extends ContentContainerComponentHarness<string> {
-    // (undocumented)
-    protected abstract _actionButtonSelector: string;
-    protected abstract _assertContentAnnotated(): Promise<void>;
-    protected _assertHasAction(): Promise<void>;
+export class MatSnackBarHarness extends ContentContainerComponentHarness<string> {
     dismissWithAction(): Promise<void>;
     getActionDescription(): Promise<string>;
     getAriaLive(): Promise<AriaLivePoliteness>;
@@ -33,9 +18,9 @@ export abstract class _MatSnackBarHarnessBase extends ContentContainerComponentH
     // @deprecated
     getRole(): Promise<'alert' | 'status' | null>;
     hasAction(): Promise<boolean>;
+    static hostSelector: string;
     isDismissed(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _messageSelector: string;
+    static with(options?: SnackBarHarnessFilters): HarnessPredicate<MatSnackBarHarness>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/snack-bar.md b/tools/public_api_guard/material/snack-bar.md
index 1cacb9a99de3..1e52c113090e 100644
--- a/tools/public_api_guard/material/snack-bar.md
+++ b/tools/public_api_guard/material/snack-bar.md
@@ -36,7 +36,6 @@ import { Platform } from '@angular/cdk/platform';
 import { Subject } from 'rxjs';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { TemplateRef } from '@angular/core';
-import { Type } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
 
 // @public
@@ -49,14 +48,19 @@ export const MAT_SNACK_BAR_DEFAULT_OPTIONS: InjectionToken<MatSnackBarConfig<any
 export function MAT_SNACK_BAR_DEFAULT_OPTIONS_FACTORY(): MatSnackBarConfig;
 
 // @public
-export class MatSnackBar extends _MatSnackBarBase {
-    constructor(overlay: Overlay, live: LiveAnnouncer, injector: Injector, breakpointObserver: BreakpointObserver, parentSnackBar: MatSnackBar, defaultConfig: MatSnackBarConfig);
-    // (undocumented)
-    protected handsetCssClass: string;
-    // (undocumented)
-    protected simpleSnackBarComponent: typeof SimpleSnackBar;
+export class MatSnackBar implements OnDestroy {
+    constructor(_overlay: Overlay, _live: LiveAnnouncer, _injector: Injector, _breakpointObserver: BreakpointObserver, _parentSnackBar: MatSnackBar, _defaultConfig: MatSnackBarConfig);
+    dismiss(): void;
+    handsetCssClass: string;
     // (undocumented)
-    protected snackBarContainerComponent: typeof MatSnackBarContainer;
+    ngOnDestroy(): void;
+    open(message: string, action?: string, config?: MatSnackBarConfig): MatSnackBarRef<TextOnlySnackBar>;
+    get _openedSnackBarRef(): MatSnackBarRef<any> | null;
+    set _openedSnackBarRef(value: MatSnackBarRef<any> | null);
+    openFromComponent<T, D = any>(component: ComponentType<T>, config?: MatSnackBarConfig<D>): MatSnackBarRef<T>;
+    openFromTemplate(template: TemplateRef<any>, config?: MatSnackBarConfig): MatSnackBarRef<EmbeddedViewRef<any>>;
+    simpleSnackBarComponent: typeof SimpleSnackBar;
+    snackBarContainerComponent: typeof MatSnackBarContainer;
     // (undocumented)
     static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBar, [null, null, null, null, { optional: true; skipSelf: true; }, null]>;
     // (undocumented)
@@ -84,26 +88,6 @@ export const matSnackBarAnimations: {
     readonly snackBarState: AnimationTriggerMetadata;
 };
 
-// @public (undocumented)
-export abstract class _MatSnackBarBase implements OnDestroy {
-    constructor(_overlay: Overlay, _live: LiveAnnouncer, _injector: Injector, _breakpointObserver: BreakpointObserver, _parentSnackBar: _MatSnackBarBase, _defaultConfig: MatSnackBarConfig);
-    dismiss(): void;
-    protected abstract handsetCssClass: string;
-    // (undocumented)
-    ngOnDestroy(): void;
-    open(message: string, action?: string, config?: MatSnackBarConfig): MatSnackBarRef<TextOnlySnackBar>;
-    get _openedSnackBarRef(): MatSnackBarRef<any> | null;
-    set _openedSnackBarRef(value: MatSnackBarRef<any> | null);
-    openFromComponent<T, D = any>(component: ComponentType<T>, config?: MatSnackBarConfig<D>): MatSnackBarRef<T>;
-    openFromTemplate(template: TemplateRef<any>, config?: MatSnackBarConfig): MatSnackBarRef<EmbeddedViewRef<any>>;
-    protected abstract simpleSnackBarComponent: Type<TextOnlySnackBar>;
-    protected abstract snackBarContainerComponent: Type<_MatSnackBarContainerBase>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatSnackBarBase, [null, null, null, null, { optional: true; skipSelf: true; }, null]>;
-    // (undocumented)
-    static ɵprov: i0.ɵɵInjectableDeclaration<_MatSnackBarBase>;
-}
-
 // @public
 export class MatSnackBarConfig<D = any> {
     announcementMessage?: string;
@@ -118,29 +102,17 @@ export class MatSnackBarConfig<D = any> {
 }
 
 // @public
-export class MatSnackBarContainer extends _MatSnackBarContainerBase {
-    protected _afterPortalAttached(): void;
-    _label: ElementRef;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatSnackBarContainer, "mat-snack-bar-container", never, {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarContainer, never>;
-}
-
-// @public
-export abstract class _MatSnackBarContainerBase extends BasePortalOutlet implements OnDestroy {
+export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy {
     constructor(_ngZone: NgZone, _elementRef: ElementRef<HTMLElement>, _changeDetectorRef: ChangeDetectorRef, _platform: Platform,
     snackBarConfig: MatSnackBarConfig);
-    protected _afterPortalAttached(): void;
     _animationState: string;
     attachComponentPortal<T>(portal: ComponentPortal<T>): ComponentRef<T>;
     // @deprecated
     attachDomPortal: (portal: DomPortal) => void;
     attachTemplatePortal<C>(portal: TemplatePortal<C>): EmbeddedViewRef<C>;
-    // (undocumented)
-    protected _elementRef: ElementRef<HTMLElement>;
     enter(): void;
     exit(): Observable<void>;
+    _label: ElementRef;
     _live: AriaLivePoliteness;
     readonly _liveElementId: string;
     ngOnDestroy(): void;
@@ -152,9 +124,9 @@ export abstract class _MatSnackBarContainerBase extends BasePortalOutlet impleme
     _role?: 'status' | 'alert';
     snackBarConfig: MatSnackBarConfig;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatSnackBarContainerBase, never, never, {}, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatSnackBarContainer, "mat-snack-bar-container", never, {}, {}, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatSnackBarContainerBase, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarContainer, never>;
 }
 
 // @public
@@ -185,12 +157,12 @@ export class MatSnackBarModule {
 
 // @public
 export class MatSnackBarRef<T> {
-    constructor(containerInstance: _MatSnackBarContainerBase, _overlayRef: OverlayRef);
+    constructor(containerInstance: MatSnackBarContainer, _overlayRef: OverlayRef);
     afterDismissed(): Observable<MatSnackBarDismiss>;
     afterOpened(): Observable<void>;
     // @deprecated
     closeWithAction(): void;
-    containerInstance: _MatSnackBarContainerBase;
+    containerInstance: MatSnackBarContainer;
     dismiss(): void;
     _dismissAfter(duration: number): void;
     dismissWithAction(): void;
diff --git a/tools/public_api_guard/material/table-testing.md b/tools/public_api_guard/material/table-testing.md
index caff04c67739..5440f5510dd0 100644
--- a/tools/public_api_guard/material/table-testing.md
+++ b/tools/public_api_guard/material/table-testing.md
@@ -84,36 +84,14 @@ export interface MatRowHarnessColumnsText {
 }
 
 // @public
-export class MatTableHarness extends _MatTableHarnessBase<typeof MatHeaderRowHarness, MatHeaderRowHarness, typeof MatRowHarness, MatRowHarness, typeof MatFooterRowHarness, MatFooterRowHarness> {
-    // (undocumented)
-    protected _footerRowHarness: typeof MatFooterRowHarness;
-    // (undocumented)
-    protected _headerRowHarness: typeof MatHeaderRowHarness;
-    static hostSelector: string;
-    // (undocumented)
-    protected _rowHarness: typeof MatRowHarness;
-    static with<T extends MatTableHarness>(this: ComponentHarnessConstructor<T>, options?: TableHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatTableHarnessBase<HeaderRowType extends ComponentHarnessConstructor<HeaderRow> & {
-    with: (options?: RowHarnessFilters) => HarnessPredicate<HeaderRow>;
-}, HeaderRow extends RowBase, RowType extends ComponentHarnessConstructor<Row> & {
-    with: (options?: RowHarnessFilters) => HarnessPredicate<Row>;
-}, Row extends RowBase, FooterRowType extends ComponentHarnessConstructor<FooterRow> & {
-    with: (options?: RowHarnessFilters) => HarnessPredicate<FooterRow>;
-}, FooterRow extends RowBase> extends ContentContainerComponentHarness<string> {
-    // (undocumented)
-    protected abstract _footerRowHarness: FooterRowType;
+export class MatTableHarness extends ContentContainerComponentHarness<string> {
     getCellTextByColumnName(): Promise<MatTableHarnessColumnsText>;
     getCellTextByIndex(): Promise<string[][]>;
-    getFooterRows(filter?: RowHarnessFilters): Promise<FooterRow[]>;
-    getHeaderRows(filter?: RowHarnessFilters): Promise<HeaderRow[]>;
-    getRows(filter?: RowHarnessFilters): Promise<Row[]>;
-    // (undocumented)
-    protected abstract _headerRowHarness: HeaderRowType;
-    // (undocumented)
-    protected abstract _rowHarness: RowType;
+    getFooterRows(filter?: RowHarnessFilters): Promise<MatFooterRowHarness[]>;
+    getHeaderRows(filter?: RowHarnessFilters): Promise<MatHeaderRowHarness[]>;
+    getRows(filter?: RowHarnessFilters): Promise<MatRowHarness[]>;
+    static hostSelector: string;
+    static with<T extends MatTableHarness>(this: ComponentHarnessConstructor<T>, options?: TableHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/table.md b/tools/public_api_guard/material/table.md
index 6947947fcfce..f61209d1df25 100644
--- a/tools/public_api_guard/material/table.md
+++ b/tools/public_api_guard/material/table.md
@@ -25,10 +25,9 @@ import { DataSource } from '@angular/cdk/collections';
 import * as i0 from '@angular/core';
 import * as i5 from '@angular/material/core';
 import * as i6 from '@angular/cdk/table';
+import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
-import { Observable } from 'rxjs';
 import { OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
 import { Subscription } from 'rxjs';
 
 // @public
@@ -169,11 +168,7 @@ export class MatTable<T> extends CdkTable<T> implements OnInit {
 }
 
 // @public
-export class MatTableDataSource<T, P extends MatTableDataSourcePaginator = MatTableDataSourcePaginator> extends _MatTableDataSource<T, P> {
-}
-
-// @public
-export class _MatTableDataSource<T, P extends MatTableDataSourcePaginator = MatTableDataSourcePaginator> extends DataSource<T> {
+export class MatTableDataSource<T, P extends MatPaginator = MatPaginator> extends DataSource<T> {
     constructor(initialData?: T[]);
     connect(): BehaviorSubject<T[]>;
     get data(): T[];
@@ -197,34 +192,6 @@ export class _MatTableDataSource<T, P extends MatTableDataSourcePaginator = MatT
     _updatePaginator(filteredDataLength: number): void;
 }
 
-// @public
-export interface MatTableDataSourcePageEvent {
-    // (undocumented)
-    length: number;
-    // (undocumented)
-    pageIndex: number;
-    // (undocumented)
-    pageSize: number;
-}
-
-// @public
-export interface MatTableDataSourcePaginator {
-    // (undocumented)
-    firstPage: () => void;
-    // (undocumented)
-    initialized: Observable<void>;
-    // (undocumented)
-    lastPage: () => void;
-    // (undocumented)
-    length: number;
-    // (undocumented)
-    page: Subject<MatTableDataSourcePageEvent>;
-    // (undocumented)
-    pageIndex: number;
-    // (undocumented)
-    pageSize: number;
-}
-
 // @public (undocumented)
 export class MatTableModule {
     // (undocumented)
diff --git a/tools/public_api_guard/material/tabs.md b/tools/public_api_guard/material/tabs.md
index f11a43b522c0..7f282bae581f 100644
--- a/tools/public_api_guard/material/tabs.md
+++ b/tools/public_api_guard/material/tabs.md
@@ -165,18 +165,7 @@ export abstract class MatPaginatedTabHeader implements AfterContentChecked, Afte
 }
 
 // @public (undocumented)
-export class MatTab extends _MatTabBase {
-    _explicitContent: TemplateRef<any>;
-    get templateLabel(): MatTabLabel;
-    set templateLabel(value: MatTabLabel);
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatTab, "mat-tab", ["matTab"], { "disabled": { "alias": "disabled"; "required": false; }; }, {}, ["_explicitContent", "templateLabel"], ["*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatTab, never>;
-}
-
-// @public
-export class _MatTabBase extends _MatTabMixinBase implements CanDisable, OnInit, OnChanges, OnDestroy {
+export class MatTab extends _MatTabMixinBase implements CanDisable, OnInit, OnChanges, OnDestroy {
     constructor(_viewContainerRef: ViewContainerRef, _closestTabGroup: any);
     ariaLabel: string;
     ariaLabelledby: string;
@@ -184,7 +173,6 @@ export class _MatTabBase extends _MatTabMixinBase implements CanDisable, OnInit,
     // (undocumented)
     _closestTabGroup: any;
     get content(): TemplatePortal | null;
-    _explicitContent: TemplateRef<any>;
     _implicitContent: TemplateRef<any>;
     isActive: boolean;
     labelClass: string | string[];
@@ -196,29 +184,19 @@ export class _MatTabBase extends _MatTabMixinBase implements CanDisable, OnInit,
     ngOnInit(): void;
     origin: number | null;
     position: number | null;
-    protected _setTemplateLabelInput(value: MatTabLabel | undefined): void;
     readonly _stateChanges: Subject<void>;
-    protected _templateLabel: MatTabLabel;
-    textLabel: string;
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTabBase, never, never, { "textLabel": { "alias": "label"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "labelClass": { "alias": "labelClass"; "required": false; }; "bodyClass": { "alias": "bodyClass"; "required": false; }; }, {}, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTabBase, [null, { optional: true; }]>;
-}
-
-// @public
-export class MatTabBody extends _MatTabBodyBase {
-    constructor(elementRef: ElementRef<HTMLElement>, dir: Directionality, changeDetectorRef: ChangeDetectorRef);
-    // (undocumented)
-    _portalHost: CdkPortalOutlet;
+    get templateLabel(): MatTabLabel;
+    set templateLabel(value: MatTabLabel);
+    textLabel: string;
     // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabBody, "mat-tab-body", never, {}, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatTab, "mat-tab", ["matTab"], { "disabled": { "alias": "disabled"; "required": false; }; "textLabel": { "alias": "label"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "labelClass": { "alias": "labelClass"; "required": false; }; "bodyClass": { "alias": "bodyClass"; "required": false; }; }, {}, ["templateLabel", "_explicitContent"], ["*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabBody, [null, { optional: true; }, null]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatTab, [null, { optional: true; }]>;
 }
 
 // @public
-export abstract class _MatTabBodyBase implements OnInit, OnDestroy {
+export class MatTabBody implements OnInit, OnDestroy {
     constructor(_elementRef: ElementRef<HTMLElement>, _dir: Directionality, changeDetectorRef: ChangeDetectorRef);
     readonly _afterLeavingCenter: EventEmitter<void>;
     animationDuration: string;
@@ -234,15 +212,15 @@ export abstract class _MatTabBodyBase implements OnInit, OnDestroy {
     // (undocumented)
     _onTranslateTabStarted(event: AnimationEvent_2): void;
     origin: number | null;
-    abstract _portalHost: CdkPortalOutlet;
+    _portalHost: CdkPortalOutlet;
     set position(position: number);
     _position: MatTabBodyPositionState;
     preserveContent: boolean;
     readonly _translateTabComplete: Subject<AnimationEvent_2>;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTabBodyBase, never, never, { "_content": { "alias": "content"; "required": false; }; "origin": { "alias": "origin"; "required": false; }; "animationDuration": { "alias": "animationDuration"; "required": false; }; "preserveContent": { "alias": "preserveContent"; "required": false; }; "position": { "alias": "position"; "required": false; }; }, { "_onCentering": "_onCentering"; "_beforeCentering": "_beforeCentering"; "_afterLeavingCenter": "_afterLeavingCenter"; "_onCentered": "_onCentered"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabBody, "mat-tab-body", never, { "_content": { "alias": "content"; "required": false; }; "origin": { "alias": "origin"; "required": false; }; "animationDuration": { "alias": "animationDuration"; "required": false; }; "preserveContent": { "alias": "preserveContent"; "required": false; }; "position": { "alias": "position"; "required": false; }; }, { "_onCentering": "_onCentering"; "_beforeCentering": "_beforeCentering"; "_afterLeavingCenter": "_afterLeavingCenter"; "_onCentered": "_onCentered"; }, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTabBodyBase, [null, { optional: true; }, null]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabBody, [null, { optional: true; }, null]>;
 }
 
 // @public
@@ -280,28 +258,9 @@ export class MatTabContent {
 }
 
 // @public
-export class MatTabGroup extends _MatTabGroupBase {
-    constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, defaultConfig?: MatTabsConfig, animationMode?: string);
-    // (undocumented)
-    _allTabs: QueryList<MatTab>;
-    get fitInkBarToContent(): boolean;
-    set fitInkBarToContent(v: BooleanInput);
-    get stretchTabs(): boolean;
-    set stretchTabs(v: BooleanInput);
-    // (undocumented)
-    _tabBodyWrapper: ElementRef;
-    // (undocumented)
-    _tabHeader: MatTabHeader;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabGroup, "mat-tab-group", ["matTabGroup"], { "color": { "alias": "color"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "fitInkBarToContent": { "alias": "fitInkBarToContent"; "required": false; }; "stretchTabs": { "alias": "mat-stretch-tabs"; "required": false; }; }, {}, ["_allTabs"], never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabGroup, [null, null, { optional: true; }, { optional: true; }]>;
-}
-
-// @public
-export abstract class _MatTabGroupBase extends _MatTabGroupMixinBase implements AfterContentInit, AfterContentChecked, OnDestroy, CanColor, CanDisableRipple {
+export class MatTabGroup extends _MatTabGroupMixinBase implements AfterContentInit, AfterContentChecked, OnDestroy, CanColor, CanDisableRipple {
     constructor(elementRef: ElementRef, _changeDetectorRef: ChangeDetectorRef, defaultConfig?: MatTabsConfig, _animationMode?: string | undefined);
-    abstract _allTabs: QueryList<MatTab>;
+    _allTabs: QueryList<MatTab>;
     readonly animationDone: EventEmitter<void>;
     get animationDuration(): string;
     set animationDuration(value: NumberInput);
@@ -309,14 +268,14 @@ export abstract class _MatTabGroupBase extends _MatTabGroupMixinBase implements
     _animationMode?: string | undefined;
     get backgroundColor(): ThemePalette;
     set backgroundColor(value: ThemePalette);
-    // (undocumented)
-    protected _changeDetectorRef: ChangeDetectorRef;
     get contentTabIndex(): number | null;
     set contentTabIndex(value: NumberInput);
     get disablePagination(): boolean;
     set disablePagination(value: BooleanInput);
     get dynamicHeight(): boolean;
     set dynamicHeight(value: BooleanInput);
+    get fitInkBarToContent(): boolean;
+    set fitInkBarToContent(v: BooleanInput);
     readonly focusChange: EventEmitter<MatTabChangeEvent>;
     // (undocumented)
     _focusChanged(index: number): void;
@@ -340,17 +299,19 @@ export abstract class _MatTabGroupBase extends _MatTabGroupMixinBase implements
     readonly selectedIndexChange: EventEmitter<number>;
     readonly selectedTabChange: EventEmitter<MatTabChangeEvent>;
     _setTabBodyWrapperHeight(tabHeight: number): void;
+    get stretchTabs(): boolean;
+    set stretchTabs(v: BooleanInput);
     // (undocumented)
-    abstract _tabBodyWrapper: ElementRef;
+    _tabBodyWrapper: ElementRef;
     _tabFocusChanged(focusOrigin: FocusOrigin, index: number): void;
     // (undocumented)
-    abstract _tabHeader: MatTabGroupBaseHeader;
+    _tabHeader: MatTabHeader;
     _tabs: QueryList<MatTab>;
     updatePagination(): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTabGroupBase, never, never, { "dynamicHeight": { "alias": "dynamicHeight"; "required": false; }; "selectedIndex": { "alias": "selectedIndex"; "required": false; }; "headerPosition": { "alias": "headerPosition"; "required": false; }; "animationDuration": { "alias": "animationDuration"; "required": false; }; "contentTabIndex": { "alias": "contentTabIndex"; "required": false; }; "disablePagination": { "alias": "disablePagination"; "required": false; }; "preserveContent": { "alias": "preserveContent"; "required": false; }; "backgroundColor": { "alias": "backgroundColor"; "required": false; }; }, { "selectedIndexChange": "selectedIndexChange"; "focusChange": "focusChange"; "animationDone": "animationDone"; "selectedTabChange": "selectedTabChange"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabGroup, "mat-tab-group", ["matTabGroup"], { "color": { "alias": "color"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "fitInkBarToContent": { "alias": "fitInkBarToContent"; "required": false; }; "stretchTabs": { "alias": "mat-stretch-tabs"; "required": false; }; "dynamicHeight": { "alias": "dynamicHeight"; "required": false; }; "selectedIndex": { "alias": "selectedIndex"; "required": false; }; "headerPosition": { "alias": "headerPosition"; "required": false; }; "animationDuration": { "alias": "animationDuration"; "required": false; }; "contentTabIndex": { "alias": "contentTabIndex"; "required": false; }; "disablePagination": { "alias": "disablePagination"; "required": false; }; "preserveContent": { "alias": "preserveContent"; "required": false; }; "backgroundColor": { "alias": "backgroundColor"; "required": false; }; }, { "selectedIndexChange": "selectedIndexChange"; "focusChange": "focusChange"; "animationDone": "animationDone"; "selectedTabChange": "selectedTabChange"; }, ["_allTabs"], never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTabGroupBase, [null, null, { optional: true; }, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabGroup, [null, null, { optional: true; }, { optional: true; }]>;
 }
 
 // @public
@@ -364,13 +325,17 @@ export interface MatTabGroupBaseHeader {
 }
 
 // @public
-export class MatTabHeader extends _MatTabHeaderBase implements AfterContentInit {
+export class MatTabHeader extends MatPaginatedTabHeader implements AfterContentChecked, AfterContentInit, AfterViewInit, OnDestroy {
     constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, viewportRuler: ViewportRuler, dir: Directionality, ngZone: NgZone, platform: Platform, animationMode?: string);
+    get disableRipple(): boolean;
+    set disableRipple(value: BooleanInput);
     // (undocumented)
     _inkBar: MatInkBar;
     // (undocumented)
     _items: QueryList<MatTabLabelWrapper>;
     // (undocumented)
+    protected _itemSelected(event: KeyboardEvent): void;
+    // (undocumented)
     _nextPaginator: ElementRef<HTMLElement>;
     // (undocumented)
     ngAfterContentInit(): void;
@@ -383,24 +348,11 @@ export class MatTabHeader extends _MatTabHeaderBase implements AfterContentInit
     // (undocumented)
     _tabListInner: ElementRef;
     // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabHeader, "mat-tab-header", never, { "selectedIndex": { "alias": "selectedIndex"; "required": false; }; }, { "selectFocusedIndex": "selectFocusedIndex"; "indexFocused": "indexFocused"; }, ["_items"], ["*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabHeader, "mat-tab-header", never, { "selectedIndex": { "alias": "selectedIndex"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; }, { "selectFocusedIndex": "selectFocusedIndex"; "indexFocused": "indexFocused"; }, ["_items"], ["*"], false, never>;
     // (undocumented)
     static ɵfac: i0.ɵɵFactoryDeclaration<MatTabHeader, [null, null, null, { optional: true; }, null, null, { optional: true; }]>;
 }
 
-// @public
-export abstract class _MatTabHeaderBase extends MatPaginatedTabHeader implements AfterContentChecked, AfterContentInit, AfterViewInit, OnDestroy {
-    constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, viewportRuler: ViewportRuler, dir: Directionality, ngZone: NgZone, platform: Platform, animationMode?: string);
-    get disableRipple(): boolean;
-    set disableRipple(value: BooleanInput);
-    // (undocumented)
-    protected _itemSelected(event: KeyboardEvent): void;
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTabHeaderBase, never, never, { "disableRipple": { "alias": "disableRipple"; "required": false; }; }, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTabHeaderBase, [null, null, null, { optional: true; }, null, null, { optional: true; }]>;
-}
-
 // @public
 export type MatTabHeaderPosition = 'above' | 'below';
 
@@ -416,15 +368,7 @@ export class MatTabLabel extends CdkPortal {
 }
 
 // @public
-export class MatTabLabelWrapper extends _MatTabLabelWrapperBaseWithInkBarItem implements MatInkBarItem {
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatTabLabelWrapper, "[matTabLabelWrapper]", never, { "disabled": { "alias": "disabled"; "required": false; }; "fitInkBarToContent": { "alias": "fitInkBarToContent"; "required": false; }; }, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabLabelWrapper, never>;
-}
-
-// @public
-export class _MatTabLabelWrapperBase extends _MatTabLabelWrapperMixinBase implements CanDisable {
+export class MatTabLabelWrapper extends _MatTabLabelWrapperMixinBase implements CanDisable {
     constructor(elementRef: ElementRef);
     // (undocumented)
     elementRef: ElementRef;
@@ -434,25 +378,14 @@ export class _MatTabLabelWrapperBase extends _MatTabLabelWrapperMixinBase implem
     // (undocumented)
     getOffsetWidth(): number;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTabLabelWrapperBase, never, never, {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTabLabelWrapperBase, never>;
-}
-
-// @public
-export class MatTabLink extends _MatTabLinkBaseWithInkBarItem implements MatInkBarItem, OnDestroy {
-    constructor(tabNavBar: MatTabNav, elementRef: ElementRef, globalRippleOptions: RippleGlobalOptions | null, tabIndex: string, focusMonitor: FocusMonitor, animationMode?: string);
-    // (undocumented)
-    ngOnDestroy(): void;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabLink, "[mat-tab-link], [matTabLink]", ["matTabLink"], { "disabled": { "alias": "disabled"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "active": { "alias": "active"; "required": false; }; "id": { "alias": "id"; "required": false; }; }, {}, never, ["*"], false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatTabLabelWrapper, "[matTabLabelWrapper]", never, { "disabled": { "alias": "disabled"; "required": false; }; "fitInkBarToContent": { "alias": "fitInkBarToContent"; "required": false; }; }, {}, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabLink, [null, null, { optional: true; }, { attribute: "tabindex"; }, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabLabelWrapper, never>;
 }
 
 // @public
-export class _MatTabLinkBase extends _MatTabLinkMixinBase implements AfterViewInit, OnDestroy, CanDisable, CanDisableRipple, HasTabIndex, RippleTarget, FocusableOption {
-    constructor(_tabNavBar: _MatTabNavBase,
+export class MatTabLink extends _MatTabLinkMixinBase implements AfterViewInit, OnDestroy, CanDisable, CanDisableRipple, HasTabIndex, RippleTarget, FocusableOption {
+    constructor(_tabNavBar: MatTabNav,
     elementRef: ElementRef, globalRippleOptions: RippleGlobalOptions | null, tabIndex: string, _focusMonitor: FocusMonitor, animationMode?: string);
     get active(): boolean;
     set active(value: BooleanInput);
@@ -481,26 +414,34 @@ export class _MatTabLinkBase extends _MatTabLinkMixinBase implements AfterViewIn
     rippleConfig: RippleConfig & RippleGlobalOptions;
     get rippleDisabled(): boolean;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTabLinkBase, never, never, { "active": { "alias": "active"; "required": false; }; "id": { "alias": "id"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabLink, "[mat-tab-link], [matTabLink]", ["matTabLink"], { "disabled": { "alias": "disabled"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabIndex": { "alias": "tabIndex"; "required": false; }; "active": { "alias": "active"; "required": false; }; "id": { "alias": "id"; "required": false; }; }, {}, never, ["*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTabLinkBase, [null, null, { optional: true; }, { attribute: "tabindex"; }, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabLink, [null, null, { optional: true; }, { attribute: "tabindex"; }, null, { optional: true; }]>;
 }
 
 // @public
-export class MatTabNav extends _MatTabNavBase implements AfterContentInit, AfterViewInit {
+export class MatTabNav extends MatPaginatedTabHeader implements AfterContentChecked, AfterContentInit, OnDestroy, AfterViewInit {
     constructor(elementRef: ElementRef, dir: Directionality, ngZone: NgZone, changeDetectorRef: ChangeDetectorRef, viewportRuler: ViewportRuler, platform: Platform, animationMode?: string, defaultConfig?: MatTabsConfig);
     // (undocumented)
     get animationDuration(): string;
     set animationDuration(value: NumberInput);
+    get backgroundColor(): ThemePalette;
+    set backgroundColor(value: ThemePalette);
+    color: ThemePalette;
+    get disableRipple(): boolean;
+    set disableRipple(value: BooleanInput);
     get fitInkBarToContent(): boolean;
     set fitInkBarToContent(v: BooleanInput);
     // (undocumented)
     _fitInkBarToContent: BehaviorSubject<boolean>;
     // (undocumented)
-    _inkBar: MatInkBar;
+    _getRole(): string | null;
     // (undocumented)
+    _inkBar: MatInkBar;
     _items: QueryList<MatTabLink>;
     // (undocumented)
+    protected _itemSelected(): void;
+    // (undocumented)
     _nextPaginator: ElementRef<HTMLElement>;
     // (undocumented)
     ngAfterContentInit(): void;
@@ -516,36 +457,12 @@ export class MatTabNav extends _MatTabNavBase implements AfterContentInit, After
     _tabListContainer: ElementRef;
     // (undocumented)
     _tabListInner: ElementRef;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabNav, "[mat-tab-nav-bar]", ["matTabNavBar", "matTabNav"], { "color": { "alias": "color"; "required": false; }; "fitInkBarToContent": { "alias": "fitInkBarToContent"; "required": false; }; "stretchTabs": { "alias": "mat-stretch-tabs"; "required": false; }; "animationDuration": { "alias": "animationDuration"; "required": false; }; }, {}, ["_items"], ["*"], false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabNav, [null, { optional: true; }, null, null, null, null, { optional: true; }, { optional: true; }]>;
-}
-
-// @public
-export abstract class _MatTabNavBase extends MatPaginatedTabHeader implements AfterContentChecked, AfterContentInit, OnDestroy {
-    constructor(elementRef: ElementRef, dir: Directionality, ngZone: NgZone, changeDetectorRef: ChangeDetectorRef, viewportRuler: ViewportRuler, platform: Platform, animationMode?: string);
-    get backgroundColor(): ThemePalette;
-    set backgroundColor(value: ThemePalette);
-    color: ThemePalette;
-    get disableRipple(): boolean;
-    set disableRipple(value: BooleanInput);
-    // (undocumented)
-    _getRole(): string | null;
-    abstract _items: QueryList<MatPaginatedTabHeaderItem & {
-        active: boolean;
-        id: string;
-    }>;
-    // (undocumented)
-    protected _itemSelected(): void;
-    // (undocumented)
-    ngAfterContentInit(): void;
     tabPanel?: MatTabNavPanel;
     updateActiveLink(): void;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTabNavBase, never, never, { "backgroundColor": { "alias": "backgroundColor"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "color": { "alias": "color"; "required": false; }; "tabPanel": { "alias": "tabPanel"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatTabNav, "[mat-tab-nav-bar]", ["matTabNavBar", "matTabNav"], { "color": { "alias": "color"; "required": false; }; "fitInkBarToContent": { "alias": "fitInkBarToContent"; "required": false; }; "stretchTabs": { "alias": "mat-stretch-tabs"; "required": false; }; "animationDuration": { "alias": "animationDuration"; "required": false; }; "backgroundColor": { "alias": "backgroundColor"; "required": false; }; "disableRipple": { "alias": "disableRipple"; "required": false; }; "tabPanel": { "alias": "tabPanel"; "required": false; }; }, {}, ["_items"], ["*"], false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTabNavBase, [null, { optional: true; }, null, null, null, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatTabNav, [null, { optional: true; }, null, null, null, null, { optional: true; }, { optional: true; }]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/tooltip-testing.md b/tools/public_api_guard/material/tooltip-testing.md
index 6fc44000a5da..af66519d6fd1 100644
--- a/tools/public_api_guard/material/tooltip-testing.md
+++ b/tools/public_api_guard/material/tooltip-testing.md
@@ -4,47 +4,21 @@
 
 ```ts
 
-import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { TestElement } from '@angular/cdk/testing';
 
 // @public
-export class MatTooltipHarness extends _MatTooltipHarnessBase {
-    // (undocumented)
-    protected _disabledClass: string;
-    // (undocumented)
-    protected _hiddenClass: string;
-    // (undocumented)
-    protected _hideAnimationName: string;
-    // (undocumented)
-    static hostSelector: string;
-    // (undocumented)
-    protected _optionalPanel: AsyncFactoryFn<TestElement | null>;
-    // (undocumented)
-    protected _showAnimationName: string;
-    static with<T extends MatTooltipHarness>(this: ComponentHarnessConstructor<T>, options?: TooltipHarnessFilters): HarnessPredicate<T>;
-}
-
-// @public (undocumented)
-export abstract class _MatTooltipHarnessBase extends ComponentHarness {
-    // (undocumented)
-    protected abstract _disabledClass: string;
+export class MatTooltipHarness extends ComponentHarness {
     getTooltipText(): Promise<string>;
-    // (undocumented)
-    protected abstract _hiddenClass: string;
     hide(): Promise<void>;
     // (undocumented)
-    protected abstract _hideAnimationName: string;
+    static hostSelector: string;
     isDisabled(): Promise<boolean>;
     isOpen(): Promise<boolean>;
-    // (undocumented)
-    protected abstract _optionalPanel: AsyncFactoryFn<TestElement | null>;
     show(): Promise<void>;
-    // (undocumented)
-    protected abstract _showAnimationName: string;
+    static with<T extends MatTooltipHarness>(this: ComponentHarnessConstructor<T>, options?: TooltipHarnessFilters): HarnessPredicate<T>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/tooltip.md b/tools/public_api_guard/material/tooltip.md
index 2fde4786cf8f..d71569b56d88 100644
--- a/tools/public_api_guard/material/tooltip.md
+++ b/tools/public_api_guard/material/tooltip.md
@@ -9,7 +9,6 @@ import { AnimationTriggerMetadata } from '@angular/animations';
 import { AriaDescriber } from '@angular/cdk/a11y';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { ChangeDetectorRef } from '@angular/core';
-import { ComponentType } from '@angular/cdk/overlay';
 import { ConnectedPosition } from '@angular/cdk/overlay';
 import { Directionality } from '@angular/cdk/bidi';
 import { ElementRef } from '@angular/core';
@@ -57,32 +56,10 @@ export const MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER: {
 };
 
 // @public
-export class MatTooltip extends _MatTooltipBase<TooltipComponent> {
-    constructor(overlay: Overlay, elementRef: ElementRef<HTMLElement>, scrollDispatcher: ScrollDispatcher, viewContainerRef: ViewContainerRef, ngZone: NgZone, platform: Platform, ariaDescriber: AriaDescriber, focusMonitor: FocusMonitor, scrollStrategy: any, dir: Directionality, defaultOptions: MatTooltipDefaultOptions, _document: any);
-    // (undocumented)
-    protected _addOffset(position: ConnectedPosition): ConnectedPosition;
-    // (undocumented)
-    protected readonly _cssClassPrefix = "mat-mdc";
-    // (undocumented)
-    protected readonly _tooltipComponent: typeof TooltipComponent;
-    // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatTooltip, "[matTooltip]", ["matTooltip"], {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatTooltip, [null, null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, null]>;
-}
-
-// @public
-export const matTooltipAnimations: {
-    readonly tooltipState: AnimationTriggerMetadata;
-};
-
-// @public (undocumented)
-export abstract class _MatTooltipBase<T extends _TooltipComponentBase> implements OnDestroy, AfterViewInit {
+export class MatTooltip implements OnDestroy, AfterViewInit {
     constructor(_overlay: Overlay, _elementRef: ElementRef<HTMLElement>, _scrollDispatcher: ScrollDispatcher, _viewContainerRef: ViewContainerRef, _ngZone: NgZone, _platform: Platform, _ariaDescriber: AriaDescriber, _focusMonitor: FocusMonitor, scrollStrategy: any, _dir: Directionality, _defaultOptions: MatTooltipDefaultOptions, _document: any);
     protected _addOffset(position: ConnectedPosition): ConnectedPosition;
     // (undocumented)
-    protected readonly _cssClassPrefix: string;
-    // (undocumented)
     protected _dir: Directionality;
     get disabled(): boolean;
     set disabled(value: BooleanInput);
@@ -126,18 +103,19 @@ export abstract class _MatTooltipBase<T extends _TooltipComponentBase> implement
         [key: string]: any;
     });
     // (undocumented)
-    protected abstract readonly _tooltipComponent: ComponentType<T>;
-    // (undocumented)
-    _tooltipInstance: T | null;
+    _tooltipInstance: TooltipComponent | null;
     touchGestures: TooltipTouchGestures;
     // (undocumented)
-    protected _viewportMargin: number;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatTooltip, "[matTooltip]", ["matTooltip"], { "position": { "alias": "matTooltipPosition"; "required": false; }; "positionAtOrigin": { "alias": "matTooltipPositionAtOrigin"; "required": false; }; "disabled": { "alias": "matTooltipDisabled"; "required": false; }; "showDelay": { "alias": "matTooltipShowDelay"; "required": false; }; "hideDelay": { "alias": "matTooltipHideDelay"; "required": false; }; "touchGestures": { "alias": "matTooltipTouchGestures"; "required": false; }; "message": { "alias": "matTooltip"; "required": false; }; "tooltipClass": { "alias": "matTooltipClass"; "required": false; }; }, {}, never, never, false, never>;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatTooltipBase<any>, never, never, { "position": { "alias": "matTooltipPosition"; "required": false; }; "positionAtOrigin": { "alias": "matTooltipPositionAtOrigin"; "required": false; }; "disabled": { "alias": "matTooltipDisabled"; "required": false; }; "showDelay": { "alias": "matTooltipShowDelay"; "required": false; }; "hideDelay": { "alias": "matTooltipHideDelay"; "required": false; }; "touchGestures": { "alias": "matTooltipTouchGestures"; "required": false; }; "message": { "alias": "matTooltip"; "required": false; }; "tooltipClass": { "alias": "matTooltipClass"; "required": false; }; }, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatTooltipBase<any>, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatTooltip, [null, null, null, null, null, null, null, null, null, null, { optional: true; }, null]>;
 }
 
+// @public
+export const matTooltipAnimations: {
+    readonly tooltipState: AnimationTriggerMetadata;
+};
+
 // @public
 export interface MatTooltipDefaultOptions {
     disableTooltipInteractivity?: boolean;
@@ -166,34 +144,19 @@ export const SCROLL_THROTTLE_MS = 20;
 export const TOOLTIP_PANEL_CLASS = "mat-mdc-tooltip-panel";
 
 // @public
-export class TooltipComponent extends _TooltipComponentBase {
-    constructor(changeDetectorRef: ChangeDetectorRef, _elementRef: ElementRef<HTMLElement>, animationMode?: string);
-    // (undocumented)
-    _hideAnimation: string;
-    // (undocumented)
-    _isMultiline: boolean;
-    // (undocumented)
-    protected _onShow(): void;
-    // (undocumented)
-    _showAnimation: string;
-    _tooltip: ElementRef<HTMLElement>;
-    // (undocumented)
-    static ɵcmp: i0.ɵɵComponentDeclaration<TooltipComponent, "mat-tooltip-component", never, {}, {}, never, never, false, never>;
-    // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<TooltipComponent, [null, null, { optional: true; }]>;
-}
-
-// @public (undocumented)
-export abstract class _TooltipComponentBase implements OnDestroy {
-    constructor(_changeDetectorRef: ChangeDetectorRef, animationMode?: string);
+export class TooltipComponent implements OnDestroy {
+    constructor(_changeDetectorRef: ChangeDetectorRef, _elementRef: ElementRef<HTMLElement>, animationMode?: string);
     afterHidden(): Observable<void>;
     _cancelPendingAnimations(): void;
+    // (undocumented)
+    protected _elementRef: ElementRef<HTMLElement>;
     _handleAnimationEnd({ animationName }: AnimationEvent): void;
     _handleBodyInteraction(): void;
     // (undocumented)
     _handleMouseLeave({ relatedTarget }: MouseEvent): void;
     hide(delay: number): void;
-    protected abstract readonly _hideAnimation: string;
+    // (undocumented)
+    _isMultiline: boolean;
     isVisible(): boolean;
     _markForCheck(): void;
     message: string;
@@ -202,16 +165,15 @@ export abstract class _TooltipComponentBase implements OnDestroy {
     ngOnDestroy(): void;
     protected _onShow(): void;
     show(delay: number): void;
-    protected abstract readonly _showAnimation: string;
-    abstract _tooltip: ElementRef<HTMLElement>;
+    _tooltip: ElementRef<HTMLElement>;
     tooltipClass: string | string[] | Set<string> | {
         [key: string]: any;
     };
     _triggerElement: HTMLElement;
     // (undocumented)
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_TooltipComponentBase, never, never, {}, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TooltipComponent, "mat-tooltip-component", never, {}, {}, never, never, false, never>;
     // (undocumented)
-    static ɵfac: i0.ɵɵFactoryDeclaration<_TooltipComponentBase, [null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<TooltipComponent, [null, null, { optional: true; }]>;
 }
 
 // @public