Skip to content

Commit 1ae8f6b

Browse files
authored
build: use MDC components for MDC demos (#20946)
Uses MDC components whenever possible to implement the demos for other MDC components.
1 parent 4699f30 commit 1ae8f6b

22 files changed

+68
-57
lines changed

src/dev-app/mdc-checkbox/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ ng_module(
1212
],
1313
deps = [
1414
"//src/material-experimental/mdc-checkbox",
15-
"//src/material/core",
16-
"//src/material/form-field",
17-
"//src/material/input",
18-
"//src/material/select",
15+
"//src/material-experimental/mdc-core",
16+
"//src/material-experimental/mdc-form-field",
17+
"//src/material-experimental/mdc-input",
18+
"//src/material-experimental/mdc-select",
1919
"@npm//@angular/forms",
2020
"@npm//@angular/router",
2121
],

src/dev-app/mdc-checkbox/mdc-checkbox-demo-module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import {CommonModule} from '@angular/common';
1010
import {NgModule} from '@angular/core';
1111
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
1212
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
13-
import {MatPseudoCheckboxModule} from '@angular/material/core';
14-
import {MatFormFieldModule} from '@angular/material/form-field';
15-
import {MatInputModule} from '@angular/material/input';
16-
import {MatSelectModule} from '@angular/material/select';
13+
import {MatPseudoCheckboxModule} from '@angular/material-experimental/mdc-core';
14+
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
15+
import {MatInputModule} from '@angular/material-experimental/mdc-input';
16+
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
1717
import {RouterModule} from '@angular/router';
1818

1919
import {

src/dev-app/mdc-checkbox/mdc-checkbox-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {Component, Directive} from '@angular/core';
1010
import {MAT_CHECKBOX_DEFAULT_OPTIONS} from '@angular/material/checkbox';
1111
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
12-
import {ThemePalette} from '@angular/material/core';
12+
import {ThemePalette} from '@angular/material-experimental/mdc-core';
1313

1414

1515
export interface Task {

src/dev-app/mdc-dialog/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ ng_module(
1010
":mdc_dialog_demo_scss",
1111
],
1212
deps = [
13+
"//src/material-experimental/mdc-button",
14+
"//src/material-experimental/mdc-card",
15+
"//src/material-experimental/mdc-checkbox",
1316
"//src/material-experimental/mdc-dialog",
14-
"//src/material/button",
15-
"//src/material/card",
16-
"//src/material/checkbox",
17-
"//src/material/form-field",
18-
"//src/material/input",
19-
"//src/material/select",
17+
"//src/material-experimental/mdc-form-field",
18+
"//src/material-experimental/mdc-input",
19+
"//src/material-experimental/mdc-select",
2020
"@npm//@angular/router",
2121
],
2222
)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
import {NgModule} from '@angular/core';
1010
import {FormsModule} from '@angular/forms';
1111
import {MatDialogModule} from '@angular/material-experimental/mdc-dialog';
12-
import {MatButtonModule} from '@angular/material/button';
13-
import {MatCardModule} from '@angular/material/card';
14-
import {MatCheckboxModule} from '@angular/material/checkbox';
15-
import {MatFormFieldModule} from '@angular/material/form-field';
16-
import {MatInputModule} from '@angular/material/input';
17-
import {MatSelectModule} from '@angular/material/select';
12+
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
13+
import {MatCardModule} from '@angular/material-experimental/mdc-card';
14+
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
15+
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
16+
import {MatInputModule} from '@angular/material-experimental/mdc-input';
17+
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
1818
import {RouterModule} from '@angular/router';
1919
import {ContentElementDialog, DialogDemo, IFrameDialog, JazzDialog} from './mdc-dialog-demo';
2020

src/dev-app/mdc-dialog/mdc-dialog-demo.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
@import '../../material-experimental/mdc-dialog/dialog-legacy-padding';
22

33
.demo-dialog-card {
4-
max-width: 405px;
4+
max-width: 600px;
55
margin: 20px 0;
6+
7+
mat-form-field + mat-form-field {
8+
margin-left: 16px;
9+
}
10+
11+
[dir='rtl'] mat-form-field + mat-form-field {
12+
margin-left: 0;
13+
margin-right: 16px;
14+
}
615
}
716

817
.demo-dialog-button {

src/dev-app/mdc-input/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ ng_module(
1111
],
1212
deps = [
1313
"//src/components-examples/material-experimental/mdc-form-field",
14+
"//src/material-experimental/mdc-autocomplete",
15+
"//src/material-experimental/mdc-button",
16+
"//src/material-experimental/mdc-card",
17+
"//src/material-experimental/mdc-checkbox",
1418
"//src/material-experimental/mdc-form-field",
1519
"//src/material-experimental/mdc-input",
16-
"//src/material/autocomplete",
17-
"//src/material/button",
20+
"//src/material-experimental/mdc-tabs",
1821
"//src/material/button-toggle",
19-
"//src/material/card",
20-
"//src/material/checkbox",
2122
"//src/material/icon",
22-
"//src/material/tabs",
2323
"//src/material/toolbar",
2424
"@npm//@angular/forms",
2525
"@npm//@angular/router",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import {NgModule} from '@angular/core';
1414
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
1515
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
1616
import {MatInputModule} from '@angular/material-experimental/mdc-input';
17-
import {MatAutocompleteModule} from '@angular/material/autocomplete';
18-
import {MatButtonModule} from '@angular/material/button';
17+
import {MatAutocompleteModule} from '@angular/material-experimental/mdc-autocomplete';
18+
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
1919
import {MatButtonToggleModule} from '@angular/material/button-toggle';
20-
import {MatCardModule} from '@angular/material/card';
21-
import {MatCheckboxModule} from '@angular/material/checkbox';
20+
import {MatCardModule} from '@angular/material-experimental/mdc-card';
21+
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
2222
import {MatIconModule} from '@angular/material/icon';
23-
import {MatTabsModule} from '@angular/material/tabs';
23+
import {MatTabsModule} from '@angular/material-experimental/mdc-tabs';
2424
import {MatToolbarModule} from '@angular/material/toolbar';
2525
import {RouterModule} from '@angular/router';
2626
import {MdcInputDemo} from './mdc-input-demo';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
FloatLabelType,
1313
MatFormFieldAppearance
1414
} from '@angular/material-experimental/mdc-form-field';
15-
import {ErrorStateMatcher, ThemePalette} from '@angular/material/core';
15+
import {ErrorStateMatcher, ThemePalette} from '@angular/material-experimental/mdc-core';
1616

1717
let max = 5;
1818

src/dev-app/mdc-menu/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ng_module(
1010
":mdc_menu_demo_scss",
1111
],
1212
deps = [
13+
"//src/material-experimental/mdc-button",
1314
"//src/material-experimental/mdc-menu",
14-
"//src/material/button",
1515
"//src/material/divider",
1616
"//src/material/icon",
1717
"//src/material/toolbar",

src/dev-app/mdc-menu/mdc-menu-demo-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {RouterModule} from '@angular/router';
1313
import {MatToolbarModule} from '@angular/material/toolbar';
1414
import {MatIconModule} from '@angular/material/icon';
1515
import {MatDividerModule} from '@angular/material/divider';
16-
import {MatButtonModule} from '@angular/material/button';
16+
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
1717
import {MdcMenuDemo} from './mdc-menu-demo';
1818

1919
@NgModule({

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
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component} from '@angular/core';
10-
import {ThemePalette} from '@angular/material/core';
10+
import {ThemePalette} from '@angular/material-experimental/mdc-core';
1111

1212
@Component({
1313
selector: 'mdc-progress-bar-demo',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ng_module(
1010
":mdc_progress_spinner_demo_scss",
1111
],
1212
deps = [
13+
"//src/material-experimental/mdc-button",
14+
"//src/material-experimental/mdc-checkbox",
1315
"//src/material-experimental/mdc-progress-spinner",
14-
"//src/material/button",
1516
"//src/material/button-toggle",
16-
"//src/material/checkbox",
1717
"@npm//@angular/forms",
1818
"@npm//@angular/router",
1919
],

src/dev-app/mdc-progress-spinner/mdc-progress-spinner-demo-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {NgModule} from '@angular/core';
1010
import {MatProgressSpinnerModule} from '@angular/material-experimental/mdc-progress-spinner';
1111
import {RouterModule} from '@angular/router';
1212
import {MdcProgressSpinnerDemo} from './mdc-progress-spinner-demo';
13-
import {MatButtonModule} from '@angular/material/button';
14-
import {MatCheckboxModule} from '@angular/material/checkbox';
13+
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
14+
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
1515
import {MatButtonToggleModule} from '@angular/material/button-toggle';
1616
import {FormsModule} from '@angular/forms';
1717

src/dev-app/mdc-radio/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ ng_module(
1010
":mdc_radio_demo_scss",
1111
],
1212
deps = [
13+
"//src/material-experimental/mdc-button",
14+
"//src/material-experimental/mdc-checkbox",
1315
"//src/material-experimental/mdc-radio",
14-
"//src/material/button",
15-
"//src/material/checkbox",
1616
"@npm//@angular/forms",
1717
"@npm//@angular/router",
1818
],

src/dev-app/mdc-radio/mdc-radio-demo-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import {MatRadioModule} from '@angular/material-experimental/mdc-radio';
1111
import {RouterModule} from '@angular/router';
1212
import {MdcRadioDemo} from './mdc-radio-demo';
1313
import {FormsModule} from '@angular/forms';
14-
import {MatButtonModule} from '@angular/material/button';
15-
import {MatCheckboxModule} from '@angular/material/checkbox';
14+
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
15+
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
1616
import {CommonModule} from '@angular/common';
1717

1818
@NgModule({

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

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

99
import {Component} from '@angular/core';
1010
import {FormControl, Validators} from '@angular/forms';
11-
import {ErrorStateMatcher, ThemePalette} from '@angular/material/core';
11+
import {ErrorStateMatcher, ThemePalette} from '@angular/material-experimental/mdc-core';
1212
import {MatSelectChange} from '@angular/material-experimental/mdc-select';
1313
import {FloatLabelType} from '@angular/material-experimental/mdc-form-field';
1414

src/dev-app/mdc-slider/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ng_module(
1010
],
1111
deps = [
1212
"//src/material-experimental/mdc-slider",
13-
"//src/material/tabs",
13+
"//src/material-experimental/mdc-tabs",
1414
"@npm//@angular/forms",
1515
"@npm//@angular/router",
1616
],

src/dev-app/mdc-slider/mdc-slider-demo-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {NgModule} from '@angular/core';
1010
import {FormsModule} from '@angular/forms';
1111
import {MatSliderModule} from '@angular/material-experimental/mdc-slider';
12-
import {MatTabsModule} from '@angular/material/tabs';
12+
import {MatTabsModule} from '@angular/material-experimental/mdc-tabs';
1313
import {RouterModule} from '@angular/router';
1414
import {MdcSliderDemo} from './mdc-slider-demo';
1515

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ng_module(
1212
],
1313
deps = [
1414
"//src/cdk/bidi",
15+
"//src/material-experimental/mdc-button",
16+
"//src/material-experimental/mdc-checkbox",
17+
"//src/material-experimental/mdc-form-field",
18+
"//src/material-experimental/mdc-input",
19+
"//src/material-experimental/mdc-select",
1520
"//src/material-experimental/mdc-snack-bar",
16-
"//src/material/button",
17-
"//src/material/checkbox",
18-
"//src/material/form-field",
19-
"//src/material/input",
20-
"//src/material/select",
2121
"@npm//@angular/forms",
2222
"@npm//@angular/router",
2323
],

src/dev-app/mdc-snack-bar/mdc-snack-bar-demo-module.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import {RouterModule} from '@angular/router';
1212
import {MdcSnackBarDemo} from './mdc-snack-bar-demo';
1313
import {CommonModule} from '@angular/common';
1414
import {FormsModule} from '@angular/forms';
15-
import {MatButtonModule} from '@angular/material/button';
16-
import {MatCheckboxModule} from '@angular/material/checkbox';
17-
import {MatFormFieldModule} from '@angular/material/form-field';
18-
import {MatInputModule} from '@angular/material/input';
19-
import {MatSelectModule} from '@angular/material/select';
15+
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
16+
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
17+
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
18+
import {MatInputModule} from '@angular/material-experimental/mdc-input';
19+
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
2020

2121
@NgModule({
2222
imports: [

src/dev-app/mdc-snack-bar/mdc-snack-bar-demo.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ <h1>SnackBar demo</h1>
66
<div>
77
<div>Position in page: </div>
88
<mat-form-field>
9+
<mat-label>Horizontal</mat-label>
910
<mat-select [(ngModel)]="horizontalPosition">
1011
<mat-option value="start">Start</mat-option>
1112
<mat-option value="end">End</mat-option>
@@ -15,6 +16,7 @@ <h1>SnackBar demo</h1>
1516
</mat-select>
1617
</mat-form-field>
1718
<mat-form-field>
19+
<mat-label>Vertical</mat-label>
1820
<mat-select [(ngModel)]="verticalPosition">
1921
<mat-option value="top">Top</mat-option>
2022
<mat-option value="bottom">Bottom</mat-option>

0 commit comments

Comments
 (0)