File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ export abstract class CdkMenuTriggerBase implements OnDestroy {
5858 readonly closed : EventEmitter < void > = new EventEmitter ( ) ;
5959
6060 /** Template reference variable to the menu this trigger opens */
61- menuTemplateRef : TemplateRef < unknown > ;
61+ menuTemplateRef : TemplateRef < unknown > | null ;
6262
6363 /** Context data to be passed along to the menu template */
6464 menuData : unknown ;
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ import {CdkMenuTriggerBase, MENU_TRIGGER} from './menu-trigger-base';
4444 exportAs : 'cdkMenuTriggerFor' ,
4545 host : {
4646 'class' : 'cdk-menu-trigger' ,
47- 'aria-haspopup' : 'menu' ,
47+ '[attr. aria-haspopup] ' : 'menuTemplateRef ? " menu" : null ' ,
4848 '[attr.aria-expanded]' : 'isOpen()' ,
4949 '(focusin)' : '_setHasFocus(true)' ,
5050 '(focusout)' : '_setHasFocus(false)' ,
@@ -98,7 +98,7 @@ export class CdkMenuTrigger extends CdkMenuTriggerBase implements OnDestroy {
9898
9999 /** Open the attached menu. */
100100 open ( ) {
101- if ( ! this . isOpen ( ) ) {
101+ if ( ! this . isOpen ( ) && this . menuTemplateRef != null ) {
102102 this . opened . next ( ) ;
103103
104104 this . overlayRef = this . overlayRef || this . _overlay . create ( this . _getOverlayConfig ( ) ) ;
You can’t perform that action at this time.
0 commit comments