Skip to content

Commit c93a2e6

Browse files
committed
2. Rename TypeScript symbols in src/material/legacy-<component>
Perform the following steps to complete the rename and fix all references: 1. Refactor all public symbols in `src/material/legacy-<component>` that start with `Mat<Component>` to `MatLegacy<Component>`. Recommend using Webstorm's refactoring tools for this, since it automatically updates TS references 2. Run `yarn approve-api legacy-<component>; yarn approve-api legacy-<component>/testing` 3. Find any remaining instances of `mat<component>` in the public API: `grep -iF mat<component> tools/public_api_guard/material/legacy-<component>.md tools/public_api_guard/material/legacy-<component>-testing.md`. All instances should be directive or component selectors (i.e. line should start with `static ɵcmp` or `static ɵdir`). If you missed any symbols, repeat steps 1-3 4. Manually inspect `tools/public_api_guard/material/legacy-<component>.md` and `tools/public_api_guard/material/legacy-<component>-testing.md` for any other symbols that need renaming and rename them (e.g. `CardHarnessFilters` should become `LegacyCardHarnessFilters`). 5. Run `yarn format`
1 parent e186c0f commit c93a2e6

File tree

30 files changed

+185
-178
lines changed

30 files changed

+185
-178
lines changed

src/components-examples/material/card/card-harness/card-harness-example.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatButtonHarness} from '@angular/material/button/testing';
4-
import {MatCardHarness} from '@angular/material/legacy-card/testing';
4+
import {MatLegacyCardHarness} from '@angular/material/legacy-card/testing';
55
import {HarnessLoader, parallel} from '@angular/cdk/testing';
6-
import {MatCardModule} from '@angular/material/legacy-card';
6+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
77
import {CardHarnessExample} from './card-harness-example';
88

99
describe('CardHarnessExample', () => {
@@ -12,7 +12,7 @@ describe('CardHarnessExample', () => {
1212

1313
beforeEach(async () => {
1414
await TestBed.configureTestingModule({
15-
imports: [MatCardModule],
15+
imports: [MatLegacyCardModule],
1616
declarations: [CardHarnessExample],
1717
}).compileComponents();
1818
fixture = TestBed.createComponent(CardHarnessExample);
@@ -21,21 +21,21 @@ describe('CardHarnessExample', () => {
2121
});
2222

2323
it('should find card with text', async () => {
24-
const cards = await loader.getAllHarnesses(MatCardHarness.with({text: /spitz breed/}));
24+
const cards = await loader.getAllHarnesses(MatLegacyCardHarness.with({text: /spitz breed/}));
2525
expect(cards.length).toBe(1);
2626
expect(await cards[0].getTitleText()).toBe('Shiba Inu');
2727
});
2828

2929
it('should get subtitle text', async () => {
30-
const cards = await loader.getAllHarnesses(MatCardHarness);
30+
const cards = await loader.getAllHarnesses(MatLegacyCardHarness);
3131
expect(await parallel(() => cards.map(card => card.getSubtitleText()))).toEqual([
3232
'',
3333
'Dog Breed',
3434
]);
3535
});
3636

3737
it('should act as a harness loader for user content', async () => {
38-
const card = await loader.getHarness(MatCardHarness.with({title: 'Shiba Inu'}));
38+
const card = await loader.getHarness(MatLegacyCardHarness.with({title: 'Shiba Inu'}));
3939
const footerSubcomponents = (await card.getAllHarnesses(MatButtonHarness)) ?? [];
4040
expect(footerSubcomponents.length).toBe(2);
4141
});

src/components-examples/material/card/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {NgModule} from '@angular/core';
22
import {MatButtonModule} from '@angular/material/button';
3-
import {MatCardModule} from '@angular/material/legacy-card';
3+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
44
import {MatDividerModule} from '@angular/material/divider';
55
import {MatProgressBarModule} from '@angular/material/progress-bar';
66
import {CardFancyExample} from './card-fancy/card-fancy-example';
@@ -32,7 +32,7 @@ const EXAMPLES = [
3232
];
3333

3434
@NgModule({
35-
imports: [MatButtonModule, MatCardModule, MatDividerModule, MatProgressBarModule],
35+
imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatProgressBarModule],
3636
declarations: EXAMPLES,
3737
exports: EXAMPLES,
3838
})

src/components-examples/material/checkbox/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
4-
import {MatCardModule} from '@angular/material/legacy-card';
4+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatCheckboxModule} from '@angular/material/checkbox';
66
import {MatRadioModule} from '@angular/material/radio';
77
import {CheckboxConfigurableExample} from './checkbox-configurable/checkbox-configurable-example';
@@ -26,7 +26,7 @@ const EXAMPLES = [
2626
@NgModule({
2727
imports: [
2828
CommonModule,
29-
MatCardModule,
29+
MatLegacyCardModule,
3030
MatCheckboxModule,
3131
MatRadioModule,
3232
FormsModule,

src/components-examples/material/datepicker/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, ReactiveFormsModule} from '@angular/forms';
44
import {MatButtonModule} from '@angular/material/button';
5-
import {MatCardModule} from '@angular/material/legacy-card';
5+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
66
import {MatNativeDateModule, MAT_DATE_LOCALE} from '@angular/material/core';
77
import {MatDatepickerModule} from '@angular/material/datepicker';
88
import {MatIconModule} from '@angular/material/icon';
@@ -96,7 +96,7 @@ const EXAMPLES = [
9696
imports: [
9797
CommonModule,
9898
MatButtonModule,
99-
MatCardModule,
99+
MatLegacyCardModule,
100100
MatDatepickerModule,
101101
MatInputModule,
102102
MatIconModule,

src/components-examples/material/progress-bar/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
4-
import {MatCardModule} from '@angular/material/legacy-card';
4+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatProgressBarModule} from '@angular/material/progress-bar';
66
import {MatRadioModule} from '@angular/material/radio';
77
import {MatSliderModule} from '@angular/material/slider';
@@ -33,7 +33,7 @@ const EXAMPLES = [
3333
@NgModule({
3434
imports: [
3535
CommonModule,
36-
MatCardModule,
36+
MatLegacyCardModule,
3737
MatProgressBarModule,
3838
MatRadioModule,
3939
MatSliderModule,

src/components-examples/material/progress-spinner/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
4-
import {MatCardModule} from '@angular/material/legacy-card';
4+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
66
import {MatRadioModule} from '@angular/material/radio';
77
import {MatSliderModule} from '@angular/material/slider';
@@ -24,7 +24,7 @@ const EXAMPLES = [
2424
@NgModule({
2525
imports: [
2626
CommonModule,
27-
MatCardModule,
27+
MatLegacyCardModule,
2828
MatProgressSpinnerModule,
2929
MatRadioModule,
3030
MatSliderModule,

src/components-examples/material/slide-toggle/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {NgModule} from '@angular/core';
22
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
33
import {MatButtonModule} from '@angular/material/button';
4-
import {MatCardModule} from '@angular/material/legacy-card';
4+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatCheckboxModule} from '@angular/material/checkbox';
66
import {MatRadioModule} from '@angular/material/radio';
77
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
@@ -28,7 +28,7 @@ const EXAMPLES = [
2828
imports: [
2929
FormsModule,
3030
MatButtonModule,
31-
MatCardModule,
31+
MatLegacyCardModule,
3232
MatCheckboxModule,
3333
MatRadioModule,
3434
MatSlideToggleModule,

src/components-examples/material/slider/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
4-
import {MatCardModule} from '@angular/material/legacy-card';
4+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
55
import {MatCheckboxModule} from '@angular/material/checkbox';
66
import {MatInputModule} from '@angular/material/input';
77
import {MatSliderModule} from '@angular/material/slider';
@@ -28,7 +28,7 @@ const EXAMPLES = [
2828
imports: [
2929
CommonModule,
3030
FormsModule,
31-
MatCardModule,
31+
MatLegacyCardModule,
3232
MatCheckboxModule,
3333
MatInputModule,
3434
MatSliderModule,

src/dev-app/autocomplete/autocomplete-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {CommonModule} from '@angular/common';
1111
import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms';
1212
import {MatAutocompleteModule} from '@angular/material/autocomplete';
1313
import {MatButtonModule} from '@angular/material/button';
14-
import {MatCardModule} from '@angular/material/legacy-card';
14+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1515
import {MatFormFieldModule} from '@angular/material/form-field';
1616
import {MatInputModule} from '@angular/material/input';
1717
import {Observable} from 'rxjs';
@@ -37,7 +37,7 @@ export interface StateGroup {
3737
FormsModule,
3838
MatAutocompleteModule,
3939
MatButtonModule,
40-
MatCardModule,
40+
MatLegacyCardModule,
4141
MatFormFieldModule,
4242
MatInputModule,
4343
ReactiveFormsModule,

src/dev-app/baseline/baseline-demo.ts

Lines changed: 2 additions & 2 deletions
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 {MatCardModule} from '@angular/material/legacy-card';
11+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1212
import {MatCheckboxModule} from '@angular/material/checkbox';
1313
import {MatFormFieldModule} from '@angular/material/form-field';
1414
import {MatInputModule} from '@angular/material/input';
@@ -23,7 +23,7 @@ import {MatToolbarModule} from '@angular/material/toolbar';
2323
standalone: true,
2424
imports: [
2525
CommonModule,
26-
MatCardModule,
26+
MatLegacyCardModule,
2727
MatCheckboxModule,
2828
MatFormFieldModule,
2929
MatInputModule,

src/dev-app/bottom-sheet/bottom-sheet-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
MatBottomSheetRef,
1717
} from '@angular/material/bottom-sheet';
1818
import {MatButtonModule} from '@angular/material/button';
19-
import {MatCardModule} from '@angular/material/legacy-card';
19+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
2020
import {MatCheckboxModule} from '@angular/material/checkbox';
2121
import {MatFormFieldModule} from '@angular/material/form-field';
2222
import {MatIconModule} from '@angular/material/icon';
@@ -36,7 +36,7 @@ const defaultConfig = new MatBottomSheetConfig();
3636
FormsModule,
3737
MatBottomSheetModule,
3838
MatButtonModule,
39-
MatCardModule,
39+
MatLegacyCardModule,
4040
MatCheckboxModule,
4141
MatFormFieldModule,
4242
MatIconModule,

src/dev-app/card/card-demo.ts

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

99
import {Component} from '@angular/core';
1010
import {MatButtonModule} from '@angular/material/button';
11-
import {MatCardModule} from '@angular/material/legacy-card';
11+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1212
import {MatDividerModule} from '@angular/material/divider';
1313
import {MatProgressBarModule} from '@angular/material/progress-bar';
1414

@@ -17,7 +17,7 @@ import {MatProgressBarModule} from '@angular/material/progress-bar';
1717
templateUrl: 'card-demo.html',
1818
styleUrls: ['card-demo.css'],
1919
standalone: true,
20-
imports: [MatButtonModule, MatCardModule, MatDividerModule, MatProgressBarModule],
20+
imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatProgressBarModule],
2121
})
2222
export class CardDemo {
2323
longText =

src/dev-app/chips/chips-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {COMMA, ENTER} from '@angular/cdk/keycodes';
1111
import {CommonModule} from '@angular/common';
1212
import {FormsModule} from '@angular/forms';
1313
import {MatButtonModule} from '@angular/material/button';
14-
import {MatCardModule} from '@angular/material/legacy-card';
14+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1515
import {MatCheckboxModule} from '@angular/material/checkbox';
1616
import {MatChipInputEvent, MatChipsModule} from '@angular/material/chips';
1717
import {ThemePalette} from '@angular/material/core';
@@ -37,7 +37,7 @@ export interface DemoColor {
3737
CommonModule,
3838
FormsModule,
3939
MatButtonModule,
40-
MatCardModule,
40+
MatLegacyCardModule,
4141
MatCheckboxModule,
4242
MatChipsModule,
4343
MatFormFieldModule,

src/dev-app/dialog/dialog-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {DOCUMENT} from '@angular/common';
1111
import {DragDropModule} from '@angular/cdk/drag-drop';
1212
import {FormsModule} from '@angular/forms';
1313
import {MatButtonModule} from '@angular/material/button';
14-
import {MatCardModule} from '@angular/material/legacy-card';
14+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1515
import {MatCheckboxModule} from '@angular/material/checkbox';
1616
import {
1717
MAT_DIALOG_DATA,
@@ -34,7 +34,7 @@ const defaultDialogConfig = new MatDialogConfig();
3434
imports: [
3535
FormsModule,
3636
MatButtonModule,
37-
MatCardModule,
37+
MatLegacyCardModule,
3838
MatCheckboxModule,
3939
MatDialogModule,
4040
MatFormFieldModule,

src/dev-app/focus-trap/focus-trap-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {MatDialog, MatDialogModule} from '@angular/material/dialog';
2020
import {_supportsShadowDom} from '@angular/cdk/platform';
2121
import {CommonModule} from '@angular/common';
2222
import {MatButtonModule} from '@angular/material/button';
23-
import {MatCardModule} from '@angular/material/legacy-card';
23+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
2424
import {MatToolbarModule} from '@angular/material/toolbar';
2525

2626
@Component({
@@ -41,7 +41,7 @@ export class FocusTrapShadowDomDemo {}
4141
A11yModule,
4242
CommonModule,
4343
MatButtonModule,
44-
MatCardModule,
44+
MatLegacyCardModule,
4545
MatDialogModule,
4646
MatToolbarModule,
4747
FocusTrapShadowDomDemo,

src/dev-app/grid-list/grid-list-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {Component} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
1111
import {FormsModule} from '@angular/forms';
1212
import {MatButtonModule} from '@angular/material/button';
13-
import {MatCardModule} from '@angular/material/legacy-card';
13+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1414
import {MatGridListModule} from '@angular/material/grid-list';
1515
import {MatIconModule} from '@angular/material/icon';
1616

@@ -23,7 +23,7 @@ import {MatIconModule} from '@angular/material/icon';
2323
CommonModule,
2424
FormsModule,
2525
MatButtonModule,
26-
MatCardModule,
26+
MatLegacyCardModule,
2727
MatGridListModule,
2828
MatIconModule,
2929
],

src/dev-app/input/input-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {CommonModule} from '@angular/common';
1111
import {FormControl, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms';
1212
import {MatButtonModule} from '@angular/material/button';
1313
import {MatButtonToggleModule} from '@angular/material/button-toggle';
14-
import {MatCardModule} from '@angular/material/legacy-card';
14+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1515
import {MatCheckboxModule} from '@angular/material/checkbox';
1616
import {ErrorStateMatcher} from '@angular/material/core';
1717
import {FloatLabelType, MatFormFieldModule} from '@angular/material/form-field';
@@ -36,7 +36,7 @@ const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA
3636
FormsModule,
3737
MatButtonModule,
3838
MatButtonToggleModule,
39-
MatCardModule,
39+
MatLegacyCardModule,
4040
MatCheckboxModule,
4141
MatFormFieldModule,
4242
MatIconModule,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {Component} from '@angular/core';
1010
import {MatPaginatorModule, PageEvent} from '@angular/material/paginator';
1111
import {CommonModule} from '@angular/common';
1212
import {FormsModule} from '@angular/forms';
13-
import {MatCardModule} from '@angular/material/legacy-card';
13+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1414
import {MatFormFieldModule} from '@angular/material/form-field';
1515
import {MatInputModule} from '@angular/material/input';
1616
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
@@ -23,7 +23,7 @@ import {MatSlideToggleModule} from '@angular/material/slide-toggle';
2323
imports: [
2424
CommonModule,
2525
FormsModule,
26-
MatCardModule,
26+
MatLegacyCardModule,
2727
MatFormFieldModule,
2828
MatInputModule,
2929
MatPaginatorModule,

src/dev-app/select/select-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {Component, TemplateRef} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
1111
import {FormControl, FormsModule, ReactiveFormsModule, Validators} from '@angular/forms';
1212
import {MatButtonModule} from '@angular/material/button';
13-
import {MatCardModule} from '@angular/material/legacy-card';
13+
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1414
import {ErrorStateMatcher, ThemePalette} from '@angular/material/core';
1515
import {MatDialog, MatDialogModule} from '@angular/material/dialog';
1616
import {FloatLabelType, MatFormFieldModule} from '@angular/material/form-field';
@@ -37,7 +37,7 @@ export class MyErrorStateMatcher implements ErrorStateMatcher {
3737
CommonModule,
3838
FormsModule,
3939
MatButtonModule,
40-
MatCardModule,
40+
MatLegacyCardModule,
4141
MatDialogModule,
4242
MatFormFieldModule,
4343
MatIconModule,

0 commit comments

Comments
 (0)