diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8e122f7fd439..bc6e9663afca 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -194,7 +194,7 @@ /src/dev-app/live-announcer/** @jelbourn /src/dev-app/mdc-autocomplete/** @crisbeto /src/dev-app/mdc-button/** @andrewseguin -/src/dev-app/mdc-checkbox/** @mmalerba +/src/dev-app/legacy-checkbox/** @mmalerba /src/dev-app/mdc-chips/** @mmalerba /src/dev-app/mdc-dialog/** @devversion /src/dev-app/mdc-list/** @mmalerba diff --git a/src/components-examples/material/checkbox/BUILD.bazel b/src/components-examples/material/checkbox/BUILD.bazel index cca9a4c9434f..90654ce87ee9 100644 --- a/src/components-examples/material/checkbox/BUILD.bazel +++ b/src/components-examples/material/checkbox/BUILD.bazel @@ -15,10 +15,10 @@ ng_module( deps = [ "//src/cdk/testing", "//src/cdk/testing/testbed", - "//src/material/legacy-card", - "//src/material/legacy-checkbox", - "//src/material/legacy-checkbox/testing", - "//src/material/legacy-radio", + "//src/material/card", + "//src/material/checkbox", + "//src/material/checkbox/testing", + "//src/material/radio", "@npm//@angular/forms", "@npm//@angular/platform-browser", "@npm//@angular/platform-browser-dynamic", @@ -42,8 +42,8 @@ ng_test_library( ":checkbox", "//src/cdk/testing", "//src/cdk/testing/testbed", - "//src/material/legacy-checkbox", - "//src/material/legacy-checkbox/testing", + "//src/material/checkbox", + "//src/material/checkbox/testing", "@npm//@angular/forms", "@npm//@angular/platform-browser-dynamic", ], diff --git a/src/components-examples/material/checkbox/checkbox-harness/checkbox-harness-example.spec.ts b/src/components-examples/material/checkbox/checkbox-harness/checkbox-harness-example.spec.ts index c8ad24db9d44..8741332bdc38 100644 --- a/src/components-examples/material/checkbox/checkbox-harness/checkbox-harness-example.spec.ts +++ b/src/components-examples/material/checkbox/checkbox-harness/checkbox-harness-example.spec.ts @@ -1,9 +1,9 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; -import {MatLegacyCheckboxHarness} from '@angular/material/legacy-checkbox/testing'; +import {MatCheckboxHarness} from '@angular/material/checkbox/testing'; import {HarnessLoader} from '@angular/cdk/testing'; import {ReactiveFormsModule} from '@angular/forms'; -import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox'; +import {MatCheckboxModule} from '@angular/material/checkbox'; import {CheckboxHarnessExample} from './checkbox-harness-example'; describe('CheckboxHarnessExample', () => { @@ -12,7 +12,7 @@ describe('CheckboxHarnessExample', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [MatLegacyCheckboxModule, ReactiveFormsModule], + imports: [MatCheckboxModule, ReactiveFormsModule], declarations: [CheckboxHarnessExample], }).compileComponents(); fixture = TestBed.createComponent(CheckboxHarnessExample); @@ -21,37 +21,31 @@ describe('CheckboxHarnessExample', () => { }); it('should load checkbox with name', async () => { - const checkboxes = await loader.getAllHarnesses( - MatLegacyCheckboxHarness.with({name: 'first-name'}), - ); + const checkboxes = await loader.getAllHarnesses(MatCheckboxHarness.with({name: 'first-name'})); expect(checkboxes.length).toBe(1); expect(await checkboxes[0].getLabelText()).toBe('First'); }); it('should get checked state', async () => { - const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses( - MatLegacyCheckboxHarness, - ); + const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses(MatCheckboxHarness); expect(await checkedCheckbox.isChecked()).toBe(true); expect(await uncheckedCheckbox.isChecked()).toBe(false); }); it('should get name', async () => { - const checkbox = await loader.getHarness(MatLegacyCheckboxHarness.with({label: 'First'})); + const checkbox = await loader.getHarness(MatCheckboxHarness.with({label: 'First'})); expect(await checkbox.getName()).toBe('first-name'); }); it('should get label text', async () => { - const [firstCheckbox, secondCheckbox] = await loader.getAllHarnesses(MatLegacyCheckboxHarness); + const [firstCheckbox, secondCheckbox] = await loader.getAllHarnesses(MatCheckboxHarness); expect(await firstCheckbox.getLabelText()).toBe('First'); expect(await secondCheckbox.getLabelText()).toBe('Second'); }); it('should toggle checkbox', async () => { fixture.componentInstance.disabled = false; - const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses( - MatLegacyCheckboxHarness, - ); + const [checkedCheckbox, uncheckedCheckbox] = await loader.getAllHarnesses(MatCheckboxHarness); await checkedCheckbox.toggle(); await uncheckedCheckbox.toggle(); expect(await checkedCheckbox.isChecked()).toBe(false); diff --git a/src/components-examples/material/checkbox/index.ts b/src/components-examples/material/checkbox/index.ts index 273218ede44b..a58046784231 100644 --- a/src/components-examples/material/checkbox/index.ts +++ b/src/components-examples/material/checkbox/index.ts @@ -1,9 +1,9 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {MatLegacyCardModule} from '@angular/material/legacy-card'; -import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox'; -import {MatLegacyRadioModule} from '@angular/material/legacy-radio'; +import {MatCardModule} from '@angular/material/card'; +import {MatCheckboxModule} from '@angular/material/checkbox'; +import {MatRadioModule} from '@angular/material/radio'; import {CheckboxConfigurableExample} from './checkbox-configurable/checkbox-configurable-example'; import {CheckboxHarnessExample} from './checkbox-harness/checkbox-harness-example'; import {CheckboxOverviewExample} from './checkbox-overview/checkbox-overview-example'; @@ -26,9 +26,9 @@ const EXAMPLES = [ @NgModule({ imports: [ CommonModule, - MatLegacyCardModule, - MatLegacyCheckboxModule, - MatLegacyRadioModule, + MatCardModule, + MatCheckboxModule, + MatRadioModule, FormsModule, ReactiveFormsModule, ], diff --git a/src/dev-app/BUILD.bazel b/src/dev-app/BUILD.bazel index 4f18a0991582..d36f7d2c96c4 100644 --- a/src/dev-app/BUILD.bazel +++ b/src/dev-app/BUILD.bazel @@ -48,6 +48,7 @@ ng_module( "//src/dev-app/input-modality", "//src/dev-app/layout", "//src/dev-app/legacy-card", + "//src/dev-app/legacy-checkbox", "//src/dev-app/legacy-input", "//src/dev-app/legacy-paginator", "//src/dev-app/legacy-select", @@ -58,7 +59,6 @@ ng_module( "//src/dev-app/live-announcer", "//src/dev-app/mdc-autocomplete", "//src/dev-app/mdc-button", - "//src/dev-app/mdc-checkbox", "//src/dev-app/mdc-chips", "//src/dev-app/mdc-dialog", "//src/dev-app/mdc-list", diff --git a/src/dev-app/checkbox/BUILD.bazel b/src/dev-app/checkbox/BUILD.bazel index e01b5da2142c..190471f72a4a 100644 --- a/src/dev-app/checkbox/BUILD.bazel +++ b/src/dev-app/checkbox/BUILD.bazel @@ -11,12 +11,12 @@ ng_module( ":checkbox_demo_scss", ], deps = [ - "//src/components-examples/material/checkbox", + "//src/material/checkbox", "//src/material/core", - "//src/material/legacy-checkbox", - "//src/material/legacy-form-field", - "//src/material/legacy-input", - "//src/material/legacy-select", + "//src/material/form-field", + "//src/material/input", + "//src/material/select", + "@npm//@angular/forms", ], ) diff --git a/src/dev-app/checkbox/checkbox-demo.html b/src/dev-app/checkbox/checkbox-demo.html index b14bf4c38ffa..73937c93eb2f 100644 --- a/src/dev-app/checkbox/checkbox-demo.html +++ b/src/dev-app/checkbox/checkbox-demo.html @@ -1,3 +1,22 @@ +