Skip to content

Commit 9621eef

Browse files
authored
docs(material/menu): switch examples and demo to MDC (#25571)
1 parent ee95a76 commit 9621eef

File tree

13 files changed

+50
-50
lines changed

13 files changed

+50
-50
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
/src/dev-app/legacy-dialog/** @devversion
189189
/src/dev-app/legacy-input/** @mmalerba
190190
/src/dev-app/legacy-list/** @mmalerba
191+
/src/dev-app/legacy-menu/** @crisbeto
191192
/src/dev-app/legacy-paginator/** @crisbeto
192193
/src/dev-app/legacy-select/** @crisbeto
193194
/src/dev-app/legacy-snack-bar/** @andrewseguin
@@ -199,7 +200,6 @@
199200
/src/dev-app/mdc-button/** @andrewseguin
200201
/src/dev-app/legacy-button/** @andrewseguin
201202
/src/dev-app/mdc-chips/** @mmalerba
202-
/src/dev-app/mdc-menu/** @crisbeto
203203
/src/dev-app/mdc-progress-bar/** @crisbeto
204204
/src/dev-app/mdc-progress-spinner/** @mmalerba
205205
/src/dev-app/mdc-radio/** @mmalerba

src/components-examples/material/menu/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ng_module(
1616
"//src/cdk/overlay",
1717
"//src/cdk/testing",
1818
"//src/cdk/testing/testbed",
19+
"//src/material/button",
1920
"//src/material/icon",
20-
"//src/material/legacy-button",
21-
"//src/material/legacy-menu",
22-
"//src/material/legacy-menu/testing",
21+
"//src/material/menu",
22+
"//src/material/menu/testing",
2323
"@npm//@angular/platform-browser",
2424
"@npm//@angular/platform-browser-dynamic",
2525
"@npm//@types/jasmine",
@@ -42,8 +42,8 @@ ng_test_library(
4242
":menu",
4343
"//src/cdk/testing",
4444
"//src/cdk/testing/testbed",
45-
"//src/material/legacy-menu",
46-
"//src/material/legacy-menu/testing",
45+
"//src/material/menu",
46+
"//src/material/menu/testing",
4747
"@npm//@angular/platform-browser",
4848
"@npm//@angular/platform-browser-dynamic",
4949
],

src/components-examples/material/menu/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {NgModule} from '@angular/core';
2-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
2+
import {MatButtonModule} from '@angular/material/button';
33
import {MatIconModule} from '@angular/material/icon';
4-
import {MatLegacyMenuModule} from '@angular/material/legacy-menu';
4+
import {MatMenuModule} from '@angular/material/menu';
55
import {MenuIconsExample} from './menu-icons/menu-icons-example';
66
import {MenuOverviewExample} from './menu-overview/menu-overview-example';
77
import {MenuPositionExample} from './menu-position/menu-position-example';
@@ -25,7 +25,7 @@ const EXAMPLES = [
2525
];
2626

2727
@NgModule({
28-
imports: [MatLegacyButtonModule, MatIconModule, MatLegacyMenuModule],
28+
imports: [MatButtonModule, MatIconModule, MatMenuModule],
2929
declarations: EXAMPLES,
3030
exports: EXAMPLES,
3131
})

src/components-examples/material/menu/menu-harness/menu-harness-example.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
3-
import {MatLegacyMenuHarness} from '@angular/material/legacy-menu/testing';
3+
import {MatMenuHarness} from '@angular/material/menu/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatLegacyMenuModule} from '@angular/material/legacy-menu';
5+
import {MatMenuModule} from '@angular/material/menu';
66
import {MenuHarnessExample} from './menu-harness-example';
77
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
88

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

1313
beforeEach(async () => {
1414
await TestBed.configureTestingModule({
15-
imports: [MatLegacyMenuModule, NoopAnimationsModule],
15+
imports: [MatMenuModule, NoopAnimationsModule],
1616
declarations: [MenuHarnessExample],
1717
}).compileComponents();
1818
fixture = TestBed.createComponent(MenuHarnessExample);
@@ -21,24 +21,24 @@ describe('MenuHarnessExample', () => {
2121
});
2222

2323
it('should load all menu harnesses', async () => {
24-
const menues = await loader.getAllHarnesses(MatLegacyMenuHarness);
24+
const menues = await loader.getAllHarnesses(MatMenuHarness);
2525
expect(menues.length).toBe(2);
2626
});
2727

2828
it('should get disabled state', async () => {
29-
const [enabledMenu, disabledMenu] = await loader.getAllHarnesses(MatLegacyMenuHarness);
29+
const [enabledMenu, disabledMenu] = await loader.getAllHarnesses(MatMenuHarness);
3030
expect(await enabledMenu.isDisabled()).toBe(false);
3131
expect(await disabledMenu.isDisabled()).toBe(true);
3232
});
3333

3434
it('should get menu text', async () => {
35-
const [firstMenu, secondMenu] = await loader.getAllHarnesses(MatLegacyMenuHarness);
35+
const [firstMenu, secondMenu] = await loader.getAllHarnesses(MatMenuHarness);
3636
expect(await firstMenu.getTriggerText()).toBe('Settings');
3737
expect(await secondMenu.getTriggerText()).toBe('Disabled menu');
3838
});
3939

4040
it('should open and close', async () => {
41-
const menu = await loader.getHarness(MatLegacyMenuHarness.with({triggerText: 'Settings'}));
41+
const menu = await loader.getHarness(MatMenuHarness.with({triggerText: 'Settings'}));
4242
expect(await menu.isOpen()).toBe(false);
4343
await menu.open();
4444
expect(await menu.isOpen()).toBe(true);
@@ -47,7 +47,7 @@ describe('MenuHarnessExample', () => {
4747
});
4848

4949
it('should get all items', async () => {
50-
const menu = await loader.getHarness(MatLegacyMenuHarness.with({triggerText: 'Settings'}));
50+
const menu = await loader.getHarness(MatMenuHarness.with({triggerText: 'Settings'}));
5151
await menu.open();
5252
expect((await menu.getItems()).length).toBe(2);
5353
});

src/dev-app/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ng_module(
5353
"//src/dev-app/legacy-dialog",
5454
"//src/dev-app/legacy-input",
5555
"//src/dev-app/legacy-list",
56+
"//src/dev-app/legacy-menu",
5657
"//src/dev-app/legacy-paginator",
5758
"//src/dev-app/legacy-select",
5859
"//src/dev-app/legacy-snack-bar",
@@ -62,7 +63,6 @@ ng_module(
6263
"//src/dev-app/live-announcer",
6364
"//src/dev-app/mdc-autocomplete",
6465
"//src/dev-app/mdc-chips",
65-
"//src/dev-app/mdc-menu",
6666
"//src/dev-app/mdc-progress-bar",
6767
"//src/dev-app/mdc-progress-spinner",
6868
"//src/dev-app/mdc-radio",

src/dev-app/dev-app/dev-app-layout.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ export class DevAppLayout {
105105
{name: 'YouTube Player', route: '/youtube-player'},
106106
{name: 'MDC Autocomplete', route: '/mdc-autocomplete'},
107107
{name: 'MDC Chips', route: '/mdc-chips'},
108-
{name: 'MDC Menu', route: '/mdc-menu'},
109108
{name: 'MDC Progress Bar', route: '/mdc-progress-bar'},
110109
{name: 'MDC Progress Spinner', route: '/mdc-progress-spinner'},
111110
{name: 'MDC Radio', route: '/mdc-radio'},
@@ -118,6 +117,7 @@ export class DevAppLayout {
118117
{name: 'Legacy Dialog', route: '/legacy-dialog'},
119118
{name: 'Legacy Input', route: '/legacy-input'},
120119
{name: 'Legacy List', route: '/legacy-list'},
120+
{name: 'Legacy Menu', route: '/legacy-menu'},
121121
{name: 'Legacy Paginator', route: '/legacy-paginator'},
122122
{name: 'Legacy Select', route: '/legacy-select'},
123123
{name: 'Legacy Snack Bar', route: '/legacy-snack-bar'},

src/dev-app/mdc-menu/BUILD.bazel renamed to src/dev-app/legacy-menu/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ load("//tools:defaults.bzl", "ng_module", "sass_binary")
33
package(default_visibility = ["//visibility:public"])
44

55
ng_module(
6-
name = "mdc-menu",
6+
name = "legacy-menu",
77
srcs = glob(["**/*.ts"]),
88
assets = [
9-
"mdc-menu-demo.html",
10-
":mdc_menu_demo_scss",
9+
"legacy-menu-demo.html",
10+
":legacy_menu_demo_scss",
1111
],
1212
deps = [
13-
"//src/material/button",
1413
"//src/material/divider",
1514
"//src/material/icon",
16-
"//src/material/menu",
15+
"//src/material/legacy-button",
16+
"//src/material/legacy-menu",
1717
"//src/material/toolbar",
1818
],
1919
)
2020

2121
sass_binary(
22-
name = "mdc_menu_demo_scss",
23-
src = "mdc-menu-demo.scss",
22+
name = "legacy_menu_demo_scss",
23+
src = "legacy-menu-demo.scss",
2424
)

src/dev-app/mdc-menu/mdc-menu-demo.ts renamed to src/dev-app/legacy-menu/legacy-menu-demo.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88

99
import {Component} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
11-
import {MatMenuModule} from '@angular/material/menu';
12-
import {MatToolbarModule} from '@angular/material/toolbar';
13-
import {MatIconModule} from '@angular/material/icon';
11+
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
1412
import {MatDividerModule} from '@angular/material/divider';
15-
import {MatButtonModule} from '@angular/material/button';
13+
import {MatIconModule} from '@angular/material/icon';
14+
import {MatLegacyMenuModule} from '@angular/material/legacy-menu';
15+
import {MatToolbarModule} from '@angular/material/toolbar';
1616

1717
@Component({
18-
selector: 'mdc-menu-demo',
19-
templateUrl: 'mdc-menu-demo.html',
20-
styleUrls: ['mdc-menu-demo.css'],
18+
selector: 'legacy-menu-demo',
19+
templateUrl: 'legacy-menu-demo.html',
20+
styleUrls: ['legacy-menu-demo.css'],
2121
standalone: true,
2222
imports: [
2323
CommonModule,
24-
MatMenuModule,
25-
MatButtonModule,
26-
MatToolbarModule,
27-
MatIconModule,
24+
MatLegacyButtonModule,
2825
MatDividerModule,
26+
MatIconModule,
27+
MatLegacyMenuModule,
28+
MatToolbarModule,
2929
],
3030
})
31-
export class MdcMenuDemo {
31+
export class LegacyMenuDemo {
3232
selected = '';
3333
items = [
3434
{text: 'Refresh'},

src/dev-app/menu/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ng_module(
1010
":menu_demo_scss",
1111
],
1212
deps = [
13+
"//src/material/button",
1314
"//src/material/divider",
1415
"//src/material/icon",
15-
"//src/material/legacy-button",
16-
"//src/material/legacy-menu",
16+
"//src/material/menu",
1717
"//src/material/toolbar",
1818
],
1919
)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
import {Component} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
11-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
12-
import {MatDividerModule} from '@angular/material/divider';
13-
import {MatIconModule} from '@angular/material/icon';
14-
import {MatLegacyMenuModule} from '@angular/material/legacy-menu';
11+
import {MatMenuModule} from '@angular/material/menu';
1512
import {MatToolbarModule} from '@angular/material/toolbar';
13+
import {MatIconModule} from '@angular/material/icon';
14+
import {MatDividerModule} from '@angular/material/divider';
15+
import {MatButtonModule} from '@angular/material/button';
1616

1717
@Component({
1818
selector: 'menu-demo',
@@ -21,11 +21,11 @@ import {MatToolbarModule} from '@angular/material/toolbar';
2121
standalone: true,
2222
imports: [
2323
CommonModule,
24-
MatLegacyButtonModule,
25-
MatDividerModule,
26-
MatIconModule,
27-
MatLegacyMenuModule,
24+
MatMenuModule,
25+
MatButtonModule,
2826
MatToolbarModule,
27+
MatIconModule,
28+
MatDividerModule,
2929
],
3030
})
3131
export class MenuDemo {

src/dev-app/routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ export const DEV_APP_ROUTES: Routes = [
181181
loadComponent: () => import('./list/list-demo').then(m => m.ListDemo),
182182
},
183183
{
184-
path: 'mdc-menu',
185-
loadComponent: () => import('./mdc-menu/mdc-menu-demo').then(m => m.MdcMenuDemo),
184+
path: 'legacy-menu',
185+
loadComponent: () => import('./legacy-menu/legacy-menu-demo').then(m => m.LegacyMenuDemo),
186186
},
187187
{
188188
path: 'legacy-paginator',

0 commit comments

Comments
 (0)