Register CssLayout click listeners in onStateChanged instead of onConnectorHierarchyChange (#10003)

Test case (tests.components.ClickListeners) committed as part of #9956

Change-Id: I35f41a301ceebc43679098ae033656a18b82c4b1

1 files changed, 1 insertions, 2 deletions

diff --git a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
index 12ebb6a375..cfdda3dd1c 100644
--- a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
@@ -93,6 +93,7 @@ public class CssLayoutConnector extends AbstractLayoutConnector {
     @Override
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         super.onStateChanged(stateChangeEvent);
+        clickEventHandler.handleEventHandlerRegistration();
 
         for (ComponentConnector child : getChildComponents()) {
             if (!getState().childCss.containsKey(child)) {
@@ -123,8 +124,6 @@ public class CssLayoutConnector extends AbstractLayoutConnector {
      */
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
-        clickEventHandler.handleEventHandlerRegistration();
-
         int index = 0;
         for (ComponentConnector child : getChildComponents()) {
             VCaption childCaption = childToCaption.get(child);