Ensure that VComboBox.selectedOptionKey gets initial selection. (#11665)

Fixes #10741

1 files changed, 9 insertions, 2 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index 2709175c5c..b7d994745f 100644
--- a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -68,6 +68,8 @@ public class ComboBoxConnector extends AbstractListingConnector
      */
     private boolean forceDataSourceUpdate = false;
 
+    private boolean initialSelectionChangePending = true;
+
     @Override
     protected void init() {
         super.init();
@@ -138,8 +140,13 @@ public class ComboBoxConnector extends AbstractListingConnector
             "selectedItemIcon" })
     private void onSelectionChange() {
         if (getWidget().selectedOptionKey != getState().selectedItemKey) {
-            getWidget().selectedOptionKey = null;
-            getWidget().currentSuggestion = null;
+            if (initialSelectionChangePending) {
+                getWidget().selectedOptionKey = getState().selectedItemKey;
+            } else {
+                getWidget().selectedOptionKey = null;
+                getWidget().currentSuggestion = null;
+            }
+            initialSelectionChangePending = false;
         }
 
         clearNewItemHandlingIfMatch(getState().selectedItemCaption);