@angular/material 16.2.2 → 17.0.0-next.1

package/slider/_slider-theme.scss

@@ -1,104 +1,87 @@
-@use 'sass:map';
-
 @use '@material/slider/slider-theme' as mdc-slider-theme;
-@use '@material/theme/theme-color' as mdc-theme-color;
-@use '@material/typography/typography' as mdc-typography;
-@use '@material/theme/variables' as mdc-theme-variables;
-@use '../core/mdc-helpers/mdc-helpers';
 @use '../core/theming/theming';
+@use '../core/theming/inspection';
 @use '../core/typography/typography';
+@use '../core/style/sass-utils';
+@use '../core/tokens/token-utils';
+@use '../core/tokens/m2/mat/slider' as m2-mat-slider;
+@use '../core/tokens/m2/mdc/slider' as m2-mdc-slider;
+
+@mixin base($theme) {
+  // Add default values for tokens not related to color, typography, or density.
+  @include sass-utils.current-selector-or-root() {
+    @include mdc-slider-theme.theme(m2-mdc-slider.get-unthemable-tokens());
+  }
+}
 
+@mixin color($theme) {
+  $is-dark: inspection.get-theme-type($theme) == dark;
+
+  $mdc-color-tokens: token-utils.resolve-elevation(
+    m2-mdc-slider.get-color-tokens($theme),
+    handle-elevation,
+    handle-shadow-color
+  );
+
+  $mat-slider-color-tokens: m2-mat-slider.get-color-tokens($theme);
+
+  // Add values for MDC slider tokens.
+  .mat-mdc-slider {
+    @include mdc-slider-theme.theme($mdc-color-tokens);
+    @include _slider-ripple-color($theme, primary);
+    @include token-utils.create-token-values(
+      m2-mat-slider.$prefix,
+      $mat-slider-color-tokens
+    );
+
+    &.mat-accent {
+      @include mdc-slider-theme.theme(
+          m2-mdc-slider.private-get-color-palette-color-tokens($theme, accent));
+      @include _slider-ripple-color($theme, accent);
+    }
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-
-  @include mdc-helpers.using-mdc-theme($config) {
-    .mat-mdc-slider {
-      $is-dark: map.get($config, is-dark);
-      $on-surface: mdc-theme-color.prop-value(on-surface);
-
-      @include mdc-slider-theme.theme((
-        label-container-color: if($is-dark, white, black),
-        label-label-text-color: if($is-dark, black, white),
-        disabled-handle-color: $on-surface,
-        disabled-active-track-color: $on-surface,
-        disabled-inactive-track-color: $on-surface,
-        with-tick-marks-disabled-container-color: $on-surface,
-      ));
-
-      // Note that technically we can control this using an `rgba` color in `label-container-color`.
-      // We don't do it, because the shapes MDC uses to construct the indicator overlap which causes
-      // their color opacities to stack with an `rgba` color.
-      --mat-mdc-slider-value-indicator-opacity: #{if($is-dark, 0.9, 0.6)};
-
-      &.mat-primary {
-        @include _slider-color(primary, on-primary);
-      }
-
-      &.mat-accent {
-        @include _slider-color(secondary, on-secondary);
-      }
-
-      &.mat-warn {
-        @include _slider-color(error, on-error);
-      }
+    &.mat-warn {
+      @include mdc-slider-theme.theme(
+          m2-mdc-slider.private-get-color-palette-color-tokens($theme, warn));
+      @include _slider-ripple-color($theme, warn);
     }
   }
 }
 
-@mixin typography($config-or-theme) {
-  $config: typography.private-typography-to-2018-config(
-      theming.get-typography-config($config-or-theme));
-  @include mdc-helpers.using-mdc-typography($config) {
-    .mat-mdc-slider {
-      @include mdc-slider-theme.theme((
-        label-label-text-font: mdc-typography.get-font(subtitle2),
-        label-label-text-size: mdc-typography.get-size(subtitle2),
-        label-label-text-line-height: mdc-typography.get-line-height(subtitle2),
-        label-label-text-tracking: mdc-typography.get-tracking(subtitle2),
-        label-label-text-weight: mdc-typography.get-weight(subtitle2),
-      ));
-    }
+@mixin typography($theme) {
+  // Add values for MDC slider tokens.
+  .mat-mdc-slider {
+    @include mdc-slider-theme.theme(m2-mdc-slider.get-typography-tokens($theme));
   }
 }
 
-@mixin density($config-or-theme) {}
+@mixin density($theme) {
+  // Add values for MDC slider tokens.
+  .mat-mdc-slider {
+    @include mdc-slider-theme.theme(m2-mdc-slider.get-density-tokens($theme));
+  }
+}
 
-@mixin theme($theme-or-color-config) {
-  $theme: theming.private-legacy-get-theme($theme-or-color-config);
+@mixin theme($theme) {
   @include theming.private-check-duplicate-theme-styles($theme, 'mat-slider') {
-    $color: theming.get-color-config($theme);
-    $density: theming.get-density-config($theme);
-    $typography: theming.get-typography-config($theme);
-
-    @if $color != null {
-      @include color($color);
+    @include base($theme);
+    @if inspection.theme-has($theme, color) {
+      @include color($theme);
     }
-    @if $density != null {
-      @include density($density);
+    @if inspection.theme-has($theme, density) {
+      @include density($theme);
     }
-    @if $typography != null {
-      @include typography($typography);
+    @if inspection.theme-has($theme, typography) {
+      @include typography($theme);
     }
   }
 }
 
-@mixin _slider-color($color, $on-color) {
-  $ripple-color: map.get(mdc-theme-variables.$property-values, $color);
-  $resolved-color: mdc-theme-color.prop-value($color);
-  $resolved-on-color: mdc-theme-color.prop-value($on-color);
-
-  @include mdc-slider-theme.theme((
-    handle-color: $resolved-color,
-    focus-handle-color: $resolved-color,
-    hover-handle-color: $resolved-color,
-    active-track-color: $resolved-color,
-    inactive-track-color: $resolved-color,
-    with-tick-marks-active-container-color: $resolved-on-color,
-    with-tick-marks-inactive-container-color: $resolved-color,
-  ));
+// Generated MDC ripple color tokens are not being calculated so needs to be set
+@mixin _slider-ripple-color($theme, $palette-name) {
+  $color: inspection.get-theme-color($theme, $palette-name);
 
-  --mat-mdc-slider-ripple-color: #{$ripple-color};
-  --mat-mdc-slider-hover-ripple-color: #{rgba($ripple-color, 0.05)};
-  --mat-mdc-slider-focus-ripple-color: #{rgba($ripple-color, 0.2)};
+  --mat-mdc-slider-ripple-color: #{$color};
+  --mat-mdc-slider-hover-ripple-color: #{rgba($color, 0.05)};
+  --mat-mdc-slider-focus-ripple-color: #{rgba($color, 0.2)};
 }

package/snack-bar/_snack-bar-theme.scss

@@ -1,15 +1,22 @@
 @use '@material/snackbar/snackbar-theme' as mdc-snackbar-theme;
 @use '../core/theming/theming';
+@use '../core/style/sass-utils';
 @use '../core/typography/typography';
 @use '../core/tokens/token-utils';
 @use '../core/tokens/m2/mdc/snack-bar' as tokens-mdc-snack-bar;
 @use '../core/tokens/m2/mat/snack-bar' as tokens-mat-snack-bar;
 
+@mixin base($config-or-theme) {
+    // Add default values for tokens not related to color, typography, or density.
+  @include sass-utils.current-selector-or-root() {
+    @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-unthemable-tokens());
+  }
+}
 
 @mixin color($config-or-theme) {
   $config: theming.get-color-config($config-or-theme);
 
-  .mat-mdc-snack-bar-container {
+  @include sass-utils.current-selector-or-root() {
     @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-color-tokens($config));
     @include token-utils.create-token-values(
       tokens-mat-snack-bar.$prefix,
@@ -22,7 +29,7 @@
   $config: typography.private-typography-to-2018-config(
       theming.get-typography-config($config-or-theme));
 
-  .mat-mdc-snack-bar-container {
+  @include sass-utils.current-selector-or-root() {
     @include mdc-snackbar-theme.theme(tokens-mdc-snack-bar.get-typography-tokens($config));
   }
 }
@@ -36,6 +43,7 @@
     $density: theming.get-density-config($theme);
     $typography: theming.get-typography-config($theme);
 
+    @include base($theme);
     @if $color != null {
       @include color($color);
     }

package/snack-bar/index.d.ts

@@ -30,7 +30,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';
 
 declare namespace i1 {
@@ -42,7 +41,6 @@ declare namespace i1 {
 
 declare namespace i2 {
     export {
-        _MatSnackBarContainerBase,
         MatSnackBarContainer
     }
 }
@@ -67,36 +65,7 @@ export declare function MAT_SNACK_BAR_DEFAULT_OPTIONS_FACTORY(): MatSnackBarConf
 /**
  * Service to dispatch Material Design snack bar messages.
  */
-export declare class MatSnackBar extends _MatSnackBarBase {
-    protected simpleSnackBarComponent: typeof SimpleSnackBar;
-    protected snackBarContainerComponent: typeof MatSnackBarContainer;
-    protected handsetCssClass: string;
-    constructor(overlay: Overlay, live: LiveAnnouncer, injector: Injector, breakpointObserver: BreakpointObserver, parentSnackBar: MatSnackBar, defaultConfig: MatSnackBarConfig);
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBar, [null, null, null, null, { optional: true; skipSelf: true; }, null]>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<MatSnackBar>;
-}
-
-/** Directive that should be applied to each of the snack bar's action buttons. */
-export declare class MatSnackBarAction {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarAction, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatSnackBarAction, "[matSnackBarAction]", never, {}, {}, never, never, false, never>;
-}
-
-/** Directive that should be applied to the element containing the snack bar's action buttons. */
-export declare class MatSnackBarActions {
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarActions, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<MatSnackBarActions, "[matSnackBarActions]", never, {}, {}, never, never, false, never>;
-}
-
-/**
- * Animations used by the Material snack bar.
- * @docs-private
- */
-export declare const matSnackBarAnimations: {
-    readonly snackBarState: AnimationTriggerMetadata;
-};
-
-export declare abstract class _MatSnackBarBase implements OnDestroy {
+export declare class MatSnackBar implements OnDestroy {
     private _overlay;
     private _live;
     private _injector;
@@ -110,15 +79,15 @@ export declare abstract class _MatSnackBarBase implements OnDestroy {
      */
     private _snackBarRefAtThisLevel;
     /** The component that should be rendered as the snack bar's simple component. */
-    protected abstract simpleSnackBarComponent: Type<TextOnlySnackBar>;
+    simpleSnackBarComponent: typeof SimpleSnackBar;
     /** The container component that attaches the provided template or component. */
-    protected abstract snackBarContainerComponent: Type<_MatSnackBarContainerBase>;
+    snackBarContainerComponent: typeof MatSnackBarContainer;
     /** The CSS class to apply for handset mode. */
-    protected abstract handsetCssClass: string;
+    handsetCssClass: string;
     /** Reference to the currently opened snackbar at *any* level. */
     get _openedSnackBarRef(): MatSnackBarRef<any> | null;
     set _openedSnackBarRef(value: MatSnackBarRef<any> | null);
-    constructor(_overlay: Overlay, _live: LiveAnnouncer, _injector: Injector, _breakpointObserver: BreakpointObserver, _parentSnackBar: _MatSnackBarBase, _defaultConfig: MatSnackBarConfig);
+    constructor(_overlay: Overlay, _live: LiveAnnouncer, _injector: Injector, _breakpointObserver: BreakpointObserver, _parentSnackBar: MatSnackBar, _defaultConfig: MatSnackBarConfig);
     /**
      * Creates and dispatches a snack bar with a custom component for the content, removing any
      * currently opened snack bars.
@@ -168,10 +137,30 @@ export declare abstract class _MatSnackBarBase implements OnDestroy {
      * @param snackBarRef Reference to the snack bar.
      */
     private _createInjector;
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatSnackBarBase, [null, null, null, null, { optional: true; skipSelf: true; }, null]>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<_MatSnackBarBase>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBar, [null, null, null, null, { optional: true; skipSelf: true; }, null]>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<MatSnackBar>;
+}
+
+/** Directive that should be applied to each of the snack bar's action buttons. */
+export declare class MatSnackBarAction {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarAction, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatSnackBarAction, "[matSnackBarAction]", never, {}, {}, never, never, false, never>;
+}
+
+/** Directive that should be applied to the element containing the snack bar's action buttons. */
+export declare class MatSnackBarActions {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarActions, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatSnackBarActions, "[matSnackBarActions]", never, {}, {}, never, never, false, never>;
 }
 
+/**
+ * Animations used by the Material snack bar.
+ * @docs-private
+ */
+export declare const matSnackBarAnimations: {
+    readonly snackBarState: AnimationTriggerMetadata;
+};
+
 /**
  * Configuration used when opening a snack-bar.
  */
@@ -206,26 +195,9 @@ export declare class MatSnackBarConfig<D = any> {
  * Internal component that wraps user-provided snack bar content.
  * @docs-private
  */
-export declare class MatSnackBarContainer extends _MatSnackBarContainerBase {
-    /**
-     * Element that will have the `mdc-snackbar__label` class applied if the attached component
-     * or template does not have it. This ensures that the appropriate structure, typography, and
-     * color is applied to the attached view.
-     */
-    _label: ElementRef;
-    /** Applies the correct CSS class to the label based on its content. */
-    protected _afterPortalAttached(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarContainer, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<MatSnackBarContainer, "mat-snack-bar-container", never, {}, {}, never, never, false, never>;
-}
-
-/**
- * Base class for snack bar containers.
- * @docs-private
- */
-export declare abstract class _MatSnackBarContainerBase extends BasePortalOutlet implements OnDestroy {
+export declare class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy {
     private _ngZone;
-    protected _elementRef: ElementRef<HTMLElement>;
+    private _elementRef;
     private _changeDetectorRef;
     private _platform;
     /** The snack bar configuration. */
@@ -250,6 +222,12 @@ export declare abstract class _MatSnackBarContainerBase extends BasePortalOutlet
     _animationState: string;
     /** aria-live value for the live region. */
     _live: AriaLivePoliteness;
+    /**
+     * Element that will have the `mdc-snackbar__label` class applied if the attached component
+     * or template does not have it. This ensures that the appropriate structure, typography, and
+     * color is applied to the attached view.
+     */
+    _label: ElementRef;
     /**
      * Role of the live region. This is only for Firefox as there is a known issue where Firefox +
      * JAWS does not read out aria-live message.
@@ -287,7 +265,7 @@ export declare abstract class _MatSnackBarContainerBase extends BasePortalOutlet
      * Called after the portal contents have been attached. Can be
      * used to modify the DOM once it's guaranteed to be in place.
      */
-    protected _afterPortalAttached(): void;
+    private _afterPortalAttached;
     /**
      * Some browsers won't expose the accessibility node of the live element if there is an
      * `aria-modal` and the live element is outside of it. This method works around the issue by
@@ -303,8 +281,8 @@ export declare abstract class _MatSnackBarContainerBase extends BasePortalOutlet
      * announce it.
      */
     private _screenReaderAnnounce;
-    static ɵfac: i0.ɵɵFactoryDeclaration<_MatSnackBarContainerBase, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatSnackBarContainerBase, never, never, {}, {}, never, never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSnackBarContainer, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatSnackBarContainer, "mat-snack-bar-container", never, {}, {}, never, never, false, never>;
 }
 
 /** Event that is emitted when a snack bar is dismissed. */
@@ -339,7 +317,7 @@ export declare class MatSnackBarRef<T> {
      * The instance of the component making up the content of the snack bar.
      * @docs-private
      */
-    containerInstance: _MatSnackBarContainerBase;
+    containerInstance: MatSnackBarContainer;
     /** Subject for notifying the user that the snack bar has been dismissed. */
     private readonly _afterDismissed;
     /** Subject for notifying the user that the snack bar has opened and appeared. */
@@ -353,7 +331,7 @@ export declare class MatSnackBarRef<T> {
     private _durationTimeoutId;
     /** Whether the snack bar was dismissed using the action button. */
     private _dismissedByAction;
-    constructor(containerInstance: _MatSnackBarContainerBase, _overlayRef: OverlayRef);
+    constructor(containerInstance: MatSnackBarContainer, _overlayRef: OverlayRef);
     /** Dismisses the snack bar. */
     dismiss(): void;
     /** Marks the snackbar action clicked. */

package/snack-bar/testing/index.d.ts

@@ -4,11 +4,12 @@ import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
 
 /** Harness for interacting with an MDC-based mat-snack-bar in tests. */
-export declare class MatSnackBarHarness extends _MatSnackBarHarnessBase {
+export declare class MatSnackBarHarness extends ContentContainerComponentHarness<string> {
     /** The selector for the host element of a `MatSnackBar` instance. */
     static hostSelector: string;
-    protected _messageSelector: string;
-    protected _actionButtonSelector: string;
+    private _messageSelector;
+    private _actionButtonSelector;
+    private _snackBarLiveRegion;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a `MatSnackBarHarness` that meets
      * certain criteria.
@@ -16,17 +17,6 @@ export declare class MatSnackBarHarness extends _MatSnackBarHarnessBase {
      * @return a `HarnessPredicate` configured with the given options.
      */
     static with(options?: SnackBarHarnessFilters): HarnessPredicate<MatSnackBarHarness>;
-    /**
-     * Asserts that the current snack-bar has annotated content. Promise reject
-     * if content is not annotated.
-     */
-    protected _assertContentAnnotated(): Promise<void>;
-}
-
-export declare abstract class _MatSnackBarHarnessBase extends ContentContainerComponentHarness<string> {
-    protected abstract _messageSelector: string;
-    protected abstract _actionButtonSelector: string;
-    private _snackBarLiveRegion;
     /**
      * Gets the role of the snack-bar. The role of a snack-bar is determined based
      * on the ARIA politeness specified in the snack-bar config.
@@ -59,16 +49,11 @@ export declare abstract class _MatSnackBarHarnessBase extends ContentContainerCo
     getMessage(): Promise<string>;
     /** Gets whether the snack-bar has been dismissed. */
     isDismissed(): Promise<boolean>;
-    /**
-     * Asserts that the current snack-bar has annotated content. Promise reject
-     * if content is not annotated.
-     */
-    protected abstract _assertContentAnnotated(): Promise<void>;
     /**
      * Asserts that the current snack-bar has an action defined. Otherwise the
      * promise will reject.
      */
-    protected _assertHasAction(): Promise<void>;
+    private _assertHasAction;
     /** Gets the simple snack bar action button. */
     private _getActionButton;
 }

package/table/index.d.ts

@@ -19,10 +19,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';
 
 declare namespace i1 {
@@ -211,11 +210,7 @@ export declare class MatTable<T> extends CdkTable<T> implements OnInit {
  * interactions. If your app needs to support more advanced use cases, consider implementing your
  * own `DataSource`.
  */
-export declare class MatTableDataSource<T, P extends MatTableDataSourcePaginator = MatTableDataSourcePaginator> extends _MatTableDataSource<T, P> {
-}
-
-/** Shared base class with MDC-based implementation. */
-export declare class _MatTableDataSource<T, P extends MatTableDataSourcePaginator = MatTableDataSourcePaginator> extends DataSource<T> {
+export declare class MatTableDataSource<T, P extends MatPaginator = MatPaginator> extends DataSource<T> {
     /** Stream that emits when a new data array is set on the data source. */
     private readonly _data;
     /** Stream emitting render data to the table (depends on ordered data changes). */
@@ -338,30 +333,6 @@ export declare class _MatTableDataSource<T, P extends MatTableDataSourcePaginato
     disconnect(): void;
 }
 
-/**
- * Interface that matches the required API parts for the MatPaginator's PageEvent.
- * Decoupled so that users can depend on either the legacy or MDC-based paginator.
- */
-export declare interface MatTableDataSourcePageEvent {
-    pageIndex: number;
-    pageSize: number;
-    length: number;
-}
-
-/**
- * Interface that matches the required API parts of the MatPaginator.
- * Decoupled so that users can depend on either the legacy or MDC-based paginator.
- */
-export declare interface MatTableDataSourcePaginator {
-    page: Subject<MatTableDataSourcePageEvent>;
-    pageIndex: number;
-    initialized: Observable<void>;
-    pageSize: number;
-    length: number;
-    firstPage: () => void;
-    lastPage: () => void;
-}
-
 export declare class MatTableModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatTableModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<MatTableModule, [typeof i1.MatTable, typeof i1.MatRecycleRows, typeof i2.MatHeaderCellDef, typeof i3.MatHeaderRowDef, typeof i2.MatColumnDef, typeof i2.MatCellDef, typeof i3.MatRowDef, typeof i2.MatFooterCellDef, typeof i3.MatFooterRowDef, typeof i2.MatHeaderCell, typeof i2.MatCell, typeof i2.MatFooterCell, typeof i3.MatHeaderRow, typeof i3.MatRow, typeof i3.MatFooterRow, typeof i3.MatNoDataRow, typeof i4.MatTextColumn], [typeof i5.MatCommonModule, typeof i6.CdkTableModule], [typeof i5.MatCommonModule, typeof i1.MatTable, typeof i1.MatRecycleRows, typeof i2.MatHeaderCellDef, typeof i3.MatHeaderRowDef, typeof i2.MatColumnDef, typeof i2.MatCellDef, typeof i3.MatRowDef, typeof i2.MatFooterCellDef, typeof i3.MatFooterRowDef, typeof i2.MatHeaderCell, typeof i2.MatCell, typeof i2.MatFooterCell, typeof i3.MatHeaderRow, typeof i3.MatRow, typeof i3.MatFooterRow, typeof i3.MatNoDataRow, typeof i4.MatTextColumn]>;

package/table/testing/index.d.ts

@@ -12,7 +12,7 @@ export declare interface CellHarnessFilters extends BaseHarnessFilters {
     columnName?: string | RegExp;
 }
 
-/** Harness for interacting with an MDC-based Angular Material table cell. */
+/** Harness for interacting with an Angular Material table cell. */
 export declare class MatCellHarness extends _MatCellHarnessBase {
     /** The selector for the host element of a `MatCellHarness` instance. */
     static hostSelector: string;
@@ -32,7 +32,7 @@ export declare abstract class _MatCellHarnessBase extends ContentContainerCompon
     protected static _getCellPredicate<T extends MatCellHarness>(type: ComponentHarnessConstructor<T>, options: CellHarnessFilters): HarnessPredicate<T>;
 }
 
-/** Harness for interacting with an MDC-based Angular Material table footer cell. */
+/** Harness for interacting with an Angular Material table footer cell. */
 export declare class MatFooterCellHarness extends _MatCellHarnessBase {
     /** The selector for the host element of a `MatFooterCellHarness` instance. */
     static hostSelector: string;
@@ -45,7 +45,7 @@ export declare class MatFooterCellHarness extends _MatCellHarnessBase {
     static with(options?: CellHarnessFilters): HarnessPredicate<MatFooterCellHarness>;
 }
 
-/** Harness for interacting with an MDC-based Angular Material table footer row. */
+/** Harness for interacting with an Angular Material table footer row. */
 export declare class MatFooterRowHarness extends _MatRowHarnessBase<typeof MatFooterCellHarness, MatFooterCellHarness> {
     /** The selector for the host element of a `MatFooterRowHarness` instance. */
     static hostSelector: string;
@@ -59,7 +59,7 @@ export declare class MatFooterRowHarness extends _MatRowHarnessBase<typeof MatFo
     static with<T extends MatFooterRowHarness>(this: ComponentHarnessConstructor<T>, options?: RowHarnessFilters): HarnessPredicate<T>;
 }
 
-/** Harness for interacting with an MDC-based Angular Material table header cell. */
+/** Harness for interacting with an Angular Material table header cell. */
 export declare class MatHeaderCellHarness extends _MatCellHarnessBase {
     /** The selector for the host element of a `MatHeaderCellHarness` instance. */
     static hostSelector: string;
@@ -72,7 +72,7 @@ export declare class MatHeaderCellHarness extends _MatCellHarnessBase {
     static with(options?: CellHarnessFilters): HarnessPredicate<MatHeaderCellHarness>;
 }
 
-/** Harness for interacting with an MDC-based Angular Material table header row. */
+/** Harness for interacting with an Angular Material table header row. */
 export declare class MatHeaderRowHarness extends _MatRowHarnessBase<typeof MatHeaderCellHarness, MatHeaderCellHarness> {
     /** The selector for the host element of a `MatHeaderRowHarness` instance. */
     static hostSelector: string;
@@ -86,7 +86,7 @@ export declare class MatHeaderRowHarness extends _MatRowHarnessBase<typeof MatHe
     static with<T extends MatHeaderRowHarness>(this: ComponentHarnessConstructor<T>, options?: RowHarnessFilters): HarnessPredicate<T>;
 }
 
-/** Harness for interacting with an MDC-based Angular Material table row. */
+/** Harness for interacting with an Angular Material table row. */
 export declare class MatRowHarness extends _MatRowHarnessBase<typeof MatCellHarness, MatCellHarness> {
     /** The selector for the host element of a `MatRowHarness` instance. */
     static hostSelector: string;
@@ -116,37 +116,25 @@ export declare interface MatRowHarnessColumnsText {
     [columnName: string]: string;
 }
 
-/** Harness for interacting with an MDC-based mat-table in tests. */
-export declare class MatTableHarness extends _MatTableHarnessBase<typeof MatHeaderRowHarness, MatHeaderRowHarness, typeof MatRowHarness, MatRowHarness, typeof MatFooterRowHarness, MatFooterRowHarness> {
+/** Harness for interacting with a mat-table in tests. */
+export declare class MatTableHarness extends ContentContainerComponentHarness<string> {
     /** The selector for the host element of a `MatTableHarness` instance. */
     static hostSelector: string;
-    protected _headerRowHarness: typeof MatHeaderRowHarness;
-    protected _rowHarness: typeof MatRowHarness;
-    protected _footerRowHarness: typeof MatFooterRowHarness;
+    _headerRowHarness: typeof MatHeaderRowHarness;
+    _rowHarness: typeof MatRowHarness;
+    private _footerRowHarness;
     /**
      * Gets a `HarnessPredicate` that can be used to search for a table with specific attributes.
      * @param options Options for narrowing the search
      * @return a `HarnessPredicate` configured with the given options.
      */
     static with<T extends MatTableHarness>(this: ComponentHarnessConstructor<T>, options?: TableHarnessFilters): HarnessPredicate<T>;
-}
-
-export declare 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> {
-    protected abstract _headerRowHarness: HeaderRowType;
-    protected abstract _rowHarness: RowType;
-    protected abstract _footerRowHarness: FooterRowType;
-    /** Gets all of the header rows in a table. */
-    getHeaderRows(filter?: RowHarnessFilters): Promise<HeaderRow[]>;
-    /** Gets all of the regular data rows in a table. */
-    getRows(filter?: RowHarnessFilters): Promise<Row[]>;
-    /** Gets all of the footer rows in a table. */
-    getFooterRows(filter?: RowHarnessFilters): Promise<FooterRow[]>;
+    /** Gets all the header rows in a table. */
+    getHeaderRows(filter?: RowHarnessFilters): Promise<MatHeaderRowHarness[]>;
+    /** Gets all the regular data rows in a table. */
+    getRows(filter?: RowHarnessFilters): Promise<MatRowHarness[]>;
+    /** Gets all the footer rows in a table. */
+    getFooterRows(filter?: RowHarnessFilters): Promise<MatFooterRowHarness[]>;
     /** Gets the text inside the entire table organized by rows. */
     getCellTextByIndex(): Promise<string[][]>;
     /** Gets the text inside the entire table organized by columns. */
@@ -162,11 +150,6 @@ export declare interface MatTableHarnessColumnsText {
     };
 }
 
-declare interface RowBase extends ComponentHarness {
-    getCellTextByColumnName(): Promise<MatRowHarnessColumnsText>;
-    getCellTextByIndex(): Promise<string[]>;
-}
-
 /** A set of criteria that can be used to filter a list of row harness instances. */
 export declare interface RowHarnessFilters extends BaseHarnessFilters {
 }