Skip to content

Commit 653457e

Browse files
authored
feat(cdk/menu): move experimental CDK menu into stable (#24826)
Moves the code for the CDK experimental menu into the CDK.
1 parent c03fd6e commit 653457e

File tree

72 files changed

+494
-50
lines changed

Some content is hidden

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

72 files changed

+494
-50
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
/src/cdk/drag-drop/** @crisbeto
7878
/src/cdk/keycodes/** @andrewseguin
7979
/src/cdk/layout/** @andrewseguin
80+
/src/cdk/menu/** @mmalerba @crisbeto
8081
/src/cdk/observers/** @andrewseguin @crisbeto
8182
/src/cdk/overlay/** @jelbourn @crisbeto
8283
/src/cdk/platform/** @andrewseguin @devversion
@@ -132,7 +133,6 @@
132133
/src/cdk-experimental/* @andrewseguin
133134
/src/cdk-experimental/column-resize/** @andrewseguin
134135
/src/cdk-experimental/combobox/** @jelbourn
135-
/src/cdk-experimental/menu/** @jelbourn
136136
/src/cdk-experimental/popover-edit/** @andrewseguin
137137
/src/cdk-experimental/scrolling/** @mmalerba
138138
/src/cdk-experimental/table-scroll-container/** @andrewseguin
@@ -156,7 +156,6 @@
156156
/src/dev-app/cdk-dialog/** @crisbeto
157157
/src/dev-app/cdk-experimental-combobox/** @jelbourn
158158
/src/dev-app/cdk-experimental-listbox/** @jelbourn
159-
/src/dev-app/cdk-experimental-menu/** @jelbourn
160159
/src/dev-app/checkbox/** @jelbourn @devversion
161160
/src/dev-app/chips/** @andrewseguin
162161
/src/dev-app/clipboard/** @andrewseguin
@@ -178,6 +177,7 @@
178177
/src/dev-app/icon/** @andrewseguin
179178
/src/dev-app/input/** @mmalerba
180179
/src/dev-app/layout/** @andrewseguin
180+
/src/dev-app/cdk-menu/** @mmalerba @crisbeto
181181
/src/dev-app/input-modality/** @jelbourn
182182
/src/dev-app/list/** @andrewseguin @crisbeto @devversion
183183
/src/dev-app/live-announcer/** @jelbourn

.ng-dev/commit-message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export const commitMessage: CommitMessageConfig = {
1212
'cdk-experimental/column-resize',
1313
'cdk-experimental/combobox',
1414
'cdk-experimental/listbox',
15-
'cdk-experimental/menu',
1615
'cdk-experimental/popover-edit',
1716
'cdk-experimental/scrolling',
1817
'cdk-experimental/selection',
@@ -27,6 +26,7 @@ export const commitMessage: CommitMessageConfig = {
2726
'cdk/drag-drop',
2827
'cdk/keycodes',
2928
'cdk/layout',
29+
'cdk/menu',
3030
'cdk/observers',
3131
'cdk/overlay',
3232
'cdk/platform',

src/cdk-experimental/config.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
CDK_EXPERIMENTAL_ENTRYPOINTS = [
33
"column-resize",
44
"combobox",
5-
"menu",
65
"listbox",
76
"popover-edit",
87
"scrolling",

src/cdk/config.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CDK_ENTRYPOINTS = [
1010
"drag-drop",
1111
"keycodes",
1212
"layout",
13+
"menu",
1314
"observers",
1415
"overlay",
1516
"platform",

src/cdk-experimental/menu/BUILD.bazel renamed to src/cdk/menu/BUILD.bazel

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
1+
load(
2+
"//tools:defaults.bzl",
3+
"markdown_to_html",
4+
"ng_module",
5+
"ng_test_library",
6+
"ng_web_test_suite",
7+
)
28

39
package(default_visibility = ["//visibility:public"])
410

@@ -41,3 +47,13 @@ ng_web_test_suite(
4147
name = "unit_tests",
4248
deps = [":unit_test_sources"],
4349
)
50+
51+
markdown_to_html(
52+
name = "overview",
53+
srcs = [":menu.md"],
54+
)
55+
56+
filegroup(
57+
name = "source-files",
58+
srcs = glob(["**/*.ts"]),
59+
)

src/cdk-experimental/menu/context-menu-trigger.spec.ts renamed to src/cdk/menu/context-menu-trigger.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {CdkMenuModule} from './menu-module';
33
import {TestBed, waitForAsync, ComponentFixture} from '@angular/core/testing';
44
import {CdkMenu} from './menu';
55
import {CdkContextMenuTrigger} from './context-menu-trigger';
6-
import {dispatchKeyboardEvent, dispatchMouseEvent} from '../../cdk/testing/private';
6+
import {dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing/private';
77
import {By} from '@angular/platform-browser';
88
import {CdkMenuItem} from './menu-item';
99
import {CdkMenuTrigger} from './menu-trigger';
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/cdk-experimental/menu/menu-item-checkbox.spec.ts renamed to src/cdk/menu/menu-item-checkbox.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {CdkMenuModule} from './menu-module';
55
import {CdkMenuItemCheckbox} from './menu-item-checkbox';
66
import {CDK_MENU} from './menu-interface';
77
import {CdkMenu} from './menu';
8-
import {MENU_STACK, MenuStack} from '@angular/cdk-experimental/menu/menu-stack';
8+
import {MENU_STACK, MenuStack} from './menu-stack';
99

1010
describe('MenuItemCheckbox', () => {
1111
let fixture: ComponentFixture<SingleCheckboxButton>;

src/cdk-experimental/menu/menu-item-radio.spec.ts renamed to src/cdk/menu/menu-item-radio.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {CdkMenuModule} from './menu-module';
66
import {CdkMenuItemRadio} from './menu-item-radio';
77
import {CDK_MENU} from './menu-interface';
88
import {CdkMenu} from './menu';
9-
import {MENU_STACK, MenuStack} from '@angular/cdk-experimental/menu/menu-stack';
9+
import {MENU_STACK, MenuStack} from './menu-stack';
1010

1111
describe('MenuItemRadio', () => {
1212
let fixture: ComponentFixture<SimpleRadioButton>;

src/cdk-experimental/menu/menu-item.spec.ts renamed to src/cdk/menu/menu-item.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {CdkMenuModule} from './menu-module';
55
import {CdkMenuItem} from './menu-item';
66
import {CDK_MENU} from './menu-interface';
77
import {CdkMenu} from './menu';
8-
import {MENU_STACK, MenuStack} from '@angular/cdk-experimental/menu/menu-stack';
8+
import {MENU_STACK, MenuStack} from './menu-stack';
99

1010
describe('MenuItem', () => {
1111
describe('with no complex inner elements', () => {
File renamed without changes.
File renamed without changes.

src/cdk-experimental/menu/menu.md renamed to src/cdk/menu/menu.md

Lines changed: 11 additions & 12 deletions
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/components-examples/cdk-experimental/menu/BUILD.bazel renamed to src/components-examples/cdk/menu/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ng_module(
1010
"**/*.css",
1111
]),
1212
deps = [
13-
"//src/cdk-experimental/menu",
13+
"//src/cdk/menu",
1414
"@npm//@angular/forms",
1515
],
1616
)

src/components-examples/cdk-experimental/menu/index.ts renamed to src/components-examples/cdk/menu/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {NgModule} from '@angular/core';
2-
import {CdkMenuModule} from '@angular/cdk-experimental/menu';
2+
import {CdkMenuModule} from '@angular/cdk/menu';
33
import {CdkMenuStandaloneMenuExample} from './cdk-menu-standalone-menu/cdk-menu-standalone-menu-example';
44
import {CdkMenuStandaloneStatefulMenuExample} from './cdk-menu-standalone-stateful-menu/cdk-menu-standalone-stateful-menu-example';
55
import {CdkMenuMenubarExample} from './cdk-menu-menubar/cdk-menu-menubar-example';

src/components-examples/config.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ ALL_EXAMPLES = [
5454
"//src/components-examples/cdk/clipboard",
5555
"//src/components-examples/cdk/a11y",
5656
"//src/components-examples/cdk/layout",
57+
"//src/components-examples/cdk/menu",
5758
"//src/components-examples/cdk/overlay",
58-
"//src/components-examples/cdk-experimental/menu",
5959
"//src/components-examples/cdk-experimental/popover-edit",
6060
"//src/components-examples/cdk-experimental/selection",
6161
]

src/dev-app/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ng_module(
2626
"//src/dev-app/cdk-dialog",
2727
"//src/dev-app/cdk-experimental-combobox",
2828
"//src/dev-app/cdk-experimental-listbox",
29-
"//src/dev-app/cdk-experimental-menu",
29+
"//src/dev-app/cdk-menu",
3030
"//src/dev-app/checkbox",
3131
"//src/dev-app/chips",
3232
"//src/dev-app/clipboard",

src/dev-app/cdk-experimental-menu/BUILD.bazel renamed to src/dev-app/cdk-menu/BUILD.bazel

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

55
ng_module(
6-
name = "cdk-experimental-menu",
6+
name = "cdk-menu",
77
srcs = glob(["**/*.ts"]),
88
assets = [
99
"cdk-menu-demo.html",
1010
"cdk-menu-demo.css",
1111
],
1212
deps = [
13-
"//src/cdk-experimental/menu",
14-
"//src/components-examples/cdk-experimental/menu",
13+
"//src/cdk/menu",
14+
"//src/components-examples/cdk/menu",
1515
"@npm//@angular/router",
1616
],
1717
)

src/dev-app/cdk-experimental-menu/cdk-menu-demo-module.ts renamed to src/dev-app/cdk-menu/cdk-menu-demo-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import {NgModule} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
1111
import {RouterModule} from '@angular/router';
12-
import {CdkMenuModule} from '@angular/cdk-experimental/menu';
13-
import {CdkMenuExamplesModule} from '@angular/components-examples/cdk-experimental/menu';
12+
import {CdkMenuModule} from '@angular/cdk/menu';
13+
import {CdkMenuExamplesModule} from '@angular/components-examples/cdk/menu';
1414

1515
import {CdkMenuDemo} from './cdk-menu-demo';
1616

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ export class DevAppLayout {
3737
{name: 'Button', route: '/button'},
3838
{name: 'Card', route: '/card'},
3939
{name: 'CDK Dialog', route: '/cdk-dialog'},
40+
{name: 'CDK Menu', route: '/cdk-menu'},
4041
{name: 'CDK Experimental Combobox', route: '/cdk-experimental-combobox'},
4142
{name: 'CDK Experimental Listbox', route: '/cdk-experimental-listbox'},
42-
{name: 'CDK Experimental Menu', route: '/cdk-experimental-menu'},
4343
{name: 'Checkbox', route: '/checkbox'},
4444
{name: 'Chips', route: '/chips'},
4545
{name: 'Clipboard', route: '/clipboard'},

src/dev-app/menubar/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ng_module(
1010
":mat_menubar_demo_scss",
1111
],
1212
deps = [
13-
"//src/cdk-experimental/menu",
13+
"//src/cdk/menu",
1414
"//src/material-experimental/menubar",
1515
"@npm//@angular/router",
1616
],

src/dev-app/menubar/mat-menubar-demo-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {NgModule} from '@angular/core';
1010
import {RouterModule} from '@angular/router';
1111
import {MatMenuBarModule} from '@angular/material-experimental/menubar';
12-
import {CdkMenuModule} from '@angular/cdk-experimental/menu';
12+
import {CdkMenuModule} from '@angular/cdk/menu';
1313
import {MatMenuBarDemo, DemoMenu, DemoMenuItem} from './mat-menubar-demo';
1414

1515
@NgModule({

src/dev-app/menubar/mat-menubar-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, ViewEncapsulation} from '@angular/core';
10-
import {CdkMenu, CdkMenuItem, CdkMenuGroup, CDK_MENU} from '@angular/cdk-experimental/menu';
10+
import {CdkMenu, CdkMenuItem, CdkMenuGroup, CDK_MENU} from '@angular/cdk/menu';
1111

1212
@Component({
1313
templateUrl: 'mat-menubar-demo.html',

src/dev-app/routes.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ export const DEV_APP_ROUTES: Routes = [
6262
),
6363
},
6464
{
65-
path: 'cdk-experimental-menu',
66-
loadChildren: () =>
67-
import('./cdk-experimental-menu/cdk-menu-demo-module').then(m => m.CdkMenuDemoModule),
65+
path: 'cdk-menu',
66+
loadChildren: () => import('./cdk-menu/cdk-menu-demo-module').then(m => m.CdkMenuDemoModule),
6867
},
6968
{
7069
path: 'checkbox',

src/material-experimental/menubar/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ng_module(
2020
":menubar-item.css",
2121
] + glob(["**/*.html"]),
2222
deps = [
23-
"//src/cdk-experimental/menu",
23+
"//src/cdk/menu",
2424
"@npm//@angular/core",
2525
],
2626
)
@@ -48,8 +48,8 @@ ng_test_library(
4848
),
4949
deps = [
5050
":menubar",
51-
"//src/cdk-experimental/menu",
5251
"//src/cdk/keycodes",
52+
"//src/cdk/menu",
5353
"//src/cdk/testing/private",
5454
"@npm//@angular/platform-browser",
5555
],

src/material-experimental/menubar/menubar-item.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, ElementRef, ViewChild} from '@angular/core';
22
import {ComponentFixture, waitForAsync, TestBed} from '@angular/core/testing';
3-
import {CdkMenuItem, CdkMenuModule, CdkMenu} from '@angular/cdk-experimental/menu';
3+
import {CdkMenuItem, CdkMenuModule, CdkMenu} from '@angular/cdk/menu';
44
import {MatMenuBarItem} from './menubar-item';
55
import {MatMenuBarModule} from './menubar-module';
66

src/material-experimental/menubar/menubar-item.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {Component, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
10-
import {CdkMenuItem} from '@angular/cdk-experimental/menu';
10+
import {CdkMenuItem} from '@angular/cdk/menu';
1111

1212
/** Removes all icons from within the given element. */
1313
function removeIcons(element: Element) {

src/material-experimental/menubar/menubar-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {CdkMenuModule} from '@angular/cdk-experimental/menu';
10+
import {CdkMenuModule} from '@angular/cdk/menu';
1111
import {MatMenuBar} from './menubar';
1212
import {MatMenuBarItem} from './menubar-item';
1313

src/material-experimental/menubar/menubar.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, ViewChild, ElementRef} from '@angular/core';
22
import {RIGHT_ARROW} from '@angular/cdk/keycodes';
3-
import {CdkMenuBar} from '@angular/cdk-experimental/menu';
3+
import {CdkMenuBar} from '@angular/cdk/menu';
44
import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
55
import {dispatchKeyboardEvent} from '../../cdk/testing/private';
66
import {MatMenuBarModule} from './menubar-module';

src/material-experimental/menubar/menubar.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
*/
88

99
import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core';
10-
import {
11-
CDK_MENU,
12-
CdkMenuBar,
13-
CdkMenuGroup,
14-
MenuStack,
15-
MENU_STACK,
16-
} from '@angular/cdk-experimental/menu';
10+
import {CDK_MENU, CdkMenuBar, CdkMenuGroup, MenuStack, MENU_STACK} from '@angular/cdk/menu';
1711

1812
/**
1913
* A material design Menubar adhering to the functionality of CdkMenuBar. MatMenubar

0 commit comments

Comments
 (0)