Skip to content

Commit 9f95123

Browse files
committed
refactor(material/legacy-paginator): rename ts symbols
1 parent 8195f18 commit 9f95123

File tree

7 files changed

+64
-59
lines changed

7 files changed

+64
-59
lines changed

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

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

99
import {Component} from '@angular/core';
10-
import {MatLegacyPaginatorModule, PageEvent} from '@angular/material/legacy-paginator';
10+
import {MatLegacyPaginatorModule, LegacyPageEvent} 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';
@@ -41,9 +41,9 @@ export class LegacyPaginatorDemo {
4141
showFirstLastButtons = true;
4242
disabled = false;
4343

44-
pageEvent: PageEvent;
44+
pageEvent: LegacyPageEvent;
4545

46-
handlePageEvent(e: PageEvent) {
46+
handlePageEvent(e: LegacyPageEvent) {
4747
this.pageEvent = e;
4848
this.length = e.length;
4949
this.pageSize = e.pageSize;

src/material/legacy-paginator/paginator.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import {dispatchMouseEvent} from '@angular/cdk/testing/private';
55
import {ThemePalette} from '@angular/material/core';
66
import {MatSelect} from '@angular/material/legacy-select';
77
import {By} from '@angular/platform-browser';
8-
import {MatLegacyPaginator, MatPaginatorIntl, MatLegacyPaginatorModule} from './index';
9-
import {MAT_PAGINATOR_DEFAULT_OPTIONS, MatPaginatorDefaultOptions} from './paginator';
8+
import {MatLegacyPaginator, MatLegacyPaginatorIntl, MatLegacyPaginatorModule} from './index';
9+
import {MAT_LEGACY_PAGINATOR_DEFAULT_OPTIONS, MatLegacyPaginatorDefaultOptions} from './paginator';
1010
import {MatPaginatorSelectConfig} from '@angular/material/paginator';
1111

1212
describe('MatPaginator', () => {
1313
function createComponent<T>(type: Type<T>, providers: Provider[] = []): ComponentFixture<T> {
1414
TestBed.configureTestingModule({
1515
imports: [MatLegacyPaginatorModule, NoopAnimationsModule],
1616
declarations: [type],
17-
providers: [MatPaginatorIntl, ...providers],
17+
providers: [MatLegacyPaginatorIntl, ...providers],
1818
}).compileComponents();
1919

2020
const fixture = TestBed.createComponent(type);
@@ -103,7 +103,7 @@ describe('MatPaginator', () => {
103103
it('should re-render when the i18n labels change', () => {
104104
const fixture = createComponent(MatPaginatorApp);
105105
const label = fixture.nativeElement.querySelector('.mat-paginator-page-size-label');
106-
const intl = TestBed.inject(MatPaginatorIntl);
106+
const intl = TestBed.inject(MatLegacyPaginatorIntl);
107107

108108
intl.itemsPerPageLabel = '1337 items per page';
109109
intl.changes.next();
@@ -503,13 +503,13 @@ describe('MatPaginator', () => {
503503
it('should be able to configure the default options via a provider', () => {
504504
const fixture = createComponent(MatPaginatorWithoutInputsApp, [
505505
{
506-
provide: MAT_PAGINATOR_DEFAULT_OPTIONS,
506+
provide: MAT_LEGACY_PAGINATOR_DEFAULT_OPTIONS,
507507
useValue: {
508508
pageSize: 7,
509509
pageSizeOptions: [7, 14, 21],
510510
hidePageSize: true,
511511
showFirstLastButtons: true,
512-
} as MatPaginatorDefaultOptions,
512+
} as MatLegacyPaginatorDefaultOptions,
513513
},
514514
]);
515515
const paginator = fixture.componentInstance.paginator;

src/material/legacy-paginator/paginator.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {MatLegacyFormFieldAppearance} from '@angular/material/legacy-form-field'
1919
import {_MatPaginatorBase, MatPaginatorIntl} from '@angular/material/paginator';
2020

2121
/** Object that can be used to configure the default options for the paginator module. */
22-
export interface MatPaginatorDefaultOptions {
22+
export interface MatLegacyPaginatorDefaultOptions {
2323
/** Number of items to display on a page. By default set to 50. */
2424
pageSize?: number;
2525

@@ -37,9 +37,8 @@ export interface MatPaginatorDefaultOptions {
3737
}
3838

3939
/** Injection token that can be used to provide the default options for the paginator module. */
40-
export const MAT_PAGINATOR_DEFAULT_OPTIONS = new InjectionToken<MatPaginatorDefaultOptions>(
41-
'MAT_PAGINATOR_DEFAULT_OPTIONS',
42-
);
40+
export const MAT_LEGACY_PAGINATOR_DEFAULT_OPTIONS =
41+
new InjectionToken<MatLegacyPaginatorDefaultOptions>('MAT_LEGACY_PAGINATOR_DEFAULT_OPTIONS');
4342

4443
/**
4544
* Component to provide navigation between paged information. Displays the size of the current
@@ -59,14 +58,16 @@ export const MAT_PAGINATOR_DEFAULT_OPTIONS = new InjectionToken<MatPaginatorDefa
5958
changeDetection: ChangeDetectionStrategy.OnPush,
6059
encapsulation: ViewEncapsulation.None,
6160
})
62-
export class MatLegacyPaginator extends _MatPaginatorBase<MatPaginatorDefaultOptions> {
61+
export class MatLegacyPaginator extends _MatPaginatorBase<MatLegacyPaginatorDefaultOptions> {
6362
/** If set, styles the "page size" form field with the designated style. */
6463
_formFieldAppearance?: MatLegacyFormFieldAppearance;
6564

6665
constructor(
6766
intl: MatPaginatorIntl,
6867
changeDetectorRef: ChangeDetectorRef,
69-
@Optional() @Inject(MAT_PAGINATOR_DEFAULT_OPTIONS) defaults?: MatPaginatorDefaultOptions,
68+
@Optional()
69+
@Inject(MAT_LEGACY_PAGINATOR_DEFAULT_OPTIONS)
70+
defaults?: MatLegacyPaginatorDefaultOptions,
7071
) {
7172
super(intl, changeDetectorRef, defaults);
7273

src/material/legacy-paginator/public-api.ts

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

9-
export * from './paginator-module';
10-
export * from './paginator';
9+
export {MatLegacyPaginatorModule} from './paginator-module';
1110
export {
12-
MatPaginatorIntl,
13-
MAT_PAGINATOR_INTL_PROVIDER_FACTORY,
14-
MAT_PAGINATOR_INTL_PROVIDER,
15-
PageEvent,
16-
MatPaginatorSelectConfig,
17-
_MatPaginatorBase,
11+
MatLegacyPaginatorDefaultOptions,
12+
MAT_LEGACY_PAGINATOR_DEFAULT_OPTIONS,
13+
MatLegacyPaginator,
14+
} from './paginator';
15+
export {
16+
MatPaginatorIntl as MatLegacyPaginatorIntl,
17+
MAT_PAGINATOR_INTL_PROVIDER_FACTORY as MAT_LEGACY_PAGINATOR_INTL_PROVIDER_FACTORY,
18+
MAT_PAGINATOR_INTL_PROVIDER as MAT_LEGACY_PAGINATOR_INTL_PROVIDER,
19+
PageEvent as LegacyPageEvent,
20+
MatPaginatorSelectConfig as MatLegacyPaginatorSelectConfig,
21+
_MatPaginatorBase as _MatLegacyPaginatorBase,
1822
} from '@angular/material/paginator';

src/material/legacy-paginator/testing/public-api.ts

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

9-
export * from './paginator-harness';
9+
export {MatLegacyPaginatorHarness} from './paginator-harness';
1010
export {
11-
_MatPaginatorHarnessBase,
12-
PaginatorHarnessFilters,
11+
_MatPaginatorHarnessBase as _MatLegacyPaginatorHarnessBase,
12+
PaginatorHarnessFilters as LegacyPaginatorHarnessFilters,
1313
} from '@angular/material/paginator/testing';

tools/public_api_guard/material/legacy-paginator-testing.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66

77
import { AsyncFactoryFn } from '@angular/cdk/testing';
88
import { HarnessPredicate } from '@angular/cdk/testing';
9+
import { PaginatorHarnessFilters as LegacyPaginatorHarnessFilters } from '@angular/material/paginator/testing';
10+
import { _MatPaginatorHarnessBase as _MatLegacyPaginatorHarnessBase } from '@angular/material/paginator/testing';
911
import { MatLegacySelectHarness } from '@angular/material/legacy-select/testing';
10-
import { _MatPaginatorHarnessBase } from '@angular/material/paginator/testing';
11-
import { PaginatorHarnessFilters } from '@angular/material/paginator/testing';
1212
import { TestElement } from '@angular/cdk/testing';
1313

14+
export { LegacyPaginatorHarnessFilters }
15+
1416
// @public
15-
export class MatLegacyPaginatorHarness extends _MatPaginatorHarnessBase {
17+
export class MatLegacyPaginatorHarness extends _MatLegacyPaginatorHarnessBase {
1618
// (undocumented)
1719
protected _firstPageButton: AsyncFactoryFn<TestElement | null>;
1820
static hostSelector: string;
@@ -28,12 +30,10 @@ export class MatLegacyPaginatorHarness extends _MatPaginatorHarnessBase {
2830
protected _rangeLabel: AsyncFactoryFn<TestElement>;
2931
// (undocumented)
3032
protected _select: AsyncFactoryFn<MatLegacySelectHarness | null>;
31-
static with(options?: PaginatorHarnessFilters): HarnessPredicate<MatLegacyPaginatorHarness>;
33+
static with(options?: LegacyPaginatorHarnessFilters): HarnessPredicate<MatLegacyPaginatorHarness>;
3234
}
3335

34-
export { _MatPaginatorHarnessBase }
35-
36-
export { PaginatorHarnessFilters }
36+
export { _MatLegacyPaginatorHarnessBase }
3737

3838
// (No @packageDocumentation comment for this package)
3939

tools/public_api_guard/material/legacy-paginator.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,57 +12,57 @@ import * as i4 from '@angular/material/legacy-select';
1212
import * as i5 from '@angular/material/legacy-tooltip';
1313
import * as i6 from '@angular/material/core';
1414
import { InjectionToken } from '@angular/core';
15-
import { MAT_PAGINATOR_INTL_PROVIDER } from '@angular/material/paginator';
16-
import { MAT_PAGINATOR_INTL_PROVIDER_FACTORY } from '@angular/material/paginator';
15+
import { PageEvent as LegacyPageEvent } from '@angular/material/paginator';
16+
import { MAT_PAGINATOR_INTL_PROVIDER as MAT_LEGACY_PAGINATOR_INTL_PROVIDER } from '@angular/material/paginator';
17+
import { MAT_PAGINATOR_INTL_PROVIDER_FACTORY as MAT_LEGACY_PAGINATOR_INTL_PROVIDER_FACTORY } from '@angular/material/paginator';
1718
import { MatLegacyFormFieldAppearance } from '@angular/material/legacy-form-field';
18-
import { _MatPaginatorBase } from '@angular/material/paginator';
19-
import { MatPaginatorIntl } from '@angular/material/paginator';
20-
import { MatPaginatorSelectConfig } from '@angular/material/paginator';
21-
import { PageEvent } from '@angular/material/paginator';
19+
import { _MatPaginatorBase as _MatLegacyPaginatorBase } from '@angular/material/paginator';
20+
import { MatPaginatorIntl as MatLegacyPaginatorIntl } from '@angular/material/paginator';
21+
import { MatPaginatorSelectConfig as MatLegacyPaginatorSelectConfig } from '@angular/material/paginator';
22+
23+
export { LegacyPageEvent }
2224

2325
// @public
24-
export const MAT_PAGINATOR_DEFAULT_OPTIONS: InjectionToken<MatPaginatorDefaultOptions>;
26+
export const MAT_LEGACY_PAGINATOR_DEFAULT_OPTIONS: InjectionToken<MatLegacyPaginatorDefaultOptions>;
2527

26-
export { MAT_PAGINATOR_INTL_PROVIDER }
28+
export { MAT_LEGACY_PAGINATOR_INTL_PROVIDER }
2729

28-
export { MAT_PAGINATOR_INTL_PROVIDER_FACTORY }
30+
export { MAT_LEGACY_PAGINATOR_INTL_PROVIDER_FACTORY }
2931

3032
// @public
31-
export class MatLegacyPaginator extends _MatPaginatorBase<MatPaginatorDefaultOptions> {
32-
constructor(intl: MatPaginatorIntl, changeDetectorRef: ChangeDetectorRef, defaults?: MatPaginatorDefaultOptions);
33+
export class MatLegacyPaginator extends _MatLegacyPaginatorBase<MatLegacyPaginatorDefaultOptions> {
34+
constructor(intl: MatLegacyPaginatorIntl, changeDetectorRef: ChangeDetectorRef, defaults?: MatLegacyPaginatorDefaultOptions);
3335
_formFieldAppearance?: MatLegacyFormFieldAppearance;
3436
// (undocumented)
3537
static ɵcmp: i0.ɵɵComponentDeclaration<MatLegacyPaginator, "mat-paginator", ["matPaginator"], { "disabled": "disabled"; }, {}, never, never, false>;
3638
// (undocumented)
3739
static ɵfac: i0.ɵɵFactoryDeclaration<MatLegacyPaginator, [null, null, { optional: true; }]>;
3840
}
3941

40-
// @public (undocumented)
41-
export class MatLegacyPaginatorModule {
42-
// (undocumented)
43-
static ɵfac: i0.ɵɵFactoryDeclaration<MatLegacyPaginatorModule, never>;
44-
// (undocumented)
45-
static ɵinj: i0.ɵɵInjectorDeclaration<MatLegacyPaginatorModule>;
46-
// (undocumented)
47-
static ɵmod: i0.ɵɵNgModuleDeclaration<MatLegacyPaginatorModule, [typeof i1.MatLegacyPaginator], [typeof i2.CommonModule, typeof i3.MatLegacyButtonModule, typeof i4.MatLegacySelectModule, typeof i5.MatLegacyTooltipModule, typeof i6.MatCommonModule], [typeof i1.MatLegacyPaginator]>;
48-
}
49-
50-
export { _MatPaginatorBase }
42+
export { _MatLegacyPaginatorBase }
5143

5244
// @public
53-
export interface MatPaginatorDefaultOptions {
45+
export interface MatLegacyPaginatorDefaultOptions {
5446
formFieldAppearance?: MatLegacyFormFieldAppearance;
5547
hidePageSize?: boolean;
5648
pageSize?: number;
5749
pageSizeOptions?: number[];
5850
showFirstLastButtons?: boolean;
5951
}
6052

61-
export { MatPaginatorIntl }
53+
export { MatLegacyPaginatorIntl }
6254

63-
export { MatPaginatorSelectConfig }
55+
// @public (undocumented)
56+
export class MatLegacyPaginatorModule {
57+
// (undocumented)
58+
static ɵfac: i0.ɵɵFactoryDeclaration<MatLegacyPaginatorModule, never>;
59+
// (undocumented)
60+
static ɵinj: i0.ɵɵInjectorDeclaration<MatLegacyPaginatorModule>;
61+
// (undocumented)
62+
static ɵmod: i0.ɵɵNgModuleDeclaration<MatLegacyPaginatorModule, [typeof i1.MatLegacyPaginator], [typeof i2.CommonModule, typeof i3.MatLegacyButtonModule, typeof i4.MatLegacySelectModule, typeof i5.MatLegacyTooltipModule, typeof i6.MatCommonModule], [typeof i1.MatLegacyPaginator]>;
63+
}
6464

65-
export { PageEvent }
65+
export { MatLegacyPaginatorSelectConfig }
6666

6767
// (No @packageDocumentation comment for this package)
6868

0 commit comments

Comments
 (0)