fix #1091 DateBox expand listeners not getting called correctly

Author: vegegoku

domino-ui/src/main/java/org/dominokit/domino/ui/animations/Animation.java

@@ -15,7 +15,6 @@
  */
 package org.dominokit.domino.ui.animations;
 
-import static org.dominokit.domino.ui.utils.Domino.*;
 import static org.dominokit.domino.ui.utils.ElementsFactory.elements;
 
 import elemental2.dom.Element;
@@ -59,6 +58,7 @@ public class Animation {
   private StartHandler startHandler = DEFAULT_START_HANDLER;
   private EventListener stopListener;
   private double repeatCount = 1;
+  private boolean completed = false;
 
   /**
    * Creates a new Animation instance for the provided element.
@@ -196,6 +196,7 @@ public Animation beforeStart(StartHandler startHandler) {
    * @return same instance
    */
   public Animation animate() {
+    this.completed = false;
     if (delay > 0) {
       new Timer() {
         @Override
@@ -267,6 +268,11 @@ public void stop(boolean silent) {
     if (!silent) {
       callback.onComplete(element.element());
     }
+    this.completed = true;
+  }
+
+  public boolean isCompleted() {
+    return completed;
   }
 
   /**

domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/AnimationCollapseStrategy.java

@@ -17,7 +17,6 @@
 
 import static java.util.Objects.nonNull;
 import static org.dominokit.domino.ui.style.DisplayCss.dui_hidden;
-import static org.dominokit.domino.ui.utils.Domino.*;
 import static org.dominokit.domino.ui.utils.ElementsFactory.elements;
 
 import elemental2.dom.Element;
@@ -95,6 +94,7 @@ public AnimationCollapseStrategy(AnimationCollapseOptions options) {
   @Override
   public void expand(Element element) {
     if (!showing) {
+      handlers.onBeforeExpand().run();
       elements.elementOf(element).removeCss(this.options.getShowDuration().getStyle());
       elements.elementOf(element).removeCss(this.options.getHideDuration().getStyle());
       showAnimation =
@@ -127,7 +127,8 @@ public void expand(Element element) {
   /** @dominokit-site-ignore {@inheritDoc} */
   @Override
   public void collapse(Element element) {
-    Optional.ofNullable(showAnimation).ifPresent(animation -> animation.stop(false));
+    Optional.ofNullable(showAnimation)
+        .ifPresent(animation -> animation.stop(animation.isCompleted()));
     if (!hiding) {
       elements.elementOf(element).removeCss(this.options.getShowDuration().getStyle());
       elements.elementOf(element).removeCss(this.options.getHideDuration().getStyle());

domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/Collapsible.java

@@ -42,10 +42,10 @@ public class Collapsible implements IsElement<Element>, IsCollapsible<Collapsibl
   private boolean collapsed = false;
   private boolean forceHidden = false;
 
-  private List<CollapseHandler> collapseHandlers = new ArrayList<>();
-  private List<CollapseHandler> beforeCollapseHandlers = new ArrayList<>();
-  private List<ExpandHandler> expandHandlers = new ArrayList<>();
-  private List<ExpandHandler> beforeExpandHandlers = new ArrayList<>();
+  private List<CollapseHandler> collapseHandlers;
+  private List<CollapseHandler> beforeCollapseHandlers;
+  private List<ExpandHandler> expandHandlers;
+  private List<ExpandHandler> beforeExpandHandlers;
   private CollapseStrategy strategy = new DisplayCollapseStrategy();
 
   /**

domino-ui/src/main/java/org/dominokit/domino/ui/collapsible/DisplayCollapseStrategy.java

@@ -39,8 +39,8 @@ public void init(Element element, CollapsibleHandlers handlers) {
   /** @dominokit-site-ignore {@inheritDoc} */
   @Override
   public void expand(Element element) {
-    elements.elementOf(element).removeCss(dui_hidden).removeAttribute(DUI_COLLAPSED);
     this.handlers.onBeforeExpand().run();
+    elements.elementOf(element).removeCss(dui_hidden).removeAttribute(DUI_COLLAPSED);
     this.handlers.onExpandCompleted().run();
   }
 

domino-ui/src/main/java/org/dominokit/domino/ui/forms/DateBox.java

@@ -23,6 +23,7 @@
 import elemental2.dom.HTMLInputElement;
 import java.util.Date;
 import java.util.Objects;
+import org.dominokit.domino.ui.collapsible.Collapsible;
 import org.dominokit.domino.ui.datepicker.*;
 import org.dominokit.domino.ui.forms.validations.ValidationResult;
 import org.dominokit.domino.ui.i18n.CalendarLabels;
@@ -698,4 +699,9 @@ public DateBox withPopover(ChildHandler<DateBox, Popover> handler) {
     handler.apply(this, this.popover);
     return this;
   }
+
+  @Override
+  public Collapsible getCollapsible() {
+    return this.popover.getCollapsible();
+  }
 }