Fix for fixing both styling and broken behavior with ListSelect

with newItemsAllowed enabled. #10537

Change-Id: I82682ffbc2bc1f2801a6826d7e0f78a82990ae9a

2 files changed, 16 insertions, 0 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index fa3b945163..4a3215bb21 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -3110,6 +3110,15 @@ public class ApplicationConnection {
      */
     @Deprecated
     public boolean hasEventListeners(Widget widget, String eventIdentifier) {
+        ComponentConnector connector = getConnectorMap().getConnector(widget);
+        if (connector == null) {
+            /*
+             * No connector will exist in cases where Vaadin widgets have been
+             * re-used without implementing server<->client communication.
+             */
+            return false;
+        }
+
         return hasEventListeners(getConnectorMap().getConnector(widget),
                 eventIdentifier);
     }
diff --git a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
index 93df05e347..86e857ac7f 100644
--- a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
+++ b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
@@ -18,6 +18,7 @@ package com.vaadin.client.ui.optiongroup;
 
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.Paintable;
+import com.vaadin.client.StyleConstants;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.client.ui.VNativeButton;
@@ -72,8 +73,14 @@ public abstract class OptionGroupBaseConnector extends AbstractFieldConnector
                 getWidget().newItemButton = new VNativeButton();
                 getWidget().newItemButton.setText("+");
                 getWidget().newItemButton.addClickHandler(getWidget());
+                getWidget().newItemButton
+                        .addStyleName(StyleConstants.UI_WIDGET);
                 getWidget().newItemField = new VTextField();
+                getWidget().newItemField.client = getConnection();
+                getWidget().newItemField.paintableId = getConnectorId();
                 getWidget().newItemField.addKeyPressHandler(getWidget());
+                getWidget().newItemField.addStyleName(StyleConstants.UI_WIDGET);
+
             }
             getWidget().newItemField.setEnabled(getWidget().isEnabled()
                     && !getWidget().isReadonly());