Skip to content

feat(material/select): switch implementation to use MDC #25360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
/src/material/progress-spinner/** @andrewseguin @crisbeto
/src/material/radio/** @andrewseguin @devversion
/src/material/schematics/** @devversion @andrewseguin
/src/material/legacy-select/** @crisbeto
/src/material/select/** @crisbeto
/src/material/sidenav/** @mmalerba
/src/material/slide-toggle/** @devversion
Expand Down Expand Up @@ -119,7 +120,7 @@
/src/material/form-field/** @devversion @mmalerba
/src/material-experimental/mdc-list/** @mmalerba @devversion
/src/material-experimental/mdc-menu/** @crisbeto
/src/material-experimental/mdc-select/** @crisbeto
/src/material/select/** @crisbeto
/src/material-experimental/mdc-paginator/** @crisbeto
/src/material-experimental/mdc-progress-spinner/** @andrewseguin
/src/material/progress-bar/** @andrewseguin
Expand Down Expand Up @@ -338,7 +339,7 @@
/tools/public_api_guard/material/legacy-progress-bar** @andrewseguin @crisbeto
/tools/public_api_guard/material/progress-spinner**@andrewseguin @crisbeto
/tools/public_api_guard/material/radio** @andrewseguin @devversion
/tools/public_api_guard/material/select** @crisbeto
/tools/public_api_guard/material/legacy-select** @crisbeto
/tools/public_api_guard/material/sidenav** @mmalerba
/tools/public_api_guard/material/slide-toggle** @devversion
/tools/public_api_guard/material/slider** @mmalerba
Expand Down
2 changes: 1 addition & 1 deletion .ng-dev/commit-message.mts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ export const commitMessage: CommitMessageConfig = {
'material/progress-bar',
'material-experimental/mdc-progress-spinner',
'material-experimental/mdc-radio',
'material-experimental/mdc-select',
'material-experimental/mdc-slide-toggle',
'material-experimental/mdc-slider',
'material-experimental/mdc-snack-bar',
Expand Down Expand Up @@ -97,6 +96,7 @@ export const commitMessage: CommitMessageConfig = {
'material/radio',
'material/schematics',
'material/select',
'material/legacy-select',
'material/sidenav',
'material/slide-toggle',
'material/slider',
Expand Down
4 changes: 2 additions & 2 deletions integration/size-test/material/select/basic.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, NgModule} from '@angular/core';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';

/**
* Basic component using `MatSelect` and `MatOption`. Other supported parts of the
Expand All @@ -16,7 +16,7 @@ import {MatSelectModule} from '@angular/material/select';
export class TestComponent {}

@NgModule({
imports: [MatSelectModule],
imports: [MatLegacySelectModule],
declarations: [TestComponent],
bootstrap: [TestComponent],
})
Expand Down
2 changes: 1 addition & 1 deletion src/components-examples/cdk/a11y/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ng_module(
]),
deps = [
"//src/cdk/a11y",
"//src/material/select",
"//src/material/legacy-select",
],
)

Expand Down
4 changes: 2 additions & 2 deletions src/components-examples/cdk/a11y/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {A11yModule} from '@angular/cdk/a11y';
import {NgModule} from '@angular/core';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {FocusMonitorDirectivesExample} from './focus-monitor-directives/focus-monitor-directives-example';
import {FocusMonitorFocusViaExample} from './focus-monitor-focus-via/focus-monitor-focus-via-example';
import {FocusMonitorOverviewExample} from './focus-monitor-overview/focus-monitor-overview-example';
Expand All @@ -14,7 +14,7 @@ const EXAMPLES = [
];

@NgModule({
imports: [A11yModule, MatSelectModule],
imports: [A11yModule, MatLegacySelectModule],
declarations: EXAMPLES,
exports: EXAMPLES,
})
Expand Down
2 changes: 1 addition & 1 deletion src/components-examples/cdk/text-field/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ng_module(
"//src/cdk/text-field",
"//src/material/button",
"//src/material/legacy-input",
"//src/material/select",
"//src/material/legacy-select",
],
)

Expand Down
10 changes: 8 additions & 2 deletions src/components-examples/cdk/text-field/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {MatButtonModule} from '@angular/material/button';
import {MatLegacyInputModule} from '@angular/material/legacy-input';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {TextFieldAutofillDirectiveExample} from './text-field-autofill-directive/text-field-autofill-directive-example';
import {TextFieldAutofillMonitorExample} from './text-field-autofill-monitor/text-field-autofill-monitor-example';
import {TextFieldAutosizeTextareaExample} from './text-field-autosize-textarea/text-field-autosize-textarea-example';
Expand All @@ -21,7 +21,13 @@ const EXAMPLES = [
];

@NgModule({
imports: [CommonModule, TextFieldModule, MatButtonModule, MatLegacyInputModule, MatSelectModule],
imports: [
CommonModule,
TextFieldModule,
MatButtonModule,
MatLegacyInputModule,
MatLegacySelectModule,
],
declarations: EXAMPLES,
exports: EXAMPLES,
})
Expand Down
2 changes: 1 addition & 1 deletion src/components-examples/material/form-field/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ng_module(
"//src/material/legacy-form-field/testing",
"//src/material/legacy-input",
"//src/material/legacy-input/testing",
"//src/material/legacy-select",
"//src/material/radio",
"//src/material/select",
"@npm//@angular/forms",
"@npm//@angular/platform-browser",
"@npm//@angular/platform-browser-dynamic",
Expand Down
4 changes: 2 additions & 2 deletions src/components-examples/material/form-field/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
import {MatIconModule} from '@angular/material/icon';
import {MatLegacyInputModule} from '@angular/material/legacy-input';
import {MatRadioModule} from '@angular/material/radio';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {FormFieldAppearanceExample} from './form-field-appearance/form-field-appearance-example';
import {
FormFieldCustomControlExample,
Expand Down Expand Up @@ -55,7 +55,7 @@ const EXAMPLES = [
MatIconModule,
MatLegacyInputModule,
MatRadioModule,
MatSelectModule,
MatLegacySelectModule,
ReactiveFormsModule,
],
declarations: [...EXAMPLES, MyTelInput],
Expand Down
8 changes: 4 additions & 4 deletions src/components-examples/material/select/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ ng_module(
"//src/material/checkbox",
"//src/material/legacy-form-field",
"//src/material/legacy-input",
"//src/material/select",
"//src/material/select/testing",
"//src/material/legacy-select",
"//src/material/legacy-select/testing",
"@npm//@angular/forms",
"@npm//@angular/platform-browser",
"@npm//@angular/platform-browser-dynamic",
Expand All @@ -43,8 +43,8 @@ ng_test_library(
":select",
"//src/cdk/testing",
"//src/cdk/testing/testbed",
"//src/material/select",
"//src/material/select/testing",
"//src/material/legacy-select",
"//src/material/legacy-select/testing",
"@npm//@angular/platform-browser",
"@npm//@angular/platform-browser-dynamic",
],
Expand Down
4 changes: 2 additions & 2 deletions src/components-examples/material/select/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {NgModule} from '@angular/core';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {MatCheckboxModule} from '@angular/material/checkbox';
import {MatLegacyInputModule} from '@angular/material/legacy-input';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {SelectCustomTriggerExample} from './select-custom-trigger/select-custom-trigger-example';
import {SelectDisabledExample} from './select-disabled/select-disabled-example';
import {SelectErrorStateMatcherExample} from './select-error-state-matcher/select-error-state-matcher-example';
Expand Down Expand Up @@ -63,7 +63,7 @@ const EXAMPLES = [
FormsModule,
MatCheckboxModule,
MatLegacyInputModule,
MatSelectModule,
MatLegacySelectModule,
ReactiveFormsModule,
MatLegacyFormFieldModule,
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
import {MatSelectHarness} from '@angular/material/select/testing';
import {MatLegacySelectHarness} from '@angular/material/legacy-select/testing';
import {HarnessLoader} from '@angular/cdk/testing';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {SelectHarnessExample} from './select-harness-example';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';

Expand All @@ -12,7 +12,7 @@ describe('SelectHarnessExample', () => {

beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [MatSelectModule, NoopAnimationsModule],
imports: [MatLegacySelectModule, NoopAnimationsModule],
declarations: [SelectHarnessExample],
}).compileComponents();
fixture = TestBed.createComponent(SelectHarnessExample);
Expand All @@ -21,18 +21,18 @@ describe('SelectHarnessExample', () => {
});

it('should load all select harnesses', async () => {
const selects = await loader.getAllHarnesses(MatSelectHarness);
const selects = await loader.getAllHarnesses(MatLegacySelectHarness);
expect(selects.length).toBe(1);
});

it('should be able to check whether a select is in multi-selection mode', async () => {
const select = await loader.getHarness(MatSelectHarness);
const select = await loader.getHarness(MatLegacySelectHarness);

expect(await select.isMultiple()).toBe(false);
});

it('should be able to open and close a select', async () => {
const select = await loader.getHarness(MatSelectHarness);
const select = await loader.getHarness(MatLegacySelectHarness);

expect(await select.isOpen()).toBe(false);

Expand All @@ -44,7 +44,7 @@ describe('SelectHarnessExample', () => {
});

it('should be able to get the value text from a select', async () => {
const select = await loader.getHarness(MatSelectHarness);
const select = await loader.getHarness(MatLegacySelectHarness);
await select.open();
const options = await select.getOptions();

Expand Down
2 changes: 1 addition & 1 deletion src/components-examples/material/sidenav/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ ng_module(
"//src/material/button",
"//src/material/checkbox",
"//src/material/icon",
"//src/material/legacy-select",
"//src/material/list",
"//src/material/radio",
"//src/material/select",
"//src/material/sidenav",
"//src/material/toolbar",
"@npm//@angular/forms",
Expand Down
4 changes: 2 additions & 2 deletions src/components-examples/material/sidenav/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
import {MatIconModule} from '@angular/material/icon';
import {MatListModule} from '@angular/material/list';
import {MatRadioModule} from '@angular/material/radio';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {MatSidenavModule} from '@angular/material/sidenav';
import {MatToolbarModule} from '@angular/material/toolbar';
import {SidenavAutosizeExample} from './sidenav-autosize/sidenav-autosize-example';
Expand Down Expand Up @@ -59,7 +59,7 @@ const EXAMPLES = [
MatListModule,
MatRadioModule,
MatSidenavModule,
MatSelectModule,
MatLegacySelectModule,
MatToolbarModule,
ReactiveFormsModule,
],
Expand Down
2 changes: 1 addition & 1 deletion src/components-examples/material/snack-bar/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ng_module(
"//src/cdk/testing/testbed",
"//src/material/button",
"//src/material/legacy-input",
"//src/material/select",
"//src/material/legacy-select",
"//src/material/snack-bar",
"//src/material/snack-bar/testing",
"@npm//@angular/forms",
Expand Down
10 changes: 8 additions & 2 deletions src/components-examples/material/snack-bar/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
import {FormsModule} from '@angular/forms';
import {MatButtonModule} from '@angular/material/button';
import {MatLegacyInputModule} from '@angular/material/legacy-input';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {MatSnackBarModule} from '@angular/material/snack-bar';
import {
PizzaPartyComponent,
Expand All @@ -28,7 +28,13 @@ const EXAMPLES = [
];

@NgModule({
imports: [FormsModule, MatButtonModule, MatLegacyInputModule, MatSelectModule, MatSnackBarModule],
imports: [
FormsModule,
MatButtonModule,
MatLegacyInputModule,
MatLegacySelectModule,
MatSnackBarModule,
],
declarations: [...EXAMPLES, PizzaPartyComponent],
exports: EXAMPLES,
})
Expand Down
2 changes: 1 addition & 1 deletion src/components-examples/material/tooltip/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ ng_module(
"//src/material/button",
"//src/material/checkbox",
"//src/material/legacy-input",
"//src/material/legacy-select",
"//src/material/legacy-tooltip",
"//src/material/legacy-tooltip/testing",
"//src/material/select",
"@npm//@angular/forms",
"@npm//@angular/platform-browser",
"@npm//@angular/platform-browser-dynamic",
Expand Down
4 changes: 2 additions & 2 deletions src/components-examples/material/tooltip/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {ScrollingModule} from '@angular/cdk/scrolling';
import {MatButtonModule} from '@angular/material/button';
import {MatCheckboxModule} from '@angular/material/checkbox';
import {MatLegacyInputModule} from '@angular/material/legacy-input';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {MatLegacyTooltipModule} from '@angular/material/legacy-tooltip';
import {TooltipAutoHideExample} from './tooltip-auto-hide/tooltip-auto-hide-example';
import {TooltipCustomClassExample} from './tooltip-custom-class/tooltip-custom-class-example';
Expand Down Expand Up @@ -50,7 +50,7 @@ const EXAMPLES = [
MatButtonModule,
MatCheckboxModule,
MatLegacyInputModule,
MatSelectModule,
MatLegacySelectModule,
MatLegacyTooltipModule,
ReactiveFormsModule,
ScrollingModule, // Required for the auto-scrolling example
Expand Down
2 changes: 1 addition & 1 deletion src/dev-app/baseline/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ ng_module(
"//src/material/legacy-card",
"//src/material/legacy-form-field",
"//src/material/legacy-input",
"//src/material/legacy-select",
"//src/material/radio",
"//src/material/select",
"//src/material/toolbar",
],
)
Expand Down
4 changes: 2 additions & 2 deletions src/dev-app/baseline/baseline-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {MatCheckboxModule} from '@angular/material/checkbox';
import {MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
import {MatLegacyInputModule} from '@angular/material/legacy-input';
import {MatRadioModule} from '@angular/material/radio';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';
import {MatToolbarModule} from '@angular/material/toolbar';

@Component({
Expand All @@ -28,7 +28,7 @@ import {MatToolbarModule} from '@angular/material/toolbar';
MatLegacyFormFieldModule,
MatLegacyInputModule,
MatRadioModule,
MatSelectModule,
MatLegacySelectModule,
MatToolbarModule,
],
})
Expand Down
2 changes: 1 addition & 1 deletion src/dev-app/bottom-sheet/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ ng_module(
"//src/material/legacy-card",
"//src/material/legacy-form-field",
"//src/material/legacy-input",
"//src/material/legacy-select",
"//src/material/list",
"//src/material/select",
"@npm//@angular/forms",
],
)
Expand Down
4 changes: 2 additions & 2 deletions src/dev-app/bottom-sheet/bottom-sheet-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
import {MatIconModule} from '@angular/material/icon';
import {MatLegacyInputModule} from '@angular/material/legacy-input';
import {MatListModule} from '@angular/material/list';
import {MatSelectModule} from '@angular/material/select';
import {MatLegacySelectModule} from '@angular/material/legacy-select';

const defaultConfig = new MatBottomSheetConfig();

Expand All @@ -41,7 +41,7 @@ const defaultConfig = new MatBottomSheetConfig();
MatLegacyFormFieldModule,
MatIconModule,
MatLegacyInputModule,
MatSelectModule,
MatLegacySelectModule,
MatListModule,
],
})
Expand Down
2 changes: 1 addition & 1 deletion src/dev-app/cdk-experimental-listbox/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ ng_module(
],
deps = [
"//src/cdk-experimental/listbox",
"//src/material/select",
"//src/material/legacy-select",
],
)
Loading