Merge pull request #16067 from Kisters-BS/fix/openPopupMenuOnNewTarget

Fix popup menu cannot be opened on new target when already opened
primefaces · Jul 25, 2024 · 743e36b · 743e36b
2 parents 62cde62 + b20e829
commit 743e36b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/app/components/menu/menu.ts b/src/app/components/menu/menu.ts
@@ -409,12 +409,16 @@ export class Menu implements OnDestroy {
      * @group Method
      */
     public show(event: any) {
+        if(this.visible && this.target !== event.currentTarget) {
+            this.hide()
+        }
+
         this.target = event.currentTarget;
         this.relativeAlign = event.relativeAlign;
         this.visible = true;
         this.preventDocumentDefault = true;
         this.overlayVisible = true;
-        this.cd.markForCheck();
+        this.cd.detectChanges();
     }
 
     ngOnInit() {
@@ -466,6 +470,7 @@ export class Menu implements OnDestroy {
                     this.bindDocumentResizeListener();
                     this.bindScrollListener();
                     DomHandler.focus(this.listViewChild.nativeElement);
+                    this.preventDocumentDefault = true;
                 }
                 break;
 
@@ -516,7 +521,7 @@ export class Menu implements OnDestroy {
     public hide() {
         this.visible = false;
         this.relativeAlign = false;
-        this.cd.markForCheck();
+        this.cd.detectChanges();
     }
 
     onWindowResize() {
@@ -778,10 +783,6 @@ export class Menu implements OnDestroy {
         this.unbindDocumentResizeListener();
         this.unbindScrollListener();
         this.preventDocumentDefault = false;
-
-        if (!(this.cd as ViewRef).destroyed) {
-            this.target = null;
-        }
     }
 
     ngOnDestroy() {