fix(cdk/menu): not clearing aria-controls on context menu

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

@@ -37,14 +37,14 @@ describe('CdkContextMenuTrigger', () => {
     }
 
     /** Get the context in which the context menu should trigger. */
-    function getMenuContext() {
+    function getMenuTrigger() {
       return fixture.componentInstance.triggerElement.nativeElement;
     }
 
     /** Open up the context menu and run change detection. */
     function openContextMenu() {
       // right click triggers a context menu event
-      dispatchMouseEvent(getMenuContext(), 'contextmenu');
+      dispatchMouseEvent(getMenuTrigger(), 'contextmenu');
       fixture.detectChanges();
     }
 
@@ -57,7 +57,7 @@ describe('CdkContextMenuTrigger', () => {
     it('should close out the context menu when clicking in the context', () => {
       openContextMenu();
 
-      getMenuContext().click();
+      getMenuTrigger().click();
       fixture.detectChanges();
 
       expect(getContextMenu()).not.toBeDefined();
@@ -143,6 +143,22 @@ describe('CdkContextMenuTrigger', () => {
       fixture.detectChanges();
       expect(getContextMenu()).toBeDefined();
     });
+
+    it('should toggle aria-controls depending on if the menu is open', () => {
+      const trigger = getMenuTrigger();
+
+      expect(trigger.hasAttribute('aria-controls')).toBe(false);
+      expect(getContextMenu()).not.toBeDefined();
+
+      openContextMenu();
+      expect(trigger.getAttribute('aria-controls')).toBeTruthy();
+      expect(getContextMenu()).toBeDefined();
+
+      trigger.click();
+      fixture.detectChanges();
+      expect(trigger.hasAttribute('aria-controls')).toBe(false);
+      expect(getContextMenu()).not.toBeDefined();
+    });
   });
 
   describe('nested context menu triggers', () => {

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

@@ -175,6 +175,8 @@ export class CdkContextMenuTrigger extends CdkMenuTriggerBase implements OnDestr
       if (item === this.childMenu && this.isOpen()) {
         this.closed.next();
         this.overlayRef!.detach();
+        this.childMenu = undefined;
+        this._changeDetectorRef.markForCheck();
       }
     });
   }