Skip to content

Commit 9ac264f

Browse files
andrewseguinandrewseguin
authored
feat(material/checkbox): switch implementation to use MDC (#25369)
* feat(material/checkbox): switch implementation to MDC * feat(material/checkbox): switch implementation to MDC
1 parent 532454b commit 9ac264f

File tree

166 files changed

+2504
-2312
lines changed

Some content is hidden

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

166 files changed

+2504
-2312
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/src/material/button-toggle/** @andrewseguin
77
/src/material/button/** @andrewseguin
88
/src/material/legacy-card/** @andrewseguin
9-
/src/material/checkbox/** @andrewseguin @devversion
9+
/src/material/legacy-checkbox/** @andrewseguin @devversion
1010
/src/material/chips/** @andrewseguin
1111
/src/material/datepicker/** @mmalerba @crisbeto @zarend
1212
/src/material/dialog/** @andrewseguin @crisbeto
@@ -113,7 +113,7 @@
113113
/src/material/autocomplete/** @crisbeto
114114
/src/material-experimental/mdc-button/** @andrewseguin
115115
/src/material/card/** @mmalerba
116-
/src/material-experimental/mdc-checkbox/** @mmalerba
116+
/src/material/checkbox/** @mmalerba
117117
/src/material-experimental/mdc-chips/** @mmalerba
118118
/src/material-experimental/mdc-core/** @crisbeto
119119
/src/material-experimental/mdc-dialog/** @devversion
@@ -321,7 +321,7 @@
321321
/tools/public_api_guard/material/button-toggle** @andrewseguin
322322
/tools/public_api_guard/material/button** @andrewseguin
323323
/tools/public_api_guard/material/legacy-card** @andrewseguin
324-
/tools/public_api_guard/material/checkbox** @andrewseguin @devversion
324+
/tools/public_api_guard/material/legacy-checkbox** @andrewseguin @devversion
325325
/tools/public_api_guard/material/chips** @andrewseguin
326326
/tools/public_api_guard/material/chips/testing** @andrewseguin
327327
/tools/public_api_guard/material/core** @andrewseguin

‎.ng-dev/commit-message.mts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const commitMessage: CommitMessageConfig = {
4242
'material-experimental/column-resize',
4343
'material-experimental/mdc-button',
4444
'material/card',
45-
'material-experimental/mdc-checkbox',
45+
'material/checkbox',
4646
'material-experimental/mdc-chips',
4747
'material-experimental/mdc-core',
4848
'material-experimental/mdc-dialog',
@@ -73,7 +73,8 @@ export const commitMessage: CommitMessageConfig = {
7373
'material/button',
7474
'material/button-toggle',
7575
'material/legacy-card',
76-
'material/checkbox',
76+
'material/legacy-checkbox',
77+
'material/legacy-checkbox',
7778
'material/chips',
7879
'material/core',
7980
'material/legacy-core',

‎goldens/tsec-exemption.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"ban-element-innerhtml-assignments": ["../src/material/icon/icon-registry.ts"],
44
"ban-element-setattribute": [
55
"../src/cdk/a11y/aria-describer/aria-reference.ts",
6-
"../src/material-experimental/mdc-checkbox/checkbox.ts",
6+
"../src/material/checkbox/checkbox.ts",
77
"../src/material-experimental/mdc-list/interactive-list-base.ts",
88
"../src/material-experimental/mdc-progress-spinner/progress-spinner.ts",
99
"../src/material-experimental/mdc-slide-toggle/slide-toggle.ts",

‎integration/mdc-migration/golden/src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {ReactiveFormsModule} from '@angular/forms';
77
import {MatAutocompleteModule} from '@angular/material-experimental/mdc-autocomplete';
88
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
99
import {MatCardModule} from '@angular/material-experimental/mdc-card';
10-
import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox';
10+
import {MatCheckboxModule} from '@angular/material/checkbox';
1111
import {MatChipsModule} from '@angular/material-experimental/mdc-chips';
1212
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
1313
import {MatIconModule} from '@angular/material/icon';

‎src/components-examples/cdk-experimental/selection/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ng_module(
1313
"//src/cdk-experimental/selection",
1414
"//src/cdk/collections",
1515
"//src/cdk/table",
16-
"//src/material/checkbox",
16+
"//src/material/legacy-checkbox",
1717
"@npm//@angular/forms",
1818
],
1919
)

‎src/components-examples/cdk-experimental/selection/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {CdkTableModule} from '@angular/cdk/table';
33
import {CommonModule} from '@angular/common';
44
import {NgModule} from '@angular/core';
55
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
6-
import {MatCheckboxModule} from '@angular/material/checkbox';
6+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77

88
import {CdkSelectionColumnExample} from './cdk-selection-column/cdk-selection-column-example';
99
import {CdkSelectionListExample} from './cdk-selection-list/cdk-selection-list-example';
@@ -19,7 +19,7 @@ const EXAMPLES = [CdkSelectionListExample, CdkSelectionColumnExample];
1919
CommonModule,
2020
FormsModule,
2121
ReactiveFormsModule,
22-
MatCheckboxModule,
22+
MatLegacyCheckboxModule,
2323
],
2424
declarations: EXAMPLES,
2525
exports: EXAMPLES,

‎src/components-examples/material-experimental/mdc-table/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ ng_module(
2020
"//src/material-experimental/mdc-table",
2121
"//src/material/button",
2222
"//src/material/button-toggle",
23-
"//src/material/checkbox",
2423
"//src/material/core",
2524
"//src/material/icon",
25+
"//src/material/legacy-checkbox",
2626
"//src/material/legacy-input",
2727
"//src/material/paginator",
2828
"//src/material/progress-spinner",

‎src/components-examples/material-experimental/mdc-table/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {NgModule} from '@angular/core';
33
import {MatRippleModule} from '@angular/material/core';
44
import {MatButtonModule} from '@angular/material/button';
55
import {MatButtonToggleModule} from '@angular/material/button-toggle';
6-
import {MatCheckboxModule} from '@angular/material/checkbox';
6+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatLegacyInputModule} from '@angular/material/legacy-input';
99
import {MatPaginatorModule} from '@angular/material/paginator';
@@ -120,7 +120,7 @@ const EXAMPLES = [
120120
CommonModule,
121121
MatButtonModule,
122122
MatButtonToggleModule,
123-
MatCheckboxModule,
123+
MatLegacyCheckboxModule,
124124
MatIconModule,
125125
MatLegacyInputModule,
126126
MatPaginatorModule,

‎src/components-examples/material-experimental/popover-edit/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ ng_module(
1212
deps = [
1313
"//src/material-experimental/popover-edit",
1414
"//src/material/button",
15-
"//src/material/checkbox",
1615
"//src/material/icon",
16+
"//src/material/legacy-checkbox",
1717
"//src/material/legacy-input",
1818
"//src/material/list",
1919
"//src/material/snack-bar",

‎src/components-examples/material-experimental/popover-edit/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {CommonModule} from '@angular/common';
33
import {FormsModule} from '@angular/forms';
44
import {MatPopoverEditModule} from '@angular/material-experimental/popover-edit';
55
import {MatButtonModule} from '@angular/material/button';
6-
import {MatCheckboxModule} from '@angular/material/checkbox';
6+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatLegacyInputModule} from '@angular/material/legacy-input';
99
import {MatListModule} from '@angular/material/list';
@@ -32,7 +32,7 @@ const EXAMPLES = [
3232
imports: [
3333
CommonModule,
3434
MatButtonModule,
35-
MatCheckboxModule,
35+
MatLegacyCheckboxModule,
3636
MatIconModule,
3737
MatLegacyInputModule,
3838
MatListModule,

‎src/components-examples/material-experimental/selection/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ng_module(
1313
"//src/cdk/collections",
1414
"//src/cdk/table",
1515
"//src/material-experimental/selection",
16-
"//src/material/checkbox",
16+
"//src/material/legacy-checkbox",
1717
"@npm//@angular/forms",
1818
],
1919
)

‎src/components-examples/material-experimental/selection/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {MatTableModule} from '@angular/material/table';
33
import {CommonModule} from '@angular/common';
44
import {NgModule} from '@angular/core';
55
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
6-
import {MatCheckboxModule} from '@angular/material/checkbox';
6+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77

88
import {MatSelectionColumnExample} from './mat-selection-column/mat-selection-column-example';
99
import {MatSelectionListExample} from './mat-selection-list/mat-selection-list-example';
@@ -19,7 +19,7 @@ const EXAMPLES = [MatSelectionListExample, MatSelectionColumnExample];
1919
CommonModule,
2020
FormsModule,
2121
ReactiveFormsModule,
22-
MatCheckboxModule,
22+
MatLegacyCheckboxModule,
2323
],
2424
declarations: EXAMPLES,
2525
exports: EXAMPLES,

‎src/components-examples/material/checkbox/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ng_module(
1515
deps = [
1616
"//src/cdk/testing",
1717
"//src/cdk/testing/testbed",
18-
"//src/material/checkbox",
19-
"//src/material/checkbox/testing",
2018
"//src/material/legacy-card",
19+
"//src/material/legacy-checkbox",
20+
"//src/material/legacy-checkbox/testing",
2121
"//src/material/radio",
2222
"@npm//@angular/forms",
2323
"@npm//@angular/platform-browser",
@@ -42,8 +42,8 @@ ng_test_library(
4242
":checkbox",
4343
"//src/cdk/testing",
4444
"//src/cdk/testing/testbed",
45-
"//src/material/checkbox",
46-
"//src/material/checkbox/testing",
45+
"//src/material/legacy-checkbox",
46+
"//src/material/legacy-checkbox/testing",
4747
"@npm//@angular/forms",
4848
"@npm//@angular/platform-browser-dynamic",
4949
],

‎src/components-examples/material/checkbox/checkbox-harness/checkbox-harness-example.spec.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
3-
import {MatCheckboxHarness} from '@angular/material/checkbox/testing';
3+
import {MatLegacyCheckboxHarness} from '@angular/material/legacy-checkbox/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
55
import {ReactiveFormsModule} from '@angular/forms';
6-
import {MatCheckboxModule} from '@angular/material/checkbox';
6+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77
import {CheckboxHarnessExample} from './checkbox-harness-example';
88

99
describe('CheckboxHarnessExample', () => {
@@ -12,7 +12,7 @@ describe('CheckboxHarnessExample', () => {
1212

1313
beforeEach(async () => {
1414
await TestBed.configureTestingModule({
15-
imports: [MatCheckboxModule, ReactiveFormsModule],
15+
imports: [MatLegacyCheckboxModule, ReactiveFormsModule],
1616
declarations: [CheckboxHarnessExample],
1717
}).compileComponents();
1818
fixture = TestBed.createComponent(CheckboxHarnessExample);
@@ -21,31 +21,37 @@ describe('CheckboxHarnessExample', () => {
2121
});
2222

2323
it('should load checkbox with name', async () => {
24-
const checkboxes = await loader.getAllHarnesses(MatCheckboxHarness.with({name: 'first-name'}));
24+
const checkboxes = await loader.getAllHarnesses(
25+
MatLegacyCheckboxHarness.with({name: 'first-name'}),
26+
);
2527
expect(checkboxes.length).toBe(1);
2628
expect(await checkboxes[0].getLabelText()).toBe('First');
2729
});
2830

2931
it('should get checked state', async () => {
30-
const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses(MatCheckboxHarness);
32+
const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses(
33+
MatLegacyCheckboxHarness,
34+
);
3135
expect(await checkedCheckbox.isChecked()).toBe(true);
3236
expect(await uncheckedCheckbox.isChecked()).toBe(false);
3337
});
3438

3539
it('should get name', async () => {
36-
const checkbox = await loader.getHarness(MatCheckboxHarness.with({label: 'First'}));
40+
const checkbox = await loader.getHarness(MatLegacyCheckboxHarness.with({label: 'First'}));
3741
expect(await checkbox.getName()).toBe('first-name');
3842
});
3943

4044
it('should get label text', async () => {
41-
const [firstCheckbox, secondCheckbox] = await loader.getAllHarnesses(MatCheckboxHarness);
45+
const [firstCheckbox, secondCheckbox] = await loader.getAllHarnesses(MatLegacyCheckboxHarness);
4246
expect(await firstCheckbox.getLabelText()).toBe('First');
4347
expect(await secondCheckbox.getLabelText()).toBe('Second');
4448
});
4549

4650
it('should toggle checkbox', async () => {
4751
fixture.componentInstance.disabled = false;
48-
const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses(MatCheckboxHarness);
52+
const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses(
53+
MatLegacyCheckboxHarness,
54+
);
4955
await checkedCheckbox.toggle();
5056
await uncheckedCheckbox.toggle();
5157
expect(await checkedCheckbox.isChecked()).toBe(false);

‎src/components-examples/material/checkbox/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
44
import {MatLegacyCardModule} from '@angular/material/legacy-card';
5-
import {MatCheckboxModule} from '@angular/material/checkbox';
5+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
66
import {MatRadioModule} from '@angular/material/radio';
77
import {CheckboxConfigurableExample} from './checkbox-configurable/checkbox-configurable-example';
88
import {CheckboxHarnessExample} from './checkbox-harness/checkbox-harness-example';
@@ -27,7 +27,7 @@ const EXAMPLES = [
2727
imports: [
2828
CommonModule,
2929
MatLegacyCardModule,
30-
MatCheckboxModule,
30+
MatLegacyCheckboxModule,
3131
MatRadioModule,
3232
FormsModule,
3333
ReactiveFormsModule,

‎src/components-examples/material/core/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/button",
14-
"//src/material/checkbox",
1514
"//src/material/core",
15+
"//src/material/legacy-checkbox",
1616
"//src/material/legacy-input",
1717
"@npm//@angular/forms",
1818
],

‎src/components-examples/material/core/index.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {NgModule} from '@angular/core';
22
import {FormsModule} from '@angular/forms';
33
import {MatButtonModule} from '@angular/material/button';
4-
import {MatCheckboxModule} from '@angular/material/checkbox';
4+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
55
import {MatRippleModule} from '@angular/material/core';
66
import {MatLegacyInputModule} from '@angular/material/legacy-input';
77
import {ElevationOverviewExample} from './elevation-overview/elevation-overview-example';
@@ -12,7 +12,13 @@ export {ElevationOverviewExample, RippleOverviewExample};
1212
const EXAMPLES = [ElevationOverviewExample, RippleOverviewExample];
1313

1414
@NgModule({
15-
imports: [MatButtonModule, MatCheckboxModule, MatLegacyInputModule, MatRippleModule, FormsModule],
15+
imports: [
16+
MatButtonModule,
17+
MatLegacyCheckboxModule,
18+
MatLegacyInputModule,
19+
MatRippleModule,
20+
FormsModule,
21+
],
1622
declarations: EXAMPLES,
1723
exports: EXAMPLES,
1824
})

‎src/components-examples/material/form-field/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ ng_module(
1616
"//src/cdk/testing",
1717
"//src/cdk/testing/testbed",
1818
"//src/material/button",
19-
"//src/material/checkbox",
2019
"//src/material/form-field",
2120
"//src/material/form-field/testing",
2221
"//src/material/icon",
2322
"//src/material/input",
2423
"//src/material/input/testing",
24+
"//src/material/legacy-checkbox",
2525
"//src/material/radio",
2626
"//src/material/select",
2727
"@npm//@angular/forms",

‎src/components-examples/material/form-field/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {ReactiveFormsModule} from '@angular/forms';
44
import {MatButtonModule} from '@angular/material/button';
5-
import {MatCheckboxModule} from '@angular/material/checkbox';
5+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
66
import {MatFormFieldModule} from '@angular/material/form-field';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatInputModule} from '@angular/material/input';
@@ -50,7 +50,7 @@ const EXAMPLES = [
5050
imports: [
5151
CommonModule,
5252
MatButtonModule,
53-
MatCheckboxModule,
53+
MatLegacyCheckboxModule,
5454
MatFormFieldModule,
5555
MatIconModule,
5656
MatInputModule,

‎src/components-examples/material/select/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ ng_module(
1515
deps = [
1616
"//src/cdk/testing",
1717
"//src/cdk/testing/testbed",
18-
"//src/material/checkbox",
1918
"//src/material/form-field",
2019
"//src/material/input",
20+
"//src/material/legacy-checkbox",
2121
"//src/material/select",
2222
"//src/material/select/testing",
2323
"@npm//@angular/forms",

‎src/components-examples/material/select/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
4-
import {MatCheckboxModule} from '@angular/material/checkbox';
4+
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
55
import {MatInputModule} from '@angular/material/input';
66
import {MatSelectModule} from '@angular/material/select';
77
import {SelectCustomTriggerExample} from './select-custom-trigger/select-custom-trigger-example';
@@ -61,7 +61,7 @@ const EXAMPLES = [
6161
imports: [
6262
CommonModule,
6363
FormsModule,
64-
MatCheckboxModule,
64+
MatLegacyCheckboxModule,
6565
MatInputModule,
6666
MatSelectModule,
6767
ReactiveFormsModule,

‎src/components-examples/material/sidenav/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ng_module(
1717
"//src/cdk/testing",
1818
"//src/cdk/testing/testbed",
1919
"//src/material/button",
20-
"//src/material/checkbox",
2120
"//src/material/icon",
21+
"//src/material/legacy-checkbox",
2222
"//src/material/legacy-select",
2323
"//src/material/list",
2424
"//src/material/radio",

0 commit comments

Comments
 (0)