Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/cdk/menu/context-menu-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export class CdkContextMenuTrigger extends CdkMenuTriggerBase implements OnDestr
positionStrategy: this._getOverlayPositionStrategy(coordinates),
scrollStrategy: this.menuScrollStrategy(),
direction: this._directionality || undefined,
usePopover: true,
});
}

Expand All @@ -150,6 +151,7 @@ export class CdkContextMenuTrigger extends CdkMenuTriggerBase implements OnDestr
return createFlexibleConnectedPositionStrategy(this._injector, coordinates)
.withLockedPosition()
.withGrowAfterOpen()
.withPopoverLocation('inline')
.withPositions(this.menuPosition ?? CONTEXT_MENU_POSITIONS);
}

Expand Down
13 changes: 12 additions & 1 deletion src/cdk/menu/menu-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.dev/license
*/

import {AfterContentInit, Directive} from '@angular/core';
import {inject, AfterContentInit, Directive, ElementRef} from '@angular/core';
import {
DOWN_ARROW,
ESCAPE,
Expand All @@ -16,6 +16,7 @@ import {
TAB,
UP_ARROW,
} from '../keycodes';
import {_getEventTarget} from '../platform';
import {takeUntil} from 'rxjs/operators';
import {CdkMenuGroup} from './menu-group';
import {CDK_MENU} from './menu-interface';
Expand Down Expand Up @@ -43,6 +44,8 @@ import {CdkMenuBase} from './menu-base';
],
})
export class CdkMenuBar extends CdkMenuBase implements AfterContentInit {
private readonly _elementRef: ElementRef<HTMLElement> = inject(ElementRef);

/** The direction items in the menu flow. */
override readonly orientation = 'horizontal';

Expand All @@ -60,6 +63,14 @@ export class CdkMenuBar extends CdkMenuBase implements AfterContentInit {
*/
_handleKeyEvent(event: KeyboardEvent) {
const keyManager = this.keyManager;

// Now that menu overlays can be inlined, need to verify triggering on own events.
const element = this._elementRef.nativeElement;
const target = _getEventTarget(event) as HTMLElement;
if (target !== element && target.parentElement !== element) {
return;
}

switch (event.keyCode) {
case UP_ARROW:
case DOWN_ARROW:
Expand Down
2 changes: 2 additions & 0 deletions src/cdk/menu/menu-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ export class CdkMenuTrigger extends CdkMenuTriggerBase implements OnChanges, OnD
positionStrategy: this._getOverlayPositionStrategy(),
scrollStrategy: this.menuScrollStrategy(),
direction: this._directionality || undefined,
usePopover: true,
});
}

Expand All @@ -284,6 +285,7 @@ export class CdkMenuTrigger extends CdkMenuTriggerBase implements OnChanges, OnD
return createFlexibleConnectedPositionStrategy(this._injector, this._elementRef)
.withLockedPosition()
.withFlexibleDimensions(false)
.withPopoverLocation('inline')
.withPositions(this._getOverlayPositions());
}

Expand Down
20 changes: 19 additions & 1 deletion src/cdk/menu/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@
* found in the LICENSE file at https://angular.dev/license
*/

import {AfterContentInit, Directive, EventEmitter, inject, OnDestroy, Output} from '@angular/core';
import {
AfterContentInit,
Directive,
ElementRef,
EventEmitter,
inject,
OnDestroy,
Output,
} from '@angular/core';
import {ESCAPE, hasModifierKey, LEFT_ARROW, RIGHT_ARROW, TAB} from '../keycodes';
import {_getEventTarget} from '../platform';
import {takeUntil} from 'rxjs/operators';
import {CdkMenuGroup} from './menu-group';
import {CDK_MENU} from './menu-interface';
Expand Down Expand Up @@ -38,6 +47,7 @@ import {CdkMenuBase} from './menu-base';
],
})
export class CdkMenu extends CdkMenuBase implements AfterContentInit, OnDestroy {
private readonly _elementRef: ElementRef<HTMLElement> = inject(ElementRef);
private _parentTrigger = inject(MENU_TRIGGER, {optional: true});

/** Event emitted when the menu is closed. */
Expand Down Expand Up @@ -71,6 +81,14 @@ export class CdkMenu extends CdkMenuBase implements AfterContentInit, OnDestroy
*/
_handleKeyEvent(event: KeyboardEvent) {
const keyManager = this.keyManager;

// Now that menu overlays can be inlined, need to verify triggering on own events.
const element = this._elementRef.nativeElement;
const target = _getEventTarget(event) as HTMLElement;
if (target !== element && target.parentElement !== element) {
return;
}

switch (event.keyCode) {
case LEFT_ARROW:
case RIGHT_ARROW:
Expand Down
Loading