From 879dd0cae30753d1b4c91e9c7025e391f5a621cc Mon Sep 17 00:00:00 2001
From: erdemcaygor <erdem.caygor@gmail.com>
Date: Tue, 10 Jun 2025 16:52:56 +0300
Subject: [PATCH] abp tree dropdown overlap bug fix

---
 .../tree/src/lib/components/tree.component.html       |  2 +-
 .../tree/src/lib/components/tree.component.ts         | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
index 82b3048868..8cd2058699 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
@@ -12,7 +12,7 @@
   (nzCheckboxChange)="onCheckboxChange($event)"
   (nzOnDrop)="onDrop($event)"
   [nzNoAnimation]="noAnimation"
-  (nzContextMenu)="dropdowns[$event.node?.key]?.toggle()"
+  (nzContextMenu)="onContextMenuChange($event)"
 />
 <ng-template #treeTemplate let-node>
   <div
diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
index 2d227787ca..efc2318ced 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
@@ -132,6 +132,17 @@ export class TreeComponent implements OnInit {
     this.dropdowns[key] = dropdown;
   }
 
+  onContextMenuChange(event: NzFormatEmitEvent) {
+    const dropdownKey = event.node?.key;
+
+    Object.entries(this.dropdowns).forEach(([key, dropdown]) => {
+      if (key !== dropdownKey && dropdown?.isOpen()) {
+        dropdown.close();
+      }
+    });
+    this.dropdowns[dropdownKey]?.toggle();
+  }
+
   setSelectedNode(node: any) {
     const newSelectedNode = this.findNode(node, this.nodes);
     this.selectedNode = { ...newSelectedNode };