Skip to content

Commit 3442d6a

Browse files
committed
feat(material/legacy-progress-bar): step 4. move mdc folder
1 parent 67910c2 commit 3442d6a

38 files changed

+269
-130
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
/src/material-experimental/mdc-select/** @crisbeto
120120
/src/material-experimental/mdc-paginator/** @crisbeto
121121
/src/material-experimental/mdc-progress-spinner/** @andrewseguin
122-
/src/material-experimental/mdc-progress-bar/** @andrewseguin
122+
/src/material/progress-bar/** @andrewseguin
123123
/src/material-experimental/mdc-radio/** @mmalerba
124124
/src/material-experimental/mdc-snack-bar/** @andrewseguin
125125
/src/material-experimental/mdc-slide-toggle/** @crisbeto

.ng-dev/commit-message.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const commitMessage: CommitMessageConfig = {
5252
'material-experimental/mdc-list',
5353
'material-experimental/mdc-menu',
5454
'material-experimental/mdc-paginator',
55-
'material-experimental/mdc-progress-bar',
55+
'material/progress-bar',
5656
'material-experimental/mdc-progress-spinner',
5757
'material-experimental/mdc-radio',
5858
'material-experimental/mdc-select',

src/dev-app/mdc-progress-bar/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ ng_module(
1111
],
1212
deps = [
1313
"//src/material-experimental/mdc-button",
14-
"//src/material-experimental/mdc-progress-bar",
1514
"//src/material/button-toggle",
15+
"//src/material/progress-bar",
1616
"@npm//@angular/forms",
1717
],
1818
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {Component} from '@angular/core';
1010
import {ThemePalette} from '@angular/material-experimental/mdc-core';
1111
import {CommonModule} from '@angular/common';
1212
import {FormsModule} from '@angular/forms';
13-
import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar';
13+
import {MatProgressBarModule} from '@angular/material/progress-bar';
1414
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
1515
import {MatButtonToggleModule} from '@angular/material/button-toggle';
1616

src/e2e-app/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ ng_module(
4848
"//src/material-experimental/mdc-dialog",
4949
"//src/material-experimental/mdc-input",
5050
"//src/material-experimental/mdc-menu",
51-
"//src/material-experimental/mdc-progress-bar",
5251
"//src/material-experimental/mdc-progress-spinner",
5352
"//src/material-experimental/mdc-radio",
5453
"//src/material-experimental/mdc-slide-toggle",
@@ -67,6 +66,7 @@ ng_module(
6766
"//src/material/legacy-progress-bar",
6867
"//src/material/list",
6968
"//src/material/menu",
69+
"//src/material/progress-bar",
7070
"//src/material/progress-spinner",
7171
"//src/material/radio",
7272
"//src/material/select",

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

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

99
import {NgModule} from '@angular/core';
10-
import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar';
10+
import {MatProgressBarModule} from '@angular/material/progress-bar';
1111
import {MdcProgressBarE2E} from './mdc-progress-bar-e2e';
1212

1313
@NgModule({

src/material-experimental/_index.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
mdc-menu-density, mdc-menu-theme;
4646
@forward './mdc-paginator/paginator-theme' as mdc-paginator-* show mdc-paginator-color,
4747
mdc-paginator-typography, mdc-paginator-density, mdc-paginator-theme;
48-
@forward './mdc-progress-bar/progress-bar-theme' as mdc-progress-bar-* show mdc-progress-bar-color,
49-
mdc-progress-bar-typography, mdc-progress-bar-density, mdc-progress-bar-theme;
5048
@forward './mdc-progress-spinner/progress-spinner-theme' as mdc-progress-spinner-* show
5149
mdc-progress-spinner-color, mdc-progress-spinner-typography, mdc-progress-spinner-density,
5250
mdc-progress-spinner-theme;

src/material-experimental/config.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ entryPoints = [
2222
"mdc-menu/testing",
2323
"mdc-paginator",
2424
"mdc-paginator/testing",
25-
"mdc-progress-bar",
26-
"mdc-progress-bar/testing",
2725
"mdc-progress-spinner",
2826
"mdc-progress-spinner/testing",
2927
"mdc-radio",

src/material-experimental/mdc-core/color/_all-color.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
7777
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7878
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
79-
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
8180
@forward '../../mdc-input/input-theme' as mat-mdc-input-*;
8281
@forward '../../mdc-form-field/form-field-density' as mat-mdc-*;

src/material-experimental/mdc-core/density/_all-density.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
7777
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7878
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
79-
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
8180
@forward '../../mdc-input/input-theme' as mat-mdc-input-*;
8281
@forward '../../mdc-form-field/form-field-density' as mat-mdc-*;

src/material-experimental/mdc-core/theming/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ sass_library(
3131
"//src/material-experimental/mdc-list:mdc_list_scss_lib",
3232
"//src/material-experimental/mdc-menu:mdc_menu_scss_lib",
3333
"//src/material-experimental/mdc-paginator:mdc_paginator_scss_lib",
34-
"//src/material-experimental/mdc-progress-bar:mdc_progress_bar_scss_lib",
3534
"//src/material-experimental/mdc-progress-spinner:mdc_progress_spinner_scss_lib",
3635
"//src/material-experimental/mdc-radio:mdc_radio_scss_lib",
3736
"//src/material-experimental/mdc-select:mdc_select_scss_lib",
@@ -42,6 +41,7 @@ sass_library(
4241
"//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib",
4342
"//src/material-experimental/mdc-tooltip:mdc_tooltip_scss_lib",
4443
"//src/material/card:card_scss_lib",
44+
"//src/material/progress-bar:progress_bar_scss_lib",
4545
],
4646
)
4747

src/material-experimental/mdc-core/theming/_all-theme.import.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
7777
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7878
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
79-
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
8180
@forward '../../mdc-input/input-theme' as mat-mdc-input-*;
8281
@forward '../../mdc-form-field/form-field-density' as mat-mdc-*;
@@ -101,7 +100,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
101100
@import '../../mdc-table/table-theme';
102101
@import '../../mdc-tooltip/tooltip-theme';
103102
@import '../../mdc-paginator/paginator-theme';
104-
@import '../../mdc-progress-bar/progress-bar-theme';
105103
@import '../../mdc-progress-spinner/progress-spinner-theme';
106104
@import '../../mdc-input/input-theme';
107105
@import '../../mdc-form-field/form-field-theme';

src/material-experimental/mdc-core/theming/_all-theme.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
@use '../../mdc-table/table-theme';
2020
@use '../../mdc-tooltip/tooltip-theme';
2121
@use '../../mdc-paginator/paginator-theme';
22-
@use '../../mdc-progress-bar/progress-bar-theme';
2322
@use '../../mdc-progress-spinner/progress-spinner-theme';
2423
@use '../../mdc-input/input-theme';
2524
@use '../../mdc-form-field/form-field-theme';
@@ -39,7 +38,7 @@
3938
@include list-theme.theme($theme-or-color-config);
4039
@include menu-theme.theme($theme-or-color-config);
4140
@include paginator-theme.theme($theme-or-color-config);
42-
@include progress-bar-theme.theme($theme-or-color-config);
41+
@include mat.progress-bar-theme($theme-or-color-config);
4342
@include progress-spinner-theme.theme($theme-or-color-config);
4443
@include radio-theme.theme($theme-or-color-config);
4544
@include select-theme.theme($theme-or-color-config);

src/material-experimental/mdc-core/typography/_all-typography.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
7777
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7878
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
79-
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
8180
@forward '../../mdc-input/input-theme' as mat-mdc-input-*;
8281
@forward '../../mdc-form-field/form-field-density' as mat-mdc-*;

src/material-experimental/mdc-progress-bar/README.md

Lines changed: 0 additions & 88 deletions
This file was deleted.

src/material/_index.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@
9393
@forward './paginator/paginator-theme' as paginator-* show paginator-theme, paginator-color,
9494
paginator-typography;
9595
@forward './legacy-progress-bar/progress-bar-theme' as legacy-progress-bar-* show
96-
legacy-progress-bar-theme, progress-bar-color, progress-bar-typography;
96+
legacy-progress-bar-theme, legacy-progress-bar-color, legacy-progress-bar-typography;
97+
@forward './progress-bar/progress-bar-theme' as progress-bar-* show
98+
progress-bar-theme, progress-bar-color, progress-bar-typography;
9799
@forward './progress-spinner/progress-spinner-theme' as progress-spinner-* show
98100
progress-spinner-theme, progress-spinner-color, progress-spinner-typography;
99101
@forward './radio/radio-theme' as radio-* show radio-theme, radio-color, radio-typography;

src/material/config.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ entryPoints = [
4242
"paginator/testing",
4343
"legacy-progress-bar",
4444
"legacy-progress-bar/testing",
45+
"progress-bar",
46+
"progress-bar/testing",
4547
"progress-spinner",
4648
"progress-spinner/testing",
4749
"radio",

src/material-experimental/mdc-progress-bar/BUILD.bazel renamed to src/material/progress-bar/BUILD.bazel

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
22
load(
33
"//tools:defaults.bzl",
4+
"markdown_to_html",
45
"ng_e2e_test_library",
56
"ng_module",
67
"ng_test_library",
@@ -12,7 +13,7 @@ load(
1213
package(default_visibility = ["//visibility:public"])
1314

1415
ng_module(
15-
name = "mdc-progress-bar",
16+
name = "progress-bar",
1617
srcs = glob(
1718
["**/*.ts"],
1819
exclude = [
@@ -21,18 +22,17 @@ ng_module(
2122
),
2223
assets = [":progress_bar_scss"] + glob(["**/*.html"]),
2324
deps = [
24-
"//src/material-experimental/mdc-core",
25+
"//src/material/core",
2526
"//src/material/legacy-progress-bar",
2627
"@npm//@angular/core",
2728
],
2829
)
2930

3031
sass_library(
31-
name = "mdc_progress_bar_scss_lib",
32+
name = "progress_bar_scss_lib",
3233
srcs = glob(["**/_*.scss"]),
3334
deps = [
3435
"//:mdc_sass_lib",
35-
"//src/material:sass_lib",
3636
"//src/material/core:core_scss_lib",
3737
],
3838
)
@@ -42,7 +42,6 @@ sass_binary(
4242
src = "progress-bar.scss",
4343
deps = [
4444
"//:mdc_sass_lib",
45-
"//src/material:sass_lib",
4645
"//src/material/core:core_scss_lib",
4746
],
4847
)
@@ -54,7 +53,7 @@ ng_test_library(
5453
exclude = ["**/*.e2e.spec.ts"],
5554
),
5655
deps = [
57-
":mdc-progress-bar",
56+
":progress-bar",
5857
"//src/cdk/testing/private",
5958
"@npm//@angular/platform-browser",
6059
],
@@ -82,3 +81,13 @@ e2e_test_suite(
8281
"//src/cdk/testing/private/e2e",
8382
],
8483
)
84+
85+
markdown_to_html(
86+
name = "overview",
87+
srcs = [":progress-bar.md"],
88+
)
89+
90+
filegroup(
91+
name = "source-files",
92+
srcs = glob(["**/*.ts"]),
93+
)

src/material/progress-bar/README.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
This version of `<mat-progress-bar>` is built on top of
2+
[MDC Web](https://github.com/material-components/material-components-web).
3+
4+
## How to use
5+
Assuming your application is already up and running using Angular Material, you can add this
6+
component by following these steps:
7+
8+
1. Install Angular Material & MDC WEB:
9+
10+
```bash
11+
npm i material-components-web @angular/material
12+
```
13+
14+
2. In your `angular.json`, make sure `node_modules/` is listed as a Sass include path. This is
15+
needed for the Sass compiler to be able to find the MDC Web Sass files.
16+
17+
```json
18+
...
19+
"styles": [
20+
"src/styles.scss"
21+
],
22+
"stylePreprocessorOptions": {
23+
"includePaths": [
24+
"node_modules/"
25+
]
26+
},
27+
...
28+
```
29+
30+
3. Import the `MatProgressBarModule` and add it to the module that declares your component:
31+
32+
```ts
33+
import {MatProgressBarModule} from '@angular/material/progress-bar';
34+
35+
@NgModule({
36+
declarations: [MyComponent],
37+
imports: [MatProgressBarModule],
38+
})
39+
export class MyModule {}
40+
```
41+
42+
4. Add use `<mat-progress-bar>` in your component's template, just like you would the normal
43+
`<mat-progress-bar>`:
44+
45+
```html
46+
<mat-progress-bar [value]="42"></mat-progress-bar>
47+
```
48+
49+
5. Add the theme and typography mixins to your Sass:
50+
51+
```scss
52+
@use '@angular/material' as mat;
53+
54+
$my-primary: mat.define-palette(mat.$indigo-palette);
55+
$my-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
56+
$my-theme: mat.define-light-theme((
57+
color: (
58+
primary: $my-primary,
59+
accent: $my-accent
60+
)
61+
));
62+
63+
@include mat.progress-bar-theme($my-theme);
64+
@include mat.progress-bar-typography($my-theme);
65+
```

0 commit comments

Comments
 (0)