refactor: remove mixin classes from public api

src/cdk/table/cell.ts

@@ -45,8 +45,8 @@ export class CdkFooterCellDef implements CellDef {
 
 // Boilerplate for applying mixins to CdkColumnDef.
 /** @docs-private */
-export class CdkColumnDefBase {}
-export const _CdkColumnDefBase: CanStickCtor&typeof CdkColumnDefBase =
+class CdkColumnDefBase {}
+const _CdkColumnDefBase: CanStickCtor&typeof CdkColumnDefBase =
     mixinHasStickyInput(CdkColumnDefBase);
 
 /**

src/cdk/table/row.ts

@@ -77,8 +77,8 @@ export abstract class BaseRowDef implements OnChanges {
 
 // Boilerplate for applying mixins to CdkHeaderRowDef.
 /** @docs-private */
-export class CdkHeaderRowDefBase extends BaseRowDef {}
-export const _CdkHeaderRowDefBase: CanStickCtor&typeof CdkHeaderRowDefBase =
+class CdkHeaderRowDefBase extends BaseRowDef {}
+const _CdkHeaderRowDefBase: CanStickCtor&typeof CdkHeaderRowDefBase =
     mixinHasStickyInput(CdkHeaderRowDefBase);
 
 /**
@@ -103,8 +103,8 @@ export class CdkHeaderRowDef extends _CdkHeaderRowDefBase implements CanStick, O
 
 // Boilerplate for applying mixins to CdkFooterRowDef.
 /** @docs-private */
-export class CdkFooterRowDefBase extends BaseRowDef {}
-export const _CdkFooterRowDefBase: CanStickCtor&typeof CdkFooterRowDefBase =
+class CdkFooterRowDefBase extends BaseRowDef {}
+const _CdkFooterRowDefBase: CanStickCtor&typeof CdkFooterRowDefBase =
     mixinHasStickyInput(CdkFooterRowDefBase);
 
 /**

src/material-experimental/mdc-checkbox/public-api.ts

@@ -17,11 +17,6 @@ export {
   MatCheckboxClickAction,
   MatCheckboxRequiredValidator,
   _MatCheckboxRequiredValidatorModule,
-  /**
-   * @deprecated
-   * @breaking-change 9.0.0
-   */
-  MatCheckboxBase,
   /**
    * @deprecated
    * @breaking-change 9.0.0

src/material/autocomplete/autocomplete.ts

@@ -53,8 +53,8 @@ export class MatAutocompleteSelectedEvent {
 
 // Boilerplate for applying mixins to MatAutocomplete.
 /** @docs-private */
-export class MatAutocompleteBase {}
-export const _MatAutocompleteMixinBase: CanDisableRippleCtor & typeof MatAutocompleteBase =
+class MatAutocompleteBase {}
+const _MatAutocompleteMixinBase: CanDisableRippleCtor & typeof MatAutocompleteBase =
     mixinDisableRipple(MatAutocompleteBase);
 
 /** Default `mat-autocomplete` options that can be overridden. */

src/material/badge/badge.ts

@@ -28,9 +28,9 @@ let nextId = 0;
 
 // Boilerplate for applying mixins to MatBadge.
 /** @docs-private */
-export class MatBadgeBase {}
+class MatBadgeBase {}
 
-export const _MatBadgeMixinBase:
+const _MatBadgeMixinBase:
     CanDisableCtor & typeof MatBadgeBase = mixinDisabled(MatBadgeBase);
 
 export type MatBadgePosition = 'above after' | 'above before' | 'below before' | 'below after';

src/material/button-toggle/button-toggle.ts

@@ -348,8 +348,8 @@ export class MatButtonToggleGroup implements ControlValueAccessor, OnInit, After
 
 // Boilerplate for applying mixins to the MatButtonToggle class.
 /** @docs-private */
-export class MatButtonToggleBase {}
-export const _MatButtonToggleMixinBase: CanDisableRippleCtor & typeof MatButtonToggleBase =
+class MatButtonToggleBase {}
+const _MatButtonToggleMixinBase: CanDisableRippleCtor & typeof MatButtonToggleBase =
     mixinDisableRipple(MatButtonToggleBase);
 
 /** Single button inside of a toggle group. */

src/material/button/button.ts

@@ -51,13 +51,12 @@ const BUTTON_HOST_ATTRIBUTES = [
 
 // Boilerplate for applying mixins to MatButton.
 /** @docs-private */
-export class MatButtonBase {
+class MatButtonBase {
   constructor(public _elementRef: ElementRef) {}
 }
 
-export const _MatButtonMixinBase:
-    CanDisableRippleCtor & CanDisableCtor & CanColorCtor & typeof MatButtonBase =
-        mixinColor(mixinDisabled(mixinDisableRipple(MatButtonBase)));
+const _MatButtonMixinBase: CanDisableRippleCtor & CanDisableCtor & CanColorCtor &
+    typeof MatButtonBase = mixinColor(mixinDisabled(mixinDisableRipple(MatButtonBase)));
 
 /**
  * Material design button.

src/material/checkbox/checkbox.ts

@@ -85,10 +85,10 @@ export class MatCheckboxChange {
 
 // Boilerplate for applying mixins to MatCheckbox.
 /** @docs-private */
-export class MatCheckboxBase {
+class MatCheckboxBase {
   constructor(public _elementRef: ElementRef) {}
 }
-export const _MatCheckboxMixinBase:
+const _MatCheckboxMixinBase:
     HasTabIndexCtor &
     CanColorCtor &
     CanDisableRippleCtor &

src/material/chips/chip-list.ts

@@ -45,14 +45,14 @@ import {MatChipTextControl} from './chip-text-control';
 
 // Boilerplate for applying mixins to MatChipList.
 /** @docs-private */
-export class MatChipListBase {
+class MatChipListBase {
   constructor(public _defaultErrorStateMatcher: ErrorStateMatcher,
               public _parentForm: NgForm,
               public _parentFormGroup: FormGroupDirective,
               /** @docs-private */
               public ngControl: NgControl) {}
 }
-export const _MatChipListMixinBase: CanUpdateErrorStateCtor & typeof MatChipListBase =
+const _MatChipListMixinBase: CanUpdateErrorStateCtor & typeof MatChipListBase =
     mixinErrorState(MatChipListBase);
 
 

src/material/chips/chip.ts

@@ -63,15 +63,12 @@ export class MatChipSelectionChange {
 
 // Boilerplate for applying mixins to MatChip.
 /** @docs-private */
-export class MatChipBase {
+class MatChipBase {
   constructor(public _elementRef: ElementRef) {}
 }
 
-export const _MatChipMixinBase:
-    CanColorCtor & CanDisableRippleCtor & CanDisableCtor & typeof MatChipBase =
-        mixinColor(mixinDisableRipple(mixinDisabled(MatChipBase)), 'primary');
-
-const CHIP_ATTRIBUTE_NAMES = ['mat-basic-chip'];
+const _MatChipMixinBase: CanColorCtor & CanDisableRippleCtor & CanDisableCtor & typeof MatChipBase =
+    mixinColor(mixinDisableRipple(mixinDisabled(MatChipBase)), 'primary');
 
 /**
  * Dummy directive to add CSS class to chip avatar.
@@ -242,15 +239,16 @@ export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDes
   }
 
   _addHostClassName() {
-    // Add class for the different chips
-    for (const attr of CHIP_ATTRIBUTE_NAMES) {
-      if (this._elementRef.nativeElement.hasAttribute(attr) ||
-        this._elementRef.nativeElement.tagName.toLowerCase() === attr) {
-        (this._elementRef.nativeElement as HTMLElement).classList.add(attr);
-        return;
-      }
+    const basicChipAttrName = 'mat-basic-chip';
+    const element = this._elementRef.nativeElement as HTMLElement;
+
+    if (element.hasAttribute(basicChipAttrName) ||
+        element.tagName.toLowerCase() === basicChipAttrName) {
+      element.classList.add(basicChipAttrName);
+      return;
+    } else {
+      element.classList.add('mat-standard-chip');
     }
-    (this._elementRef.nativeElement as HTMLElement).classList.add('mat-standard-chip');
   }
 
   ngOnDestroy() {

src/material/core/option/optgroup.ts

@@ -12,8 +12,8 @@ import {CanDisable, CanDisableCtor, mixinDisabled} from '../common-behaviors/dis
 
 // Boilerplate for applying mixins to MatOptgroup.
 /** @docs-private */
-export class MatOptgroupBase { }
-export const _MatOptgroupMixinBase: CanDisableCtor & typeof MatOptgroupBase =
+class MatOptgroupBase { }
+const _MatOptgroupMixinBase: CanDisableCtor & typeof MatOptgroupBase =
     mixinDisabled(MatOptgroupBase);
 
 // Counter for unique group ids.

src/material/datepicker/datepicker.ts

@@ -73,10 +73,10 @@ export const MAT_DATEPICKER_SCROLL_STRATEGY_FACTORY_PROVIDER = {
 
 // Boilerplate for applying mixins to MatDatepickerContent.
 /** @docs-private */
-export class MatDatepickerContentBase {
+class MatDatepickerContentBase {
   constructor(public _elementRef: ElementRef) { }
 }
-export const _MatDatepickerContentMixinBase: CanColorCtor & typeof MatDatepickerContentBase =
+const _MatDatepickerContentMixinBase: CanColorCtor & typeof MatDatepickerContentBase =
     mixinColor(MatDatepickerContentBase);
 
 /**

src/material/form-field/form-field.ts

@@ -64,15 +64,15 @@ const outlineGapPadding = 5;
  * Boilerplate for applying mixins to MatFormField.
  * @docs-private
  */
-export class MatFormFieldBase {
+class MatFormFieldBase {
   constructor(public _elementRef: ElementRef) { }
 }
 
 /**
  * Base class to which we're applying the form field mixins.
  * @docs-private
  */
-export const _MatFormFieldMixinBase: CanColorCtor & typeof MatFormFieldBase =
+const _MatFormFieldMixinBase: CanColorCtor & typeof MatFormFieldBase =
     mixinColor(MatFormFieldBase, 'primary');
 
 /** Possible appearance styles for the form field. */

src/material/icon/icon.ts

@@ -32,11 +32,10 @@ import {MatIconRegistry} from './icon-registry';
 
 // Boilerplate for applying mixins to MatIcon.
 /** @docs-private */
-export class MatIconBase {
+class MatIconBase {
   constructor(public _elementRef: ElementRef) {}
 }
-export const _MatIconMixinBase: CanColorCtor & typeof MatIconBase =
-    mixinColor(MatIconBase);
+const _MatIconMixinBase: CanColorCtor & typeof MatIconBase = mixinColor(MatIconBase);
 
 /**
  * Injection token used to provide the current location to `MatIcon`.

src/material/input/input.ts

@@ -52,14 +52,14 @@ let nextUniqueId = 0;
 
 // Boilerplate for applying mixins to MatInput.
 /** @docs-private */
-export class MatInputBase {
+class MatInputBase {
   constructor(public _defaultErrorStateMatcher: ErrorStateMatcher,
               public _parentForm: NgForm,
               public _parentFormGroup: FormGroupDirective,
               /** @docs-private */
               public ngControl: NgControl) {}
 }
-export const _MatInputMixinBase: CanUpdateErrorStateCtor & typeof MatInputBase =
+const _MatInputMixinBase: CanUpdateErrorStateCtor & typeof MatInputBase =
     mixinErrorState(MatInputBase);
 
 /** Directive that allows a native input to work inside a `MatFormField`. */

src/material/list/list.ts

@@ -33,14 +33,14 @@ import {takeUntil} from 'rxjs/operators';
 
 // Boilerplate for applying mixins to MatList.
 /** @docs-private */
-export class MatListBase {}
-export const _MatListMixinBase: CanDisableRippleCtor & typeof MatListBase =
+class MatListBase {}
+const _MatListMixinBase: CanDisableRippleCtor & typeof MatListBase =
     mixinDisableRipple(MatListBase);
 
 // Boilerplate for applying mixins to MatListItem.
 /** @docs-private */
-export class MatListItemBase {}
-export const _MatListItemMixinBase: CanDisableRippleCtor & typeof MatListItemBase =
+class MatListItemBase {}
+const _MatListItemMixinBase: CanDisableRippleCtor & typeof MatListItemBase =
     mixinDisableRipple(MatListItemBase);
 
 @Component({

src/material/list/selection-list.ts

@@ -54,13 +54,13 @@ import {MatListAvatarCssMatStyler, MatListIconCssMatStyler} from './list';
 
 
 /** @docs-private */
-export class MatSelectionListBase {}
-export const _MatSelectionListMixinBase: CanDisableRippleCtor & typeof MatSelectionListBase =
+class MatSelectionListBase {}
+const _MatSelectionListMixinBase: CanDisableRippleCtor & typeof MatSelectionListBase =
     mixinDisableRipple(MatSelectionListBase);
 
 /** @docs-private */
-export class MatListOptionBase {}
-export const _MatListOptionMixinBase: CanDisableRippleCtor & typeof MatListOptionBase =
+class MatListOptionBase {}
+const _MatListOptionMixinBase: CanDisableRippleCtor & typeof MatListOptionBase =
     mixinDisableRipple(MatListOptionBase);
 
 /** @docs-private */

src/material/menu/menu-item.ts

@@ -30,8 +30,8 @@ import {MAT_MENU_PANEL, MatMenuPanel} from './menu-panel';
 
 // Boilerplate for applying mixins to MatMenuItem.
 /** @docs-private */
-export class MatMenuItemBase {}
-export const _MatMenuItemMixinBase: CanDisableRippleCtor & CanDisableCtor & typeof MatMenuItemBase =
+class MatMenuItemBase {}
+const _MatMenuItemMixinBase: CanDisableRippleCtor & CanDisableCtor & typeof MatMenuItemBase =
     mixinDisableRipple(mixinDisabled(MatMenuItemBase));
 
 /**

src/material/paginator/paginator.ts

@@ -56,8 +56,8 @@ export class PageEvent {
 
 // Boilerplate for applying mixins to MatPaginator.
 /** @docs-private */
-export class MatPaginatorBase {}
-export const _MatPaginatorBase: CanDisableCtor & HasInitializedCtor & typeof MatPaginatorBase =
+class MatPaginatorBase {}
+const _MatPaginatorBase: CanDisableCtor & HasInitializedCtor & typeof MatPaginatorBase =
     mixinDisabled(mixinInitialized(MatPaginatorBase));
 
 /**

src/material/progress-bar/progress-bar.ts

@@ -31,18 +31,18 @@ import {DOCUMENT} from '@angular/common';
 // TODO(josephperrott): Benchpress tests.
 // TODO(josephperrott): Add ARIA attributes for progress bar "for".
 
-// Boilerplate for applying mixins to MatProgressBar.
-/** @docs-private */
-export class MatProgressBarBase {
-  constructor(public _elementRef: ElementRef) { }
-}
-
 /** Last animation end data. */
 export interface ProgressAnimationEnd {
   value: number;
 }
 
-export const _MatProgressBarMixinBase: CanColorCtor & typeof MatProgressBarBase =
+// Boilerplate for applying mixins to MatProgressBar.
+/** @docs-private */
+class MatProgressBarBase {
+  constructor(public _elementRef: ElementRef) { }
+}
+
+const _MatProgressBarMixinBase: CanColorCtor & typeof MatProgressBarBase =
     mixinColor(MatProgressBarBase, 'primary');
 
 /**

src/material/progress-spinner/progress-spinner.ts

@@ -40,10 +40,10 @@ const BASE_STROKE_WIDTH = 10;
 
 // Boilerplate for applying mixins to MatProgressSpinner.
 /** @docs-private */
-export class MatProgressSpinnerBase {
+class MatProgressSpinnerBase {
   constructor(public _elementRef: ElementRef) {}
 }
-export const _MatProgressSpinnerMixinBase: CanColorCtor & typeof MatProgressSpinnerBase =
+const _MatProgressSpinnerMixinBase: CanColorCtor & typeof MatProgressSpinnerBase =
     mixinColor(MatProgressSpinnerBase, 'primary');
 
 /** Default `mat-progress-spinner` options that can be overridden. */

src/material/radio/radio.ts

@@ -292,7 +292,7 @@ export class MatRadioGroup implements AfterContentInit, ControlValueAccessor {
 
 // Boilerplate for applying mixins to MatRadioButton.
 /** @docs-private */
-export class MatRadioButtonBase {
+class MatRadioButtonBase {
   // Since the disabled property is manually defined for the MatRadioButton and isn't set up in
   // the mixin base class. To be able to use the tabindex mixin, a disabled property must be
   // defined to properly work.
@@ -302,8 +302,8 @@ export class MatRadioButtonBase {
 }
 // As per Material design specifications the selection control radio should use the accent color
 // palette by default. https://material.io/guidelines/components/selection-controls.html
-export const _MatRadioButtonMixinBase:
-    CanColorCtor & CanDisableRippleCtor & HasTabIndexCtor & typeof MatRadioButtonBase =
+const _MatRadioButtonMixinBase: CanColorCtor & CanDisableRippleCtor & HasTabIndexCtor &
+    typeof MatRadioButtonBase =
         mixinColor(mixinDisableRipple(mixinTabIndex(MatRadioButtonBase)), 'accent');
 
 /**

src/material/select/select.ts

@@ -159,14 +159,14 @@ export class MatSelectChange {
 
 // Boilerplate for applying mixins to MatSelect.
 /** @docs-private */
-export class MatSelectBase {
+class MatSelectBase {
   constructor(public _elementRef: ElementRef,
               public _defaultErrorStateMatcher: ErrorStateMatcher,
               public _parentForm: NgForm,
               public _parentFormGroup: FormGroupDirective,
               public ngControl: NgControl) {}
 }
-export const _MatSelectMixinBase:
+const _MatSelectMixinBase:
     CanDisableCtor &
     HasTabIndexCtor &
     CanDisableRippleCtor &

src/material/slide-toggle/slide-toggle.ts

@@ -66,10 +66,10 @@ export class MatSlideToggleChange {
 
 // Boilerplate for applying mixins to MatSlideToggle.
 /** @docs-private */
-export class MatSlideToggleBase {
+class MatSlideToggleBase {
   constructor(public _elementRef: ElementRef) {}
 }
-export const _MatSlideToggleMixinBase:
+const _MatSlideToggleMixinBase:
     HasTabIndexCtor &
     CanColorCtor &
     CanDisableRippleCtor &