fix #934 change listeners not fired when SuggestBox cleared from keyb…

…oard
DominoKit · Jul 14, 2024 · 70056a8 · 70056a8
1 parent 1065c23
commit 70056a8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/suggest/AbstractSuggestBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/suggest/AbstractSuggestBox.java
@@ -176,7 +176,7 @@ public AbstractSuggestBox(SuggestionsStore<T, E, O> store) {
                     })));
 
     getInputElement()
-        .onKeyDown(
+        .onKeyUp(
             keyEvents -> {
               keyEvents
                   .onArrowDown(
@@ -224,6 +224,14 @@ public AbstractSuggestBox(SuggestionsStore<T, E, O> store) {
                             onBackspace();
                           }
                         }
+                      })
+                  .onDelete(
+                      evt -> {
+                        if (!isReadOnly() && !isDisabled()) {
+                          evt.stopPropagation();
+                          evt.preventDefault();
+                          onBackspace();
+                        }
                       });
             });
   }

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/suggest/MultiSuggestBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/suggest/MultiSuggestBox.java
@@ -116,7 +116,6 @@ public void onOptionSelected(O option) {
     }
     withOption(option);
     fieldInput.appendChild(option);
-    selectedOptions.add(option);
     option.bindTo(this);
   }
 

diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/forms/suggest/SuggestBox.java b/domino-ui/src/main/java/org/dominokit/domino/ui/forms/suggest/SuggestBox.java
@@ -101,10 +101,7 @@ public V getValue() {
   /** Handles the "Backspace" key event. */
   @Override
   protected void onBackspace() {
-    if (nonNull(selectedOption)) {
-      selectedOption.remove();
-      selectedOption = null;
-    }
+    clearValue(isChangeListenersPaused());
   }
 
   /**
@@ -164,6 +161,7 @@ private void updateTextValue() {
   @Override
   public void onOptionDeselected(O option) {
     option.remove();
+    V oldValue = this.selectedOption.getValue();
     if (Objects.equals(this.selectedOption, option)) {
       this.selectedOption = null;
     }
@@ -184,7 +182,12 @@ public void onOptionDeselected(O option) {
   protected SuggestBox<V, E, O> clearValue(boolean silent) {
     if (nonNull(selectedOption)) {
       V oldValue = getValue();
-      withPauseChangeListenersToggle(true, field -> onOptionDeselected(selectedOption));
+      withPauseChangeListenersToggle(
+          true,
+          field -> {
+            onOptionDeselected(selectedOption);
+            getInputElement().element().value = null;
+          });
 
       if (!silent) {
         triggerClearListeners(oldValue);