Skip to content

Commit 5b8d521

Browse files
authored
feat(material/core): switch option implementation to use MDC (#25343)
Switches the implementation of `mat-option` and `mat-optgroup` to use MDC by default. BREAKING CHANGE: * DOM and CSS classes for `mat-option` and `mat-optgroup` have changed. * Typescript API is largely the same but may have minor differences
1 parent 0f44312 commit 5b8d521

File tree

182 files changed

+1412
-1053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+1412
-1053
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
/src/material/legacy-core/density/** @devversion
7070
/src/material/legacy-core/theming/** @andrewseguin @jelbourn
7171
/src/material/legacy-core/typography/** @crisbeto
72+
/src/material/legacy-core/option/** @crisbeto
73+
/src/material/legacy-core/testing/** @crisbeto
7274

7375
# Miscellaneous components
7476
/src/google-maps/** @crisbeto

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ng_module(
1212
],
1313
deps = [
1414
"//src/material-experimental/mdc-checkbox",
15-
"//src/material-experimental/mdc-core",
1615
"//src/material-experimental/mdc-select",
16+
"//src/material/core",
1717
"//src/material/form-field",
1818
"//src/material/input",
1919
"@npm//@angular/forms",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {MAT_CHECKBOX_DEFAULT_OPTIONS} from '@angular/material/checkbox';
1111
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
1212
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
1313
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
14-
import {MatPseudoCheckboxModule, ThemePalette} from '@angular/material-experimental/mdc-core';
14+
import {MatPseudoCheckboxModule, ThemePalette} from '@angular/material/core';
1515
import {MatInputModule} from '@angular/material/input';
1616
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
1717
import {CommonModule} from '@angular/common';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ng_module(
1313
"//src/material-experimental/mdc-button",
1414
"//src/material-experimental/mdc-checkbox",
1515
"//src/material-experimental/mdc-chips",
16-
"//src/material-experimental/mdc-core",
1716
"//src/material/card",
17+
"//src/material/core",
1818
"//src/material/form-field",
1919
"//src/material/icon",
2020
"//src/material/toolbar",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {Component} from '@angular/core';
1010
import {COMMA, ENTER} from '@angular/cdk/keycodes';
1111
import {CommonModule} from '@angular/common';
12-
import {ThemePalette} from '@angular/material-experimental/mdc-core';
12+
import {ThemePalette} from '@angular/material/core';
1313
import {
1414
MatChipInputEvent,
1515
MatChipEditedEvent,

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-experimental/mdc-core';
10+
import {ThemePalette} from '@angular/material/core';
1111
import {CommonModule} from '@angular/common';
1212
import {FormsModule} from '@angular/forms';
1313
import {MatProgressBarModule} from '@angular/material/progress-bar';

src/dev-app/mdc-progress-spinner/mdc-progress-spinner-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-experimental/mdc-core';
10+
import {ThemePalette} from '@angular/material/core';
1111
import {MatProgressSpinnerModule} from '@angular/material-experimental/mdc-progress-spinner';
1212
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
1313
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';

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, FormsModule, ReactiveFormsModule} from '@angular/forms';
11-
import {ErrorStateMatcher, ThemePalette} from '@angular/material-experimental/mdc-core';
11+
import {ErrorStateMatcher, ThemePalette} from '@angular/material/core';
1212
import {MatSelectChange, MatSelectModule} from '@angular/material-experimental/mdc-select';
1313
import {FloatLabelType} from '@angular/material/form-field';
1414
import {CommonModule} from '@angular/common';

src/material-experimental/_index.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
// MDC-related themes
1818
@forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
1919
mdc-core-density, mdc-core-typography;
20-
@forward './mdc-core/option/option-theme' as mdc-option-* show mdc-option-color,
21-
mdc-option-typography, mdc-option-density, mdc-option-theme;
22-
@forward './mdc-core/option/optgroup-theme' as mdc-optgroup-* show mdc-optgroup-color,
23-
mdc-optgroup-typography, mdc-optgroup-density, mdc-optgroup-theme;
2420
@forward './mdc-autocomplete/autocomplete-theme' as mdc-autocomplete-* show mdc-autocomplete-color,
2521
mdc-autocomplete-typography, mdc-autocomplete-density, mdc-autocomplete-theme;
2622
@forward './mdc-button/button-theme' as mdc-button-* show mdc-button-color, mdc-button-typography,

src/material-experimental/config.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ entryPoints = [
99
"mdc-chips",
1010
"mdc-chips/testing",
1111
"mdc-core",
12-
"mdc-core/testing",
1312
"mdc-dialog",
1413
"mdc-dialog/testing",
1514
"mdc-list",

0 commit comments

Comments
 (0)