Add IE11 workaround for ListSelect multiselection. (#11631)

Fixes #11608

1 files changed, 13 insertions, 2 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VListSelect.java b/client/src/main/java/com/vaadin/client/ui/VListSelect.java
index f1a0b868ba..2a3b98996e 100644
--- a/client/src/main/java/com/vaadin/client/ui/VListSelect.java
+++ b/client/src/main/java/com/vaadin/client/ui/VListSelect.java
@@ -26,6 +26,7 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HasEnabled;
 import com.google.gwt.user.client.ui.ListBox;
+import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.FastStringSet;
 import com.vaadin.client.Focusable;
 import com.vaadin.client.connectors.AbstractMultiSelectConnector.MultiSelectWidget;
@@ -119,7 +120,12 @@ public class VListSelect extends Composite
         for (int i = 0; i < items.size(); i++) {
             final JsonObject item = items.get(i);
             // reuse existing option if possible
-            final String key = MultiSelectWidget.getKey(item);
+            String key = MultiSelectWidget.getKey(item);
+            if (BrowserInfo.get().isIE11() && key != null) {
+                // IE11 doesn't handle numerical keys well on Win7,
+                // prevent incorrect type handling with extra character
+                key += " ";
+            }
             if (i < select.getItemCount()) {
                 select.setItemText(i, MultiSelectWidget.getCaption(item));
                 select.setValue(i, key);
@@ -148,7 +154,12 @@ public class VListSelect extends Composite
         final FastStringSet selectedItemKeys = FastStringSet.create();
         for (int i = 0; i < select.getItemCount(); i++) {
             if (select.isItemSelected(i)) {
-                selectedItemKeys.add(select.getValue(i));
+                String key = select.getValue(i);
+                if (BrowserInfo.get().isIE11() && key != null) {
+                    // remove the IE11 workaround
+                    key = key.trim();
+                }
+                selectedItemKeys.add(key);
             }
         }
         return selectedItemKeys;