From f4aaa14c3c36fac93786fd9e737166b3cb780f28 Mon Sep 17 00:00:00 2001
From: "Ahmad K. Bawaneh" <ahmad.bawaneh@dominokit.com>
Date: Mon, 17 Feb 2025 18:36:01 +0300
Subject: [PATCH] fix #1010 Tree expand/shrink function does not work reliable

---
 .../org/dominokit/domino/ui/collapsible/Collapsible.java     | 1 -
 .../domino/ui/collapsible/TreeHeightCollapseStrategy.java    | 4 ++++
 .../src/main/java/org/dominokit/domino/ui/tree/TreeNode.java | 5 +----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/Collapsible.java b/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/Collapsible.java
index b63b1643f..d082dd482 100644
--- a/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/Collapsible.java
+++ b/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/Collapsible.java
@@ -17,7 +17,6 @@
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static org.dominokit.domino.ui.utils.Domino.*;
 import static org.dominokit.domino.ui.utils.ElementsFactory.elements;
 
 import elemental2.dom.Element;
diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/TreeHeightCollapseStrategy.java b/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/TreeHeightCollapseStrategy.java
index 9ef0b9c64..14695fbfb 100644
--- a/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/TreeHeightCollapseStrategy.java
+++ b/domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/TreeHeightCollapseStrategy.java
@@ -207,11 +207,15 @@ private void collapseElement(Element element) {
     if (dui_transition_none.isAppliedTo(node)) {
       node.setAttribute(DUI_COLLAPSED, "true");
       node.setCssProperty(this.heightVar, node.getAttribute(DUI_COLLAPSED_HEIGHT) + "px");
+      handlers.onCollapseCompleted().run();
+      collapsing = false;
     } else {
       DomGlobal.requestAnimationFrame(
           timestamp -> {
             node.setAttribute(DUI_COLLAPSED, "true");
             node.setCssProperty(this.heightVar, node.getAttribute(DUI_COLLAPSED_HEIGHT) + "px");
+            handlers.onCollapseCompleted().run();
+            collapsing = false;
           });
     }
   }
diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/tree/TreeNode.java b/domino-ui/src/main/java/org/dominokit/domino/ui/tree/TreeNode.java
index 1e0332c40..06aef086b 100644
--- a/domino-ui/src/main/java/org/dominokit/domino/ui/tree/TreeNode.java
+++ b/domino-ui/src/main/java/org/dominokit/domino/ui/tree/TreeNode.java
@@ -26,10 +26,7 @@
 import static org.dominokit.domino.ui.utils.Domino.span;
 import static org.dominokit.domino.ui.utils.Domino.ul;
 
-import elemental2.dom.Element;
-import elemental2.dom.EventListener;
-import elemental2.dom.HTMLAnchorElement;
-import elemental2.dom.HTMLLIElement;
+import elemental2.dom.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;