Skip to content

Commit 2dcb340

Browse files
committed
fix(multiple): remove legacy-table from material-experimental components
1 parent 22ef3b3 commit 2dcb340

File tree

7 files changed

+16
-21
lines changed

7 files changed

+16
-21
lines changed

src/material-experimental/column-resize/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ng_module(
1212
"//src/cdk-experimental/column-resize",
1313
"//src/cdk/overlay",
1414
"//src/cdk/table",
15-
"//src/material/legacy-table",
15+
"//src/material/table",
1616
"@npm//@angular/core",
1717
],
1818
)
@@ -36,7 +36,7 @@ ng_test_library(
3636
"//src/cdk/keycodes",
3737
"//src/cdk/overlay",
3838
"//src/cdk/testing/private",
39-
"//src/material/legacy-table",
39+
"//src/material/table",
4040
"@npm//rxjs",
4141
],
4242
)

src/material-experimental/column-resize/column-resize.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {BidiModule} from '@angular/cdk/bidi';
44
import {DataSource} from '@angular/cdk/collections';
55
import {dispatchKeyboardEvent} from '../../cdk/testing/private';
66
import {ESCAPE} from '@angular/cdk/keycodes';
7-
import {MatLegacyTableModule} from '@angular/material/legacy-table';
7+
import {MatTableModule} from '@angular/material/table';
88
import {BehaviorSubject} from 'rxjs';
99

1010
import {ColumnSize} from '@angular/cdk-experimental/column-resize';
@@ -372,7 +372,7 @@ describe('Material Popover Edit', () => {
372372
jasmine.addMatchers(approximateMatcher);
373373

374374
TestBed.configureTestingModule({
375-
imports: [BidiModule, MatLegacyTableModule, resizeModule],
375+
imports: [BidiModule, MatTableModule, resizeModule],
376376
declarations: [componentClass],
377377
}).compileComponents();
378378
fixture = TestBed.createComponent(componentClass);

src/material-experimental/popover-edit/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ng_test_library(
4444
"//src/cdk/keycodes",
4545
"//src/cdk/overlay",
4646
"//src/cdk/testing/private",
47-
"//src/material/legacy-table",
47+
"//src/material/table",
4848
"@npm//@angular/common",
4949
"@npm//@angular/forms",
5050
"@npm//rxjs",

src/material-experimental/popover-edit/popover-edit.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {DataSource} from '@angular/cdk/collections';
22
import {LEFT_ARROW, UP_ARROW, RIGHT_ARROW, DOWN_ARROW, TAB} from '@angular/cdk/keycodes';
3-
import {MatLegacyTableModule} from '@angular/material/legacy-table';
3+
import {MatTableModule} from '@angular/material/table';
44
import {dispatchKeyboardEvent} from '../../cdk/testing/private';
55
import {CommonModule} from '@angular/common';
66
import {Component, Directive, ElementRef, ViewChild} from '@angular/core';
@@ -302,7 +302,7 @@ describe('Material Popover Edit', () => {
302302

303303
beforeEach(fakeAsync(() => {
304304
TestBed.configureTestingModule({
305-
imports: [MatLegacyTableModule, MatPopoverEditModule, CommonModule, FormsModule],
305+
imports: [MatTableModule, MatPopoverEditModule, CommonModule, FormsModule],
306306
declarations: [componentClass],
307307
}).compileComponents();
308308
fixture = TestBed.createComponent(componentClass);

src/material-experimental/selection/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ng_module(
1212
deps = [
1313
"//src/cdk-experimental/selection",
1414
"//src/material/checkbox",
15-
"//src/material/legacy-table",
15+
"//src/material/table",
1616
"@npm//@angular/core",
1717
],
1818
)

src/material-experimental/selection/selection-column.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {
10-
MatLegacyCellDef,
11-
MatLegacyColumnDef,
12-
MatLegacyHeaderCellDef,
13-
MatLegacyTable,
14-
} from '@angular/material/legacy-table';
9+
import {MatCellDef, MatColumnDef, MatHeaderCellDef, MatTable} from '@angular/material/table';
1510
import {
1611
Component,
1712
Input,
@@ -67,13 +62,13 @@ export class MatSelectionColumn<T> implements OnInit, OnDestroy {
6762
}
6863
private _name: string;
6964

70-
@ViewChild(MatLegacyColumnDef, {static: true}) private readonly _columnDef: MatLegacyColumnDef;
71-
@ViewChild(MatLegacyCellDef, {static: true}) private readonly _cell: MatLegacyCellDef;
72-
@ViewChild(MatLegacyHeaderCellDef, {static: true})
73-
private readonly _headerCell: MatLegacyHeaderCellDef;
65+
@ViewChild(MatColumnDef, {static: true}) private readonly _columnDef: MatColumnDef;
66+
@ViewChild(MatCellDef, {static: true}) private readonly _cell: MatCellDef;
67+
@ViewChild(MatHeaderCellDef, {static: true})
68+
private readonly _headerCell: MatHeaderCellDef;
7469

7570
constructor(
76-
@Optional() @Inject(MatLegacyTable) private _table: MatLegacyTable<T>,
71+
@Optional() @Inject(MatTable) private _table: MatTable<T>,
7772
@Optional() @Inject(MatSelection) readonly selection: MatSelection<T>,
7873
) {}
7974

src/material-experimental/selection/selection-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// behaviors once we move it out of experimental.
1111
import {CommonModule} from '@angular/common';
1212
import {NgModule} from '@angular/core';
13-
import {MatLegacyTableModule} from '@angular/material/legacy-table';
13+
import {MatTableModule} from '@angular/material/table';
1414
import {MatCheckboxModule} from '@angular/material/checkbox';
1515
import {MatSelectAll} from './select-all';
1616
import {MatSelection} from './selection';
@@ -19,7 +19,7 @@ import {MatSelectionColumn} from './selection-column';
1919
import {MatRowSelection} from './row-selection';
2020

2121
@NgModule({
22-
imports: [CommonModule, MatLegacyTableModule, MatCheckboxModule],
22+
imports: [CommonModule, MatTableModule, MatCheckboxModule],
2323
exports: [MatSelectAll, MatSelection, MatSelectionToggle, MatSelectionColumn, MatRowSelection],
2424
declarations: [
2525
MatSelectAll,

0 commit comments

Comments
 (0)