Update ComboBox internal state on new item added (#11094)8.6.0.beta1

4 files changed, 45 insertions, 27 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VComboBox.java b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
index f80927ec1d..2575f056b9 100644
--- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java
+++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java
@@ -16,16 +16,6 @@
 
 package com.vaadin.client.ui;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.UUID;
-import java.util.logging.Logger;
-
 import com.google.gwt.animation.client.AnimationScheduler;
 import com.google.gwt.aria.client.Roles;
 import com.google.gwt.core.client.JavaScriptObject;
@@ -85,6 +75,15 @@ import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.shared.util.SharedUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.logging.Logger;
+
 /**
  * Client side implementation of the ComboBox component.
  *
@@ -258,12 +257,12 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
             return $entry(function(e) {
                 var deltaX = e.deltaX ? e.deltaX : -0.5*e.wheelDeltaX;
                 var deltaY = e.deltaY ? e.deltaY : -0.5*e.wheelDeltaY;
-
+        
                 // IE8 has only delta y
                 if (isNaN(deltaY)) {
                     deltaY = -0.5*e.wheelDelta;
                 }
-
+        
                 @com.vaadin.client.ui.VComboBox.JsniUtil::moveScrollFromEvent(*)(widget, deltaX, deltaY, e, e.deltaMode);
             });
         }-*/;
@@ -1636,6 +1635,11 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
             performSelection(selectedKey, oldSuggestionTextMatchTheOldSelection,
                     !isWaitingForFilteringResponse() || popupOpenerClicked);
 
+            // currentSuggestion should be set to match the value of the
+            // ComboBox, especially when a new item is added.
+            resetCurrentSuggestionIfNecessary(selectedKey, selectedCaption,
+                    selectedIconUri);
+
             cancelPendingPostFiltering();
 
             setSelectedCaption(selectedCaption);
@@ -1643,6 +1647,16 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
             setSelectedItemIcon(selectedIconUri);
         }
 
+        private void resetCurrentSuggestionIfNecessary(String selectedKey,
+                String selectedCaption, String selectedIconUri) {
+            if (currentSuggestion == null
+                    && (selectedKey != null || selectedCaption != null))
+                currentSuggestion = new ComboBoxSuggestion(selectedKey,
+                        selectedCaption, "", selectedIconUri);
+            else if (selectedKey == null && selectedCaption == null)
+                currentSuggestion = null;
+        }
+
     }
 
     // TODO decide whether this should change - affects themes and v7
@@ -2110,6 +2124,7 @@ public class VComboBox extends Composite implements Field, KeyDownHandler,
             currentSuggestion = null; // #13217
             selectedOptionKey = null;
             setText(getEmptySelectionCaption());
+            return;
         }
         // some item selected
         for (ComboBoxSuggestion suggestion : currentSuggestions) {
diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index 0a5a36c856..2d613a90a8 100644
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
@@ -186,20 +186,23 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
         @Override
         public void createNewItem(String itemValue) {
             // New option entered
-            boolean added = false;
+            boolean clientSideHandling = false;
             if (itemValue != null && !itemValue.isEmpty()) {
                 if (getNewItemProvider() != null) {
-                    Optional<T> item = getNewItemProvider().apply(itemValue);
-                    added = item.isPresent();
+                    getNewItemProvider().apply(itemValue).ifPresent(value -> {
+                        // Update state for the newly selected value
+                        setSelectedItem(value, true);
+                        getDataCommunicator().reset();
+                    });
                 } else if (getNewItemHandler() != null) {
                     getNewItemHandler().accept(itemValue);
                     // Up to the user to tell if no item was added.
-                    added = true;
+                    clientSideHandling = true;
                 }
             }
 
-            if (!added) {
-                // New item was not handled.
+            if (!clientSideHandling) {
+                // New item was maybe added with NewItemHandler
                 getRpcProxy(ComboBoxClientRpc.class).newItemNotAdded(itemValue);
             }
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNewItemProvider.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNewItemProvider.java
index 71f8503216..1d912c4bcc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNewItemProvider.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNewItemProvider.java
@@ -9,7 +9,7 @@ public class ComboBoxNewItemProvider
     @Override
     protected void configureNewItemHandling() {
         comboBox.setNewItemProvider(text -> {
-            if (Boolean.TRUE.equals(delay.getValue())) {
+            if (delay.getValue()) {
                 try {
                     Thread.sleep(2000);
                 } catch (InterruptedException e1) {
@@ -25,7 +25,7 @@ public class ComboBoxNewItemProvider
                 valueChangeLabel
                         .setValue("adding new item... count: " + items.size());
                 comboBox.getDataProvider().refreshAll();
-                if (Boolean.TRUE.equals(noSelection.getValue())) {
+                if (noSelection.getValue()) {
                     return Optional.empty();
                 }
             }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
index c45291c05b..0707ebd020 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingNewItemValueChangeTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.combobox;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.openqa.selenium.Keys;
@@ -190,19 +190,19 @@ public class ComboBoxSelectingNewItemValueChangeTest extends MultiBrowserTest {
     }
 
     private void assertValueChange(int count) {
-        assertTrue(changeLabelElement.getText().equals(String.format(
+        assertEquals(String.format(
                 "Value change count: %s Selection change count: %s user originated: true",
-                count, count)));
+                count, count), changeLabelElement.getText());
     }
 
     private void assertRejected(String value) {
-        assertTrue(changeLabelElement.getText()
-                .equals(String.format("item %s discarded", value)));
+        assertEquals(String.format("item %s discarded", value),
+                changeLabelElement.getText());
     }
 
     private void assertItemCount(int count) {
-        assertTrue(changeLabelElement.getText()
-                .equals(String.format("adding new item... count: %s", count)));
+        assertEquals(String.format("adding new item... count: %s", count),
+                changeLabelElement.getText());
     }
 
     private void reject(boolean reject) {