Only do hookUpPolymerElement for Polymer elements (#4147)

* Only do hookUpPolymerElement for Polymer elements

flow-client/src/main/java/com/vaadin/client/flow/binding/SimpleElementBindingStrategy.java

@@ -263,7 +263,9 @@ private native void bindPolymerModelProperties(StateNode node,
           var self = this;
           try {
               $wnd.customElements.whenDefined(element.localName).then( function () {
-                  self.@SimpleElementBindingStrategy::hookUpPolymerElement(*)(node, element);
+                  if ( @com.vaadin.client.PolymerUtils::isPolymerElement(*)(element) ) {
+                      self.@SimpleElementBindingStrategy::hookUpPolymerElement(*)(node, element);
+                  }
               });
           }
           catch (e) {
@@ -401,6 +403,8 @@ private void bindInitialModelProperties(StateNode stateNode,
 
     private void bindModelProperties(StateNode stateNode, Element htmlNode,
             String path) {
+        assert PolymerUtils.isPolymerElement(htmlNode);
+
         Command command = () -> stateNode
                 .getMap(NodeFeatures.ELEMENT_PROPERTIES)
                 .forEachProperty((property, key) -> bindSubProperty(stateNode,

flow-client/src/test-gwt/java/com/vaadin/client/flow/GwtBasicElementBinderTest.java

@@ -1685,11 +1685,14 @@ public void testReadyCallback_polymerElement_readyIsCalledAndNotified() {
 
     public void testReadyCallback_deferredPolymerElementAndNoListeners_readyIsCalled() {
         element = Browser.getDocument().createElement("x-my");
+        WidgetUtil.setJsProperty(element, "localName", "x-my");
+
         assertDeferredPolymerElement_originalReadyIsCalled(element);
     }
 
     public void testReadyCallback_deferredPolymerElement_readyIsCalledAndNotified() {
         element = Browser.getDocument().createElement("x-my");
+        WidgetUtil.setJsProperty(element, "localName", "x-my");
 
         PolymerUtils.addReadyListener(element,
                 () -> WidgetUtil.setJsProperty(element, "baz", "foobar"));
@@ -1701,6 +1704,7 @@ public void testReadyCallback_deferredPolymerElement_readyIsCalledAndNotified()
 
     private void assertDeferredPolymerElement_originalReadyIsCalled(
             Element element) {
+        initPolymer(element);
         mockWhenDefined(element);
 
         NativeFunction function = NativeFunction.create("this['foo']='bar';");
@@ -1792,6 +1796,8 @@ private native String getToString(Object value)
 
     private native void mockWhenDefined(Element element)
     /*-{
+        $wnd.OldPolymer = $wnd.Polymer;
+        $wnd.Polymer = null;
         $wnd.customElements = {
             whenDefined: function() {
                 return {
@@ -1805,6 +1811,7 @@ private native void mockWhenDefined(Element element)
 
     private native void runWhenDefined(Element element)
     /*-{
+        $wnd.Polymer = $wnd.OldPolymer;
         element.callback();
     }-*/;
 

flow-client/src/test-gwt/java/com/vaadin/client/flow/GwtPolymerModelTest.java

@@ -412,12 +412,13 @@ private native void addMockMethods(Element element)
         element._propertiesChanged = function() {
             element.propertiesChangedCallCount += 1;
         };
-    
+
         element.callbackCallCount = 0;
         $wnd.customElements = {
             whenDefined: function() {
                 return {
                     then: function (callback) {
+                        $wnd.Polymer = $wnd.OldPolymer;
                         element.callbackCallCount += 1;
                         callback();
                     }
@@ -443,6 +444,7 @@ private native void addMockMethods(Element element)
 
     private native void emulatePolymerNotLoaded()
     /*-{
+        $wnd.OldPolymer = $wnd.Polymer;
         $wnd.Polymer = null;
     }-*/;
 

flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/CustomCustomElementView.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2018 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.uitest.ui;
+
+import com.vaadin.flow.component.dependency.JavaScript;
+import com.vaadin.flow.component.html.NativeButton;
+import com.vaadin.flow.dom.Element;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.uitest.servlet.ViewTestLayout;
+
+@Route(value = "com.vaadin.flow.uitest.ui.CustomCustomElementView", layout = ViewTestLayout.class)
+@JavaScript("frontend://com/vaadin/flow/uitest/ui/CustomCustomElement.js")
+public class CustomCustomElementView extends AbstractDivView {
+
+    public CustomCustomElementView() {
+        Element element = new Element("custom-custom-element");
+        element.getStyle().set("display", "block");
+
+        element.setProperty("property", "initial");
+
+        getElement().appendChild(element);
+
+        add(new NativeButton("update property",
+                event -> element.setProperty("property", "updated")));
+    }
+
+}

flow-tests/test-root-context/src/main/webapp/frontend/com/vaadin/flow/uitest/ui/CustomCustomElement.js

@@ -0,0 +1,19 @@
+// A custom element that isn't using Polymer
+class CustomCustomElement extends HTMLElement {
+    static get is() { return 'custom-custom-element' }
+
+    constructor() {
+    	super();
+    	this.attachShadow({mode: "open"});
+    	this.property = "constructor";
+    }
+
+    set property(value) {
+    	this.shadowRoot.textContent = value;
+    }
+
+    get property() {
+    	return this.shadowRoot.textContent;
+    }
+}
+customElements.define(CustomCustomElement.is, CustomCustomElement);

flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/CustomCustomElementIT.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2017 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.uitest.ui;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openqa.selenium.By;
+
+import com.vaadin.flow.testutil.ChromeBrowserTest;
+import com.vaadin.testbench.TestBenchElement;
+
+public class CustomCustomElementIT extends ChromeBrowserTest {
+
+    @Before
+    public void setUp() {
+        open();
+    }
+
+    @Test
+    public void clickOnButton_removeFromLayout() {
+        TestBenchElement customElement = $("custom-custom-element").first();
+
+        Assert.assertEquals("initial",
+                customElement.getPropertyString("shadowRoot", "textContent"));
+
+        findElement(By.tagName("button")).click();
+
+        Assert.assertEquals("updated",
+                customElement.getPropertyString("shadowRoot", "textContent"));
+    }
+
+}