Skip to content

Commit 0a3a556

Browse files
authored
Switch progress bar and progress spinner docs to MDC (#25659)
* docs(material/progress-bar): switch progress bar docs to use MDC Switches the progress bar docs to use the MDC components. * docs(material/progress-spinner): switch progress spinner docs to use MDC Switches the progress spinner docs to use the MDC components.
1 parent b88b2aa commit 0a3a556

File tree

12 files changed

+68
-53
lines changed

12 files changed

+68
-53
lines changed

src/components-examples/material/progress-bar/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ ng_module(
1515
deps = [
1616
"//src/cdk/testing",
1717
"//src/cdk/testing/testbed",
18-
"//src/material/legacy-card",
19-
"//src/material/legacy-progress-bar",
20-
"//src/material/legacy-progress-bar/testing",
21-
"//src/material/legacy-radio",
22-
"//src/material/legacy-slider",
18+
"//src/material/card",
19+
"//src/material/progress-bar",
20+
"//src/material/progress-bar/testing",
21+
"//src/material/radio",
22+
"//src/material/slider",
2323
"@npm//@angular/forms",
2424
"@npm//@angular/platform-browser",
2525
"@npm//@angular/platform-browser-dynamic",
@@ -43,8 +43,8 @@ ng_test_library(
4343
":progress-bar",
4444
"//src/cdk/testing",
4545
"//src/cdk/testing/testbed",
46-
"//src/material/legacy-progress-bar",
47-
"//src/material/legacy-progress-bar/testing",
46+
"//src/material/progress-bar",
47+
"//src/material/progress-bar/testing",
4848
"@npm//@angular/platform-browser-dynamic",
4949
],
5050
)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
4-
import {MatLegacyCardModule} from '@angular/material/legacy-card';
5-
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
6-
import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
7-
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
4+
import {MatCardModule} from '@angular/material/card';
5+
import {MatProgressBarModule} from '@angular/material/progress-bar';
6+
import {MatRadioModule} from '@angular/material/radio';
7+
import {MatSliderModule} from '@angular/material/slider';
88
import {ProgressBarBufferExample} from './progress-bar-buffer/progress-bar-buffer-example';
99
import {ProgressBarConfigurableExample} from './progress-bar-configurable/progress-bar-configurable-example';
1010
import {ProgressBarDeterminateExample} from './progress-bar-determinate/progress-bar-determinate-example';
@@ -33,10 +33,10 @@ const EXAMPLES = [
3333
@NgModule({
3434
imports: [
3535
CommonModule,
36-
MatLegacyCardModule,
37-
MatLegacyProgressBarModule,
38-
MatLegacyRadioModule,
39-
MatLegacySliderModule,
36+
MatCardModule,
37+
MatProgressBarModule,
38+
MatRadioModule,
39+
MatSliderModule,
4040
FormsModule,
4141
],
4242
declarations: EXAMPLES,

src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@
1212
.example-margin {
1313
margin: 0 10px;
1414
}
15+
16+
.example-card {
17+
margin-bottom: 10px;
18+
}

src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<mat-card>
1+
<mat-card class="example-card">
22
<mat-card-content>
33
<h2 class="example-h2">Progress bar configuration</h2>
44

@@ -37,16 +37,20 @@ <h2 class="example-h2">Progress bar configuration</h2>
3737

3838
<section class="example-section" *ngIf="mode === 'determinate' || mode === 'buffer'">
3939
<label class="example-margin">Progress:</label>
40-
<mat-slider class="example-margin" [(ngModel)]="value"></mat-slider>
40+
<mat-slider class="example-margin">
41+
<input type="range" [(ngModel)]="value" matSliderThumb>
42+
</mat-slider>
4143
</section>
4244
<section class="example-section" *ngIf="mode === 'buffer'">
4345
<label class="example-margin">Buffer:</label>
44-
<mat-slider class="example-margin" [(ngModel)]="bufferValue"></mat-slider>
46+
<mat-slider class="example-margin">
47+
<input type="range" [(ngModel)]="bufferValue" matSliderThumb>
48+
</mat-slider>
4549
</section>
4650
</mat-card-content>
4751
</mat-card>
4852

49-
<mat-card>
53+
<mat-card class="example-card">
5054
<mat-card-content>
5155
<h2 class="example-h2">Result</h2>
5256

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 {LegacyProgressBarMode} from '@angular/material/legacy-progress-bar';
3+
import {ProgressBarMode} from '@angular/material/progress-bar';
44

55
/**
66
* @title Configurable progress-bar
@@ -12,7 +12,7 @@ import {LegacyProgressBarMode} from '@angular/material/legacy-progress-bar';
1212
})
1313
export class ProgressBarConfigurableExample {
1414
color: ThemePalette = 'primary';
15-
mode: LegacyProgressBarMode = 'determinate';
15+
mode: ProgressBarMode = '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 {MatLegacyProgressBarHarness} from '@angular/material/legacy-progress-bar/testing';
3+
import {MatProgressBarHarness} from '@angular/material/progress-bar/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
5+
import {MatProgressBarModule} from '@angular/material/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: [MatLegacyProgressBarModule],
14+
imports: [MatProgressBarModule],
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(MatLegacyProgressBarHarness);
23+
const progressBars = await loader.getAllHarnesses(MatProgressBarHarness);
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(MatLegacyProgressBarHarness);
29+
const [determinate, indeterminate] = await loader.getAllHarnesses(MatProgressBarHarness);
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(MatLegacyProgressBarHarness);
35+
const [determinate, indeterminate] = await loader.getAllHarnesses(MatProgressBarHarness);
3636
expect(await determinate.getMode()).toBe('determinate');
3737
expect(await indeterminate.getMode()).toBe('indeterminate');
3838
});

src/components-examples/material/progress-spinner/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ ng_module(
1515
deps = [
1616
"//src/cdk/testing",
1717
"//src/cdk/testing/testbed",
18-
"//src/material/legacy-card",
19-
"//src/material/legacy-progress-spinner",
20-
"//src/material/legacy-progress-spinner/testing",
21-
"//src/material/legacy-radio",
22-
"//src/material/legacy-slider",
18+
"//src/material/card",
19+
"//src/material/progress-spinner",
20+
"//src/material/progress-spinner/testing",
21+
"//src/material/radio",
22+
"//src/material/slider",
2323
"@npm//@angular/forms",
2424
"@npm//@angular/platform-browser",
2525
"@npm//@angular/platform-browser-dynamic",
@@ -43,8 +43,8 @@ ng_test_library(
4343
":progress-spinner",
4444
"//src/cdk/testing",
4545
"//src/cdk/testing/testbed",
46-
"//src/material/legacy-progress-spinner",
47-
"//src/material/legacy-progress-spinner/testing",
46+
"//src/material/progress-spinner",
47+
"//src/material/progress-spinner/testing",
4848
"@npm//@angular/platform-browser-dynamic",
4949
],
5050
)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
4-
import {MatLegacyCardModule} from '@angular/material/legacy-card';
5-
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
6-
import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
7-
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
4+
import {MatCardModule} from '@angular/material/card';
5+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
6+
import {MatRadioModule} from '@angular/material/radio';
7+
import {MatSliderModule} from '@angular/material/slider';
88
import {ProgressSpinnerConfigurableExample} from './progress-spinner-configurable/progress-spinner-configurable-example';
99
import {ProgressSpinnerOverviewExample} from './progress-spinner-overview/progress-spinner-overview-example';
1010
import {ProgressSpinnerHarnessExample} from './progress-spinner-harness/progress-spinner-harness-example';
@@ -24,10 +24,10 @@ const EXAMPLES = [
2424
@NgModule({
2525
imports: [
2626
CommonModule,
27-
MatLegacyCardModule,
28-
MatLegacyProgressSpinnerModule,
29-
MatLegacyRadioModule,
30-
MatLegacySliderModule,
27+
MatCardModule,
28+
MatProgressSpinnerModule,
29+
MatRadioModule,
30+
MatSliderModule,
3131
FormsModule,
3232
],
3333
declarations: EXAMPLES,

src/components-examples/material/progress-spinner/progress-spinner-configurable/progress-spinner-configurable-example.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@
1212
.example-margin {
1313
margin: 0 10px;
1414
}
15+
16+
.example-card {
17+
margin-bottom: 10px;
18+
}

src/components-examples/material/progress-spinner/progress-spinner-configurable/progress-spinner-configurable-example.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<mat-card>
1+
<mat-card class="example-card">
22
<mat-card-content>
33
<h2 class="example-h2">Progress spinner configuration</h2>
44

@@ -31,11 +31,14 @@ <h2 class="example-h2">Progress spinner configuration</h2>
3131

3232
<section class="example-section" *ngIf="mode === 'determinate'">
3333
<label class="example-margin">Progress:</label>
34-
<mat-slider class="example-margin" [(ngModel)]="value"></mat-slider>
34+
<mat-slider class="example-margin">
35+
<input type="range" [(ngModel)]="value" matSliderThumb>
36+
</mat-slider>
3537
</section>
3638
</mat-card-content>
3739
</mat-card>
38-
<mat-card>
40+
41+
<mat-card class="example-card">
3942
<mat-card-content>
4043
<h2 class="example-h2">Result</h2>
4144

src/components-examples/material/progress-spinner/progress-spinner-configurable/progress-spinner-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 {LegacyProgressSpinnerMode} from '@angular/material/legacy-progress-spinner';
3+
import {ProgressSpinnerMode} from '@angular/material/progress-spinner';
44

55
/**
66
* @title Configurable progress spinner
@@ -12,6 +12,6 @@ import {LegacyProgressSpinnerMode} from '@angular/material/legacy-progress-spinn
1212
})
1313
export class ProgressSpinnerConfigurableExample {
1414
color: ThemePalette = 'primary';
15-
mode: LegacyProgressSpinnerMode = 'determinate';
15+
mode: ProgressSpinnerMode = 'determinate';
1616
value = 50;
1717
}

src/components-examples/material/progress-spinner/progress-spinner-harness/progress-spinner-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 {MatLegacyProgressSpinnerHarness} from '@angular/material/legacy-progress-spinner/testing';
3+
import {MatProgressSpinnerHarness} from '@angular/material/progress-spinner/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
5+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
66
import {ProgressSpinnerHarnessExample} from './progress-spinner-harness-example';
77

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

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

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

2727
it('should get the value', async () => {
2828
fixture.componentInstance.value = 50;
2929
const [determinate, impliedIndeterminate] = await loader.getAllHarnesses(
30-
MatLegacyProgressSpinnerHarness,
30+
MatProgressSpinnerHarness,
3131
);
3232
expect(await determinate.getValue()).toBe(50);
3333
expect(await impliedIndeterminate.getValue()).toBe(null);
3434
});
3535

3636
it('should get the mode', async () => {
3737
const [determinate, impliedIndeterminate] = await loader.getAllHarnesses(
38-
MatLegacyProgressSpinnerHarness,
38+
MatProgressSpinnerHarness,
3939
);
4040
expect(await determinate.getMode()).toBe('determinate');
4141
expect(await impliedIndeterminate.getMode()).toBe('indeterminate');

0 commit comments

Comments
 (0)