Skip to content

Commit 8f11370

Browse files
andrewseguinandrewseguin
authored
feat(material/paginator): Switch paginator implementation to use MDC (#25456)
1 parent 3c60fe9 commit 8f11370

File tree

98 files changed

+762
-695
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+762
-695
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/src/material/legacy-input/** @mmalerba
1919
/src/material/legacy-list/** @andrewseguin @crisbeto @devversion
2020
/src/material/legacy-menu/** @crisbeto
21-
/src/material/paginator/** @andrewseguin
21+
/src/material/legacy-paginator/** @andrewseguin
2222
/src/material/prebuilt-themes/** @andrewseguin
2323
/src/material/legacy-prebuilt-themes/** @andrewseguin
2424
/src/material/legacy-progress-bar/** @andrewseguin @crisbeto
@@ -121,7 +121,7 @@
121121
/src/material/list/** @mmalerba @devversion
122122
/src/material/menu/** @crisbeto
123123
/src/material/select/** @crisbeto
124-
/src/material-experimental/mdc-paginator/** @crisbeto
124+
/src/material/paginator/** @crisbeto
125125
/src/material-experimental/mdc-progress-spinner/** @andrewseguin
126126
/src/material/progress-bar/** @andrewseguin
127127
/src/material/radio/** @mmalerba
@@ -335,7 +335,7 @@
335335
/tools/public_api_guard/material/legacy-input** @mmalerba
336336
/tools/public_api_guard/material/list** @andrewseguin @crisbeto @devversion
337337
/tools/public_api_guard/material/menu** @crisbeto
338-
/tools/public_api_guard/material/paginator** @andrewseguin
338+
/tools/public_api_guard/material/legacy-paginator** @andrewseguin
339339
/tools/public_api_guard/material/legacy-progress-bar** @andrewseguin @crisbeto
340340
/tools/public_api_guard/material/progress-spinner**@andrewseguin @crisbeto
341341
/tools/public_api_guard/material/radio** @andrewseguin @devversion

‎.ng-dev/commit-message.mts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const commitMessage: CommitMessageConfig = {
4747
'material/dialog',
4848
'material/form-field',
4949
'material/input',
50-
'material-experimental/mdc-paginator',
50+
'material/paginator',
5151
'material/progress-bar',
5252
'material-experimental/mdc-progress-spinner',
5353
'material/slide-toggle',
@@ -87,7 +87,7 @@ export const commitMessage: CommitMessageConfig = {
8787
'material/legacy-list',
8888
'material/menu',
8989
'material/legacy-menu',
90-
'material/paginator',
90+
'material/legacy-paginator',
9191
'material/prebuilt-themes',
9292
'material/legacy-prebuilt-themes',
9393
'material/legacy-progress-bar',

‎integration/mdc-migration/golden/src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {MatIconModule} from '@angular/material/icon';
1414
import {MatInputModule} from '@angular/material-experimental/mdc-input';
1515
import {MatListModule} from '@angular/material-experimental/mdc-list';
1616
import {MatMenuModule} from '@angular/material-experimental/mdc-menu';
17-
import {MatPaginatorModule} from '@angular/material-experimental/mdc-paginator';
17+
import {MatPaginatorModule} from '@angular/material/paginator';
1818
import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar';
1919
import {MatProgressSpinnerModule} from '@angular/material-experimental/mdc-progress-spinner';
2020
import {MatRadioModule} from '@angular/material-experimental/mdc-radio';

‎src/components-examples/material-experimental/mdc-table/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ng_module(
2424
"//src/material/legacy-button",
2525
"//src/material/legacy-checkbox",
2626
"//src/material/legacy-input",
27-
"//src/material/paginator",
27+
"//src/material/legacy-paginator",
2828
"//src/material/progress-spinner",
2929
"//src/material/sort",
3030
"//src/material/table/testing",

‎src/components-examples/material-experimental/mdc-table/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle';
66
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatLegacyInputModule} from '@angular/material/legacy-input';
9-
import {MatPaginatorModule} from '@angular/material/paginator';
9+
import {MatLegacyPaginatorModule} from '@angular/material/legacy-paginator';
1010
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
1111
import {MatSortModule} from '@angular/material/sort';
1212
import {MatTableModule} from '@angular/material-experimental/mdc-table';
@@ -123,7 +123,7 @@ const EXAMPLES = [
123123
MatLegacyCheckboxModule,
124124
MatIconModule,
125125
MatLegacyInputModule,
126-
MatPaginatorModule,
126+
MatLegacyPaginatorModule,
127127
MatProgressSpinnerModule,
128128
MatRippleModule,
129129
MatSortModule,

‎src/components-examples/material-experimental/mdc-table/table-http/table-http-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {HttpClient} from '@angular/common/http';
22
import {Component, ViewChild, AfterViewInit} from '@angular/core';
3-
import {MatPaginator} from '@angular/material/paginator';
3+
import {MatLegacyPaginator} from '@angular/material/legacy-paginator';
44
import {MatSort, SortDirection} from '@angular/material/sort';
55
import {merge, Observable, of as observableOf} from 'rxjs';
66
import {catchError, map, startWith, switchMap} from 'rxjs/operators';
@@ -22,7 +22,7 @@ export class TableHttpExample implements AfterViewInit {
2222
isLoadingResults = true;
2323
isRateLimitReached = false;
2424

25-
@ViewChild(MatPaginator) paginator: MatPaginator;
25+
@ViewChild(MatLegacyPaginator) paginator: MatLegacyPaginator;
2626
@ViewChild(MatSort) sort: MatSort;
2727

2828
constructor(private _httpClient: HttpClient) {}

‎src/components-examples/material-experimental/mdc-table/table-overview/table-overview-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {AfterViewInit, Component, ViewChild} from '@angular/core';
2-
import {MatPaginator} from '@angular/material/paginator';
2+
import {MatLegacyPaginator} from '@angular/material/legacy-paginator';
33
import {MatSort} from '@angular/material/sort';
44
import {MatTableDataSource} from '@angular/material/table';
55

@@ -55,7 +55,7 @@ export class TableOverviewExample implements AfterViewInit {
5555
displayedColumns: string[] = ['id', 'name', 'progress', 'fruit'];
5656
dataSource: MatTableDataSource<UserData>;
5757

58-
@ViewChild(MatPaginator) paginator: MatPaginator;
58+
@ViewChild(MatLegacyPaginator) paginator: MatLegacyPaginator;
5959
@ViewChild(MatSort) sort: MatSort;
6060

6161
constructor() {

‎src/components-examples/material-experimental/mdc-table/table-pagination/table-pagination-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {AfterViewInit, Component, ViewChild} from '@angular/core';
2-
import {MatPaginator} from '@angular/material/paginator';
2+
import {MatLegacyPaginator} from '@angular/material/legacy-paginator';
33
import {MatTableDataSource} from '@angular/material/table';
44

55
/**
@@ -14,7 +14,7 @@ export class TablePaginationExample implements AfterViewInit {
1414
displayedColumns: string[] = ['position', 'name', 'weight', 'symbol'];
1515
dataSource = new MatTableDataSource<PeriodicElement>(ELEMENT_DATA);
1616

17-
@ViewChild(MatPaginator) paginator: MatPaginator;
17+
@ViewChild(MatLegacyPaginator) paginator: MatLegacyPaginator;
1818

1919
ngAfterViewInit() {
2020
this.dataSource.paginator = this.paginator;

‎src/components-examples/material/paginator/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ng_module(
1717
"//src/cdk/testing/testbed",
1818
"//src/components-examples/private:localize_types",
1919
"//src/material/legacy-input",
20-
"//src/material/paginator",
21-
"//src/material/paginator/testing",
20+
"//src/material/legacy-paginator",
21+
"//src/material/legacy-paginator/testing",
2222
"@npm//@angular/forms",
2323
"@npm//@angular/platform-browser",
2424
"@npm//@angular/platform-browser-dynamic",
@@ -42,8 +42,8 @@ ng_test_library(
4242
":paginator",
4343
"//src/cdk/testing",
4444
"//src/cdk/testing/testbed",
45-
"//src/material/paginator",
46-
"//src/material/paginator/testing",
45+
"//src/material/legacy-paginator",
46+
"//src/material/legacy-paginator/testing",
4747
"@npm//@angular/platform-browser",
4848
"@npm//@angular/platform-browser-dynamic",
4949
],

‎src/components-examples/material/paginator/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
44
import {MatLegacyInputModule} from '@angular/material/legacy-input';
5-
import {MatPaginatorModule} from '@angular/material/paginator';
5+
import {MatLegacyPaginatorModule} from '@angular/material/legacy-paginator';
66
import {PaginatorConfigurableExample} from './paginator-configurable/paginator-configurable-example';
77
import {PaginatorOverviewExample} from './paginator-overview/paginator-overview-example';
88
import {PaginatorHarnessExample} from './paginator-harness/paginator-harness-example';
@@ -29,7 +29,7 @@ const EXAMPLES = [
2929
imports: [
3030
CommonModule,
3131
MatLegacyInputModule,
32-
MatPaginatorModule,
32+
MatLegacyPaginatorModule,
3333
PaginatorIntlExampleModule,
3434
FormsModule,
3535
],

‎src/components-examples/material/paginator/paginator-configurable/paginator-configurable-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {PageEvent} from '@angular/material/paginator';
2+
import {PageEvent} from '@angular/material/legacy-paginator';
33

44
/**
55
* @title Configurable paginator

‎src/components-examples/material/paginator/paginator-harness/paginator-harness-example.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
3-
import {MatPaginatorHarness} from '@angular/material/paginator/testing';
3+
import {MatLegacyPaginatorHarness} from '@angular/material/legacy-paginator/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatPaginatorModule} from '@angular/material/paginator';
5+
import {MatLegacyPaginatorModule} from '@angular/material/legacy-paginator';
66
import {PaginatorHarnessExample} from './paginator-harness-example';
77
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
88

@@ -13,7 +13,7 @@ describe('PaginatorHarnessExample', () => {
1313

1414
beforeEach(async () => {
1515
await TestBed.configureTestingModule({
16-
imports: [MatPaginatorModule, NoopAnimationsModule],
16+
imports: [MatLegacyPaginatorModule, NoopAnimationsModule],
1717
declarations: [PaginatorHarnessExample],
1818
}).compileComponents();
1919
fixture = TestBed.createComponent(PaginatorHarnessExample);
@@ -23,12 +23,12 @@ describe('PaginatorHarnessExample', () => {
2323
});
2424

2525
it('should load all paginator harnesses', async () => {
26-
const paginators = await loader.getAllHarnesses(MatPaginatorHarness);
26+
const paginators = await loader.getAllHarnesses(MatLegacyPaginatorHarness);
2727
expect(paginators.length).toBe(1);
2828
});
2929

3030
it('should be able to navigate between pages', async () => {
31-
const paginator = await loader.getHarness(MatPaginatorHarness);
31+
const paginator = await loader.getHarness(MatLegacyPaginatorHarness);
3232

3333
expect(instance.pageIndex).toBe(0);
3434
await paginator.goToNextPage();
@@ -38,15 +38,15 @@ describe('PaginatorHarnessExample', () => {
3838
});
3939

4040
it('should be able to go to the last page', async () => {
41-
const paginator = await loader.getHarness(MatPaginatorHarness);
41+
const paginator = await loader.getHarness(MatLegacyPaginatorHarness);
4242

4343
expect(instance.pageIndex).toBe(0);
4444
await paginator.goToLastPage();
4545
expect(instance.pageIndex).toBe(49);
4646
});
4747

4848
it('should be able to set the page size', async () => {
49-
const paginator = await loader.getHarness(MatPaginatorHarness);
49+
const paginator = await loader.getHarness(MatLegacyPaginatorHarness);
5050

5151
expect(instance.pageSize).toBe(10);
5252
await paginator.setPageSize(25);

‎src/components-examples/material/paginator/paginator-harness/paginator-harness-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {PageEvent} from '@angular/material/paginator';
2+
import {PageEvent} from '@angular/material/legacy-paginator';
33

44
/**
55
* @title Testing with MatPaginatorHarness

‎src/components-examples/material/paginator/paginator-intl/paginator-intl-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, Injectable, NgModule} from '@angular/core';
2-
import {MatPaginatorIntl, MatPaginatorModule} from '@angular/material/paginator';
2+
import {MatPaginatorIntl, MatLegacyPaginatorModule} from '@angular/material/legacy-paginator';
33
import {Subject} from 'rxjs';
44

55
@Injectable()
@@ -36,7 +36,7 @@ export class MyCustomPaginatorIntl implements MatPaginatorIntl {
3636
export class PaginatorIntlExample {}
3737

3838
@NgModule({
39-
imports: [MatPaginatorModule],
39+
imports: [MatLegacyPaginatorModule],
4040
declarations: [PaginatorIntlExample],
4141
providers: [{provide: MatPaginatorIntl, useClass: MyCustomPaginatorIntl}],
4242
})

‎src/components-examples/material/table/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ng_module(
2323
"//src/material/legacy-button",
2424
"//src/material/legacy-checkbox",
2525
"//src/material/legacy-input",
26-
"//src/material/paginator",
26+
"//src/material/legacy-paginator",
2727
"//src/material/progress-spinner",
2828
"//src/material/sort",
2929
"//src/material/table",

‎src/components-examples/material/table/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle';
66
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatLegacyInputModule} from '@angular/material/legacy-input';
9-
import {MatPaginatorModule} from '@angular/material/paginator';
9+
import {MatLegacyPaginatorModule} from '@angular/material/legacy-paginator';
1010
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
1111
import {MatSortModule} from '@angular/material/sort';
1212
import {MatTableModule} from '@angular/material/table';
@@ -120,7 +120,7 @@ const EXAMPLES = [
120120
MatLegacyCheckboxModule,
121121
MatIconModule,
122122
MatLegacyInputModule,
123-
MatPaginatorModule,
123+
MatLegacyPaginatorModule,
124124
MatProgressSpinnerModule,
125125
MatRippleModule,
126126
MatSortModule,

‎src/components-examples/material/table/table-http/table-http-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {HttpClient} from '@angular/common/http';
22
import {Component, ViewChild, AfterViewInit} from '@angular/core';
3-
import {MatPaginator} from '@angular/material/paginator';
3+
import {MatLegacyPaginator} from '@angular/material/legacy-paginator';
44
import {MatSort, SortDirection} from '@angular/material/sort';
55
import {merge, Observable, of as observableOf} from 'rxjs';
66
import {catchError, map, startWith, switchMap} from 'rxjs/operators';
@@ -22,7 +22,7 @@ export class TableHttpExample implements AfterViewInit {
2222
isLoadingResults = true;
2323
isRateLimitReached = false;
2424

25-
@ViewChild(MatPaginator) paginator: MatPaginator;
25+
@ViewChild(MatLegacyPaginator) paginator: MatLegacyPaginator;
2626
@ViewChild(MatSort) sort: MatSort;
2727

2828
constructor(private _httpClient: HttpClient) {}

‎src/components-examples/material/table/table-overview/table-overview-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {AfterViewInit, Component, ViewChild} from '@angular/core';
2-
import {MatPaginator} from '@angular/material/paginator';
2+
import {MatLegacyPaginator} from '@angular/material/legacy-paginator';
33
import {MatSort} from '@angular/material/sort';
44
import {MatTableDataSource} from '@angular/material/table';
55

@@ -55,7 +55,7 @@ export class TableOverviewExample implements AfterViewInit {
5555
displayedColumns: string[] = ['id', 'name', 'progress', 'fruit'];
5656
dataSource: MatTableDataSource<UserData>;
5757

58-
@ViewChild(MatPaginator) paginator: MatPaginator;
58+
@ViewChild(MatLegacyPaginator) paginator: MatLegacyPaginator;
5959
@ViewChild(MatSort) sort: MatSort;
6060

6161
constructor() {

‎src/components-examples/material/table/table-pagination/table-pagination-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {AfterViewInit, Component, ViewChild} from '@angular/core';
2-
import {MatPaginator} from '@angular/material/paginator';
2+
import {MatLegacyPaginator} from '@angular/material/legacy-paginator';
33
import {MatTableDataSource} from '@angular/material/table';
44

55
/**
@@ -14,7 +14,7 @@ export class TablePaginationExample implements AfterViewInit {
1414
displayedColumns: string[] = ['position', 'name', 'weight', 'symbol'];
1515
dataSource = new MatTableDataSource<PeriodicElement>(ELEMENT_DATA);
1616

17-
@ViewChild(MatPaginator) paginator: MatPaginator;
17+
@ViewChild(MatLegacyPaginator) paginator: MatLegacyPaginator;
1818

1919
ngAfterViewInit() {
2020
this.dataSource.paginator = this.paginator;

‎src/dev-app/mdc-paginator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ng_module(
1010
":mdc_paginator_demo_scss",
1111
],
1212
deps = [
13-
"//src/material-experimental/mdc-paginator",
1413
"//src/material/card",
1514
"//src/material/form-field",
1615
"//src/material/input",
16+
"//src/material/paginator",
1717
"//src/material/slide-toggle",
1818
"@npm//@angular/forms",
1919
],

‎src/dev-app/mdc-paginator/mdc-paginator-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Component} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
11-
import {MatPaginatorModule, PageEvent} from '@angular/material-experimental/mdc-paginator';
11+
import {MatPaginatorModule, PageEvent} from '@angular/material/paginator';
1212
import {FormsModule} from '@angular/forms';
1313
import {MatCardModule} from '@angular/material/card';
1414
import {MatInputModule} from '@angular/material/input';

‎src/dev-app/paginator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ng_module(
1313
"//src/material/legacy-card",
1414
"//src/material/legacy-form-field",
1515
"//src/material/legacy-input",
16+
"//src/material/legacy-paginator",
1617
"//src/material/legacy-slide-toggle",
17-
"//src/material/paginator",
1818
"@npm//@angular/forms",
1919
],
2020
)

‎src/dev-app/paginator/paginator-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component} from '@angular/core';
10-
import {MatPaginatorModule, PageEvent} from '@angular/material/paginator';
10+
import {MatLegacyPaginatorModule, PageEvent} from '@angular/material/legacy-paginator';
1111
import {CommonModule} from '@angular/common';
1212
import {FormsModule} from '@angular/forms';
1313
import {MatLegacyCardModule} from '@angular/material/legacy-card';
@@ -26,7 +26,7 @@ import {MatLegacySlideToggleModule} from '@angular/material/legacy-slide-toggle'
2626
MatLegacyCardModule,
2727
MatLegacyFormFieldModule,
2828
MatLegacyInputModule,
29-
MatPaginatorModule,
29+
MatLegacyPaginatorModule,
3030
MatLegacySlideToggleModule,
3131
],
3232
})

‎src/material-experimental/_index.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
// MDC-related themes
1818
@forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
1919
mdc-core-density, mdc-core-typography;
20-
@forward './mdc-paginator/paginator-theme' as mdc-paginator-* show mdc-paginator-color,
21-
mdc-paginator-typography, mdc-paginator-density, mdc-paginator-theme;
2220
@forward './mdc-progress-spinner/progress-spinner-theme' as mdc-progress-spinner-* show
2321
mdc-progress-spinner-color, mdc-progress-spinner-typography, mdc-progress-spinner-density,
2422
mdc-progress-spinner-theme;

‎src/material-experimental/config.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
entryPoints = [
22
"column-resize",
33
"mdc-core",
4-
"mdc-paginator",
5-
"mdc-paginator/testing",
64
"mdc-progress-spinner",
75
"mdc-progress-spinner/testing",
86
"mdc-snack-bar",

0 commit comments

Comments
 (0)