Skip to content

Commit 443f358

Browse files
committed
refactor(cdk/menu): convert all directives to standalone (#25904)
Converts all of the `@angular/cdk/menu` directives to `standalone` so that they can be used as host directives. (cherry picked from commit a273032)
1 parent a3a0974 commit 443f358

File tree

11 files changed

+23
-16
lines changed

11 files changed

+23
-16
lines changed

src/cdk/menu/context-menu-trigger.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export type ContextMenuCoordinates = {x: number; y: number};
5757
@Directive({
5858
selector: '[cdkContextMenuTriggerFor]',
5959
exportAs: 'cdkContextMenuTriggerFor',
60+
standalone: true,
6061
host: {
6162
'[attr.data-cdk-menu-stack-id]': 'null',
6263
'(contextmenu)': '_openOnContextMenu($event)',

src/cdk/menu/menu-aim.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ export class TargetMenuAim implements MenuAim, OnDestroy {
254254
@Directive({
255255
selector: '[cdkTargetMenuAim]',
256256
exportAs: 'cdkTargetMenuAim',
257+
standalone: true,
257258
providers: [{provide: MENU_AIM, useClass: TargetMenuAim}],
258259
})
259260
export class CdkTargetMenuAim {}

src/cdk/menu/menu-bar.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {CdkMenuBase} from './menu-base';
3131
@Directive({
3232
selector: '[cdkMenuBar]',
3333
exportAs: 'cdkMenuBar',
34+
standalone: true,
3435
host: {
3536
'role': 'menubar',
3637
'class': 'cdk-menu-bar',

src/cdk/menu/menu-group.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
1515
@Directive({
1616
selector: '[cdkMenuGroup]',
1717
exportAs: 'cdkMenuGroup',
18+
standalone: true,
1819
host: {
1920
'role': 'group',
2021
'class': 'cdk-menu-group',

src/cdk/menu/menu-item-checkbox.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {CdkMenuItem} from './menu-item';
1717
@Directive({
1818
selector: '[cdkMenuItemCheckbox]',
1919
exportAs: 'cdkMenuItemCheckbox',
20+
standalone: true,
2021
host: {
2122
'role': 'menuitemcheckbox',
2223
'[class.cdk-menu-item-checkbox]': 'true',

src/cdk/menu/menu-item-radio.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ let nextId = 0;
2222
@Directive({
2323
selector: '[cdkMenuItemRadio]',
2424
exportAs: 'cdkMenuItemRadio',
25+
standalone: true,
2526
host: {
2627
'role': 'menuitemradio',
2728
'[class.cdk-menu-item-radio]': 'true',

src/cdk/menu/menu-item.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import {MENU_AIM, Toggler} from './menu-aim';
3636
@Directive({
3737
selector: '[cdkMenuItem]',
3838
exportAs: 'cdkMenuItem',
39+
standalone: true,
3940
host: {
4041
'role': 'menuitem',
4142
'class': 'cdk-menu-item',

src/cdk/menu/menu-module.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import {CdkMenuTrigger} from './menu-trigger';
1818
import {CdkContextMenuTrigger} from './context-menu-trigger';
1919
import {CdkTargetMenuAim} from './menu-aim';
2020

21-
/** The list of components and directives that should be declared and exported from this module. */
22-
const EXPORTED_DECLARATIONS = [
21+
const MENU_DIRECTIVES = [
2322
CdkMenuBar,
2423
CdkMenu,
2524
CdkMenuItem,
@@ -33,8 +32,7 @@ const EXPORTED_DECLARATIONS = [
3332

3433
/** Module that declares components and directives for the CDK menu. */
3534
@NgModule({
36-
imports: [OverlayModule],
37-
exports: EXPORTED_DECLARATIONS,
38-
declarations: EXPORTED_DECLARATIONS,
35+
imports: [OverlayModule, ...MENU_DIRECTIVES],
36+
exports: MENU_DIRECTIVES,
3937
})
4038
export class CdkMenuModule {}

src/cdk/menu/menu-trigger.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import {CdkMenuTriggerBase, MENU_TRIGGER} from './menu-trigger-base';
4242
@Directive({
4343
selector: '[cdkMenuTriggerFor]',
4444
exportAs: 'cdkMenuTriggerFor',
45+
standalone: true,
4546
host: {
4647
'class': 'cdk-menu-trigger',
4748
'aria-haspopup': 'menu',

src/cdk/menu/menu.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {CdkMenuBase} from './menu-base';
2525
@Directive({
2626
selector: '[cdkMenu]',
2727
exportAs: 'cdkMenu',
28+
standalone: true,
2829
host: {
2930
'role': 'menu',
3031
'class': 'cdk-menu',

0 commit comments

Comments
 (0)