Skip to content

Commit ebd742e

Browse files
wagnermacielwagnermaciel
committed
feat(material/legacy-progress-bar): step 2. rename ts symbols
1 parent c959c7d commit ebd742e

File tree

23 files changed

+111
-110
lines changed

23 files changed

+111
-110
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
22
import {MatButtonModule} from '@angular/material/button';
33
import {MatLegacyCardModule} from '@angular/material/legacy-card';
44
import {MatDividerModule} from '@angular/material/divider';
5-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
5+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
66
import {CardFancyExample} from './card-fancy/card-fancy-example';
77
import {CardOverviewExample} from './card-overview/card-overview-example';
88
import {CardHarnessExample} from './card-harness/card-harness-example';
@@ -32,7 +32,7 @@ const EXAMPLES = [
3232
];
3333

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

‎src/components-examples/material/progress-bar/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 {MatLegacyCardModule} from '@angular/material/legacy-card';
5-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
5+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
66
import {MatRadioModule} from '@angular/material/radio';
77
import {MatSliderModule} from '@angular/material/slider';
88
import {ProgressBarBufferExample} from './progress-bar-buffer/progress-bar-buffer-example';
@@ -34,7 +34,7 @@ const EXAMPLES = [
3434
imports: [
3535
CommonModule,
3636
MatLegacyCardModule,
37-
MatProgressBarModule,
37+
MatLegacyProgressBarModule,
3838
MatRadioModule,
3939
MatSliderModule,
4040
FormsModule,

‎src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {ThemePalette} from '@angular/material/core';
3-
import {ProgressBarMode} from '@angular/material/legacy-progress-bar';
3+
import {LegacyProgressBarMode} from '@angular/material/legacy-progress-bar';
44

55
/**
66
* @title Configurable progress-bar
@@ -12,7 +12,7 @@ import {ProgressBarMode} from '@angular/material/legacy-progress-bar';
1212
})
1313
export class ProgressBarConfigurableExample {
1414
color: ThemePalette = 'primary';
15-
mode: ProgressBarMode = 'determinate';
15+
mode: LegacyProgressBarMode = 'determinate';
1616
value = 50;
1717
bufferValue = 75;
1818
}

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

Lines changed: 6 additions & 6 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 {MatProgressBarHarness} from '@angular/material/legacy-progress-bar/testing';
3+
import {MatLegacyProgressBarHarness} from '@angular/material/legacy-progress-bar/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
5+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
66
import {ProgressBarHarnessExample} from './progress-bar-harness-example';
77

88
describe('ProgressBarHarnessExample', () => {
@@ -11,7 +11,7 @@ describe('ProgressBarHarnessExample', () => {
1111

1212
beforeEach(async () => {
1313
await TestBed.configureTestingModule({
14-
imports: [MatProgressBarModule],
14+
imports: [MatLegacyProgressBarModule],
1515
declarations: [ProgressBarHarnessExample],
1616
}).compileComponents();
1717
fixture = TestBed.createComponent(ProgressBarHarnessExample);
@@ -20,19 +20,19 @@ describe('ProgressBarHarnessExample', () => {
2020
});
2121

2222
it('should load all progress bar harnesses', async () => {
23-
const progressBars = await loader.getAllHarnesses(MatProgressBarHarness);
23+
const progressBars = await loader.getAllHarnesses(MatLegacyProgressBarHarness);
2424
expect(progressBars.length).toBe(2);
2525
});
2626

2727
it('should get the value', async () => {
2828
fixture.componentInstance.value = 50;
29-
const [determinate, indeterminate] = await loader.getAllHarnesses(MatProgressBarHarness);
29+
const [determinate, indeterminate] = await loader.getAllHarnesses(MatLegacyProgressBarHarness);
3030
expect(await determinate.getValue()).toBe(50);
3131
expect(await indeterminate.getValue()).toBe(null);
3232
});
3333

3434
it('should get the mode', async () => {
35-
const [determinate, indeterminate] = await loader.getAllHarnesses(MatProgressBarHarness);
35+
const [determinate, indeterminate] = await loader.getAllHarnesses(MatLegacyProgressBarHarness);
3636
expect(await determinate.getMode()).toBe('determinate');
3737
expect(await indeterminate.getMode()).toBe('indeterminate');
3838
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {MatButtonModule} from '@angular/material/button';
44
import {MatCheckboxModule} from '@angular/material/checkbox';
55
import {MatIconModule} from '@angular/material/icon';
66
import {MatInputModule} from '@angular/material/input';
7-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
7+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
88
import {MatTreeModule} from '@angular/material/tree';
99
import {TreeChecklistExample} from './tree-checklist/tree-checklist-example';
1010
import {TreeDynamicExample} from './tree-dynamic/tree-dynamic-example';
@@ -38,7 +38,7 @@ const EXAMPLES = [
3838
MatCheckboxModule,
3939
MatIconModule,
4040
MatInputModule,
41-
MatProgressBarModule,
41+
MatLegacyProgressBarModule,
4242
MatTreeModule,
4343
],
4444
declarations: EXAMPLES,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import {Component} from '@angular/core';
1010
import {MatButtonModule} from '@angular/material/button';
1111
import {MatLegacyCardModule} from '@angular/material/legacy-card';
1212
import {MatDividerModule} from '@angular/material/divider';
13-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
13+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
1414

1515
@Component({
1616
selector: 'card-demo',
1717
templateUrl: 'card-demo.html',
1818
styleUrls: ['card-demo.css'],
1919
standalone: true,
20-
imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatProgressBarModule],
20+
imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatLegacyProgressBarModule],
2121
})
2222
export class CardDemo {
2323
longText =

‎src/dev-app/progress-bar/progress-bar-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {ThemePalette} from '@angular/material/core';
1111
import {FormsModule} from '@angular/forms';
1212
import {MatButtonModule} from '@angular/material/button';
1313
import {MatButtonToggleModule} from '@angular/material/button-toggle';
14-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
14+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
1515

1616
// TODO(josephperrott): Add an automatically filling example progress bar.
1717

@@ -20,7 +20,7 @@ import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
2020
templateUrl: 'progress-bar-demo.html',
2121
styleUrls: ['progress-bar-demo.css'],
2222
standalone: true,
23-
imports: [FormsModule, MatButtonModule, MatButtonToggleModule, MatProgressBarModule],
23+
imports: [FormsModule, MatButtonModule, MatButtonToggleModule, MatLegacyProgressBarModule],
2424
})
2525
export class ProgressBarDemo {
2626
color: ThemePalette = 'primary';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {MatExpansionModule} from '@angular/material/expansion';
1717
import {MatFormFieldModule} from '@angular/material/form-field';
1818
import {MatIconModule} from '@angular/material/icon';
1919
import {MatInputModule} from '@angular/material/input';
20-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
20+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
2121
import {MatTreeModule} from '@angular/material/tree';
2222

2323
@Component({
@@ -38,7 +38,7 @@ import {MatTreeModule} from '@angular/material/tree';
3838
MatIconModule,
3939
MatInputModule,
4040
MatTreeModule,
41-
MatProgressBarModule,
41+
MatLegacyProgressBarModule,
4242
],
4343
})
4444
export class TreeDemo {}

‎src/e2e-app/progress-bar/progress-bar-e2e-module.ts

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

99
import {NgModule} from '@angular/core';
10-
import {MatProgressBarModule} from '@angular/material/legacy-progress-bar';
10+
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
1111
import {ProgressBarE2E} from './progress-bar-e2e';
1212

1313
@NgModule({
14-
imports: [MatProgressBarModule],
14+
imports: [MatLegacyProgressBarModule],
1515
declarations: [ProgressBarE2E],
1616
})
1717
export class ProgressBarE2eModule {}

‎src/material-experimental/mdc-progress-bar/progress-bar.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import {
2424
import {CanColor, mixinColor} from '@angular/material-experimental/mdc-core';
2525
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2626
import {
27-
MatProgressBarDefaultOptions,
28-
MAT_PROGRESS_BAR_DEFAULT_OPTIONS,
29-
ProgressAnimationEnd,
27+
MatLegacyProgressBarDefaultOptions,
28+
MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS,
29+
LegacyProgressAnimationEnd,
3030
} from '@angular/material/legacy-progress-bar';
3131

3232
// Boilerplate for applying mixins to MatProgressBar.
@@ -73,8 +73,8 @@ export class MatProgressBar
7373
private _changeDetectorRef: ChangeDetectorRef,
7474
@Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string,
7575
@Optional()
76-
@Inject(MAT_PROGRESS_BAR_DEFAULT_OPTIONS)
77-
defaults?: MatProgressBarDefaultOptions,
76+
@Inject(MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS)
77+
defaults?: MatLegacyProgressBarDefaultOptions,
7878
) {
7979
super(elementRef);
8080
this._isNoopAnimation = _animationMode === 'NoopAnimations';
@@ -118,7 +118,7 @@ export class MatProgressBar
118118
* be emitted when animations are disabled, nor will it be emitted for modes with continuous
119119
* animations (indeterminate and query).
120120
*/
121-
@Output() readonly animationEnd = new EventEmitter<ProgressAnimationEnd>();
121+
@Output() readonly animationEnd = new EventEmitter<LegacyProgressAnimationEnd>();
122122

123123
/**
124124
* Mode of the progress bar.

‎src/material-experimental/mdc-progress-bar/public-api.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ export * from './progress-bar';
1010
export * from './module';
1111

1212
export {
13-
ProgressAnimationEnd,
14-
MAT_PROGRESS_BAR_LOCATION,
15-
MatProgressBarLocation,
16-
MAT_PROGRESS_BAR_LOCATION_FACTORY,
17-
MAT_PROGRESS_BAR_DEFAULT_OPTIONS,
18-
MatProgressBarDefaultOptions,
13+
LegacyProgressAnimationEnd as ProgressAnimationEnd,
14+
MAT_LEGACY_PROGRESS_BAR_LOCATION as MAT_PROGRESS_BAR_LOCATION,
15+
MatLegacyProgressBarLocation as MatProgressBarLocation,
16+
MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY as MAT_PROGRESS_BAR_LOCATION_FACTORY,
17+
MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS as MAT_PROGRESS_BAR_DEFAULT_OPTIONS,
18+
MatLegacyProgressBarDefaultOptions as MatProgressBarDefaultOptions,
1919
} from '@angular/material/legacy-progress-bar';

‎src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
ComponentHarnessConstructor,
1313
HarnessPredicate,
1414
} from '@angular/cdk/testing';
15-
import {ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing';
15+
import {LegacyProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing';
1616

1717
/** Harness for interacting with an MDC-based `mat-progress-bar` in tests. */
1818
export class MatProgressBarHarness extends ComponentHarness {
@@ -26,7 +26,7 @@ export class MatProgressBarHarness extends ComponentHarness {
2626
*/
2727
static with<T extends MatProgressBarHarness>(
2828
this: ComponentHarnessConstructor<T>,
29-
options: ProgressBarHarnessFilters = {},
29+
options: LegacyProgressBarHarnessFilters = {},
3030
): HarnessPredicate<T> {
3131
return new HarnessPredicate(this, options);
3232
}

‎src/material-experimental/mdc-progress-bar/testing/public-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
*/
88

99
export * from './progress-bar-harness';
10-
export {ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing';
10+
export {LegacyProgressBarHarnessFilters as ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing';

‎src/material/legacy-progress-bar/progress-bar-module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import {NgModule} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
1111
import {MatCommonModule} from '@angular/material/core';
12-
import {MatProgressBar} from './progress-bar';
12+
import {MatLegacyProgressBar} from './progress-bar';
1313

1414
@NgModule({
1515
imports: [CommonModule, MatCommonModule],
16-
exports: [MatProgressBar, MatCommonModule],
17-
declarations: [MatProgressBar],
16+
exports: [MatLegacyProgressBar, MatCommonModule],
17+
declarations: [MatLegacyProgressBar],
1818
})
19-
export class MatProgressBarModule {}
19+
export class MatLegacyProgressBarModule {}

‎src/material/legacy-progress-bar/progress-bar.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import {TestBed, ComponentFixture} from '@angular/core/testing';
22
import {ApplicationRef, Component, DebugElement, Provider, Type} from '@angular/core';
33
import {By} from '@angular/platform-browser';
44
import {dispatchFakeEvent} from '../../cdk/testing/private';
5-
import {MatProgressBarModule, MAT_PROGRESS_BAR_LOCATION} from './index';
6-
import {MatProgressBar, MAT_PROGRESS_BAR_DEFAULT_OPTIONS} from './progress-bar';
5+
import {MatLegacyProgressBarModule, MAT_LEGACY_PROGRESS_BAR_LOCATION} from './index';
6+
import {MatLegacyProgressBar, MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS} from './progress-bar';
77

88
describe('MatProgressBar', () => {
99
let fakePath: string;
@@ -15,11 +15,11 @@ describe('MatProgressBar', () => {
1515
fakePath = '/fake-path';
1616

1717
TestBed.configureTestingModule({
18-
imports: [MatProgressBarModule],
18+
imports: [MatLegacyProgressBarModule],
1919
declarations: [componentType],
2020
providers: [
2121
{
22-
provide: MAT_PROGRESS_BAR_LOCATION,
22+
provide: MAT_LEGACY_PROGRESS_BAR_LOCATION,
2323
useValue: {getPathname: () => fakePath},
2424
},
2525
...providers,
@@ -206,7 +206,7 @@ describe('MatProgressBar', () => {
206206
it('should be able to configure the default progress bar options via DI', () => {
207207
const fixture = createComponent(BasicProgressBar, [
208208
{
209-
provide: MAT_PROGRESS_BAR_DEFAULT_OPTIONS,
209+
provide: MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS,
210210
useValue: {
211211
mode: 'buffer',
212212
color: 'warn',
@@ -257,7 +257,7 @@ describe('MatProgressBar', () => {
257257

258258
describe('animation trigger on determinate setting', () => {
259259
let fixture: ComponentFixture<BasicProgressBar>;
260-
let progressComponent: MatProgressBar;
260+
let progressComponent: MatLegacyProgressBar;
261261
let primaryValueBar: DebugElement;
262262

263263
beforeEach(() => {
@@ -285,7 +285,7 @@ describe('MatProgressBar', () => {
285285

286286
describe('animation trigger on buffer setting', () => {
287287
let fixture: ComponentFixture<BufferProgressBar>;
288-
let progressComponent: MatProgressBar;
288+
let progressComponent: MatLegacyProgressBar;
289289
let primaryValueBar: DebugElement;
290290

291291
beforeEach(() => {

0 commit comments

Comments
 (0)