feat: Pass Java class info to browser in dev mode

vaadin · Mar 6, 2024 · 8e46bf5 · 8e46bf5
1 parent 258484c
commit 8e46bf5
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 0 deletions.
diff --git a/flow-client/src/main/java/com/vaadin/client/ApplicationConnection.java b/flow-client/src/main/java/com/vaadin/client/ApplicationConnection.java
@@ -27,6 +27,7 @@
 import com.vaadin.client.flow.binding.Binder;
 import com.vaadin.client.flow.dom.DomApi;
 import com.vaadin.client.flow.util.NativeFunction;
+import com.vaadin.flow.internal.nodefeature.NodeFeatures;
 
 import elemental.client.Browser;
 import elemental.dom.Element;
@@ -166,6 +167,12 @@ private native void publishJavascriptMethods(String applicationId,
         client.getByNodeId = $entry(function(nodeId) {
             return ap.@ApplicationConnection::getDomElementByNodeId(*)(nodeId);
         });
+        client.getNodeInfo = $entry(function(nodeId) {
+            return {
+                element: ap.@ApplicationConnection::getDomElementByNodeId(*)(nodeId),
+                javaClass: ap.@ApplicationConnection::getJavaClass(*)(nodeId)
+            };
+        });
         client.getNodeId = $entry(function(element) {
             return ap.@ApplicationConnection::getNodeId(*)(element);
         });
@@ -222,6 +229,14 @@ private native void publishJavascriptMethods(String applicationId,
     private Node getDomElementByNodeId(int id) {
         StateNode node = registry.getStateTree().getNode(id);
         return node == null ? null : node.getDomNode();
+
+    }
+
+    private String getJavaClass(int id) {
+        StateNode node = registry.getStateTree().getNode(id);
+        return node == null ? null
+                : node.getMap(NodeFeatures.ELEMENT_DATA).getProperty("jc")
+                        .getValueOrDefault(null);
     }
 
     private int getNodeId(Element element) {

diff --git a/flow-server/src/main/java/com/vaadin/flow/component/ComponentUtil.java b/flow-server/src/main/java/com/vaadin/flow/component/ComponentUtil.java
@@ -40,6 +40,7 @@
 import com.vaadin.flow.internal.ReflectionCache;
 import com.vaadin.flow.internal.StateNode;
 import com.vaadin.flow.internal.StateTree;
+import com.vaadin.flow.internal.nodefeature.ElementData;
 import com.vaadin.flow.internal.nodefeature.VirtualChildrenList;
 import com.vaadin.flow.router.Router;
 import com.vaadin.flow.server.Attributes;
@@ -245,6 +246,17 @@ && isAttachedToParent(component.getElement(), parent)) {
                         component.getElement().isEnabled());
             }
         }
+
+        if (!attachEvent.getUI().getSession().getConfiguration()
+                .isProductionMode()) {
+            StateNode n = component.getElement().getNode();
+            if (n.hasFeature(ElementData.class)) {
+                n.getFeature(ElementData.class)
+                        .setJavaClass(component.getClass());
+            }
+
+        }
+
     }
 
     /**

diff --git a/flow-server/src/main/java/com/vaadin/flow/internal/nodefeature/ElementData.java b/flow-server/src/main/java/com/vaadin/flow/internal/nodefeature/ElementData.java
@@ -18,6 +18,7 @@
 
 import java.io.Serializable;
 
+import com.vaadin.flow.component.Component;
 import com.vaadin.flow.internal.StateNode;
 
 import elemental.json.JsonValue;
@@ -105,4 +106,12 @@ public JsonValue getPayload() {
     public boolean allowsChanges() {
         return isVisible();
     }
+
+    public void setJavaClass(Class<? extends Component> componentClass) {
+        put(NodeProperties.JAVA_CLASS, componentClass.getName());
+    }
+
+    public String getJavaClass() {
+        return getOrDefault(NodeProperties.JAVA_CLASS, (String)null);
+    }
 }
diff --git a/flow-server/src/main/java/com/vaadin/flow/internal/nodefeature/NodeProperties.java b/flow-server/src/main/java/com/vaadin/flow/internal/nodefeature/NodeProperties.java
@@ -35,6 +35,11 @@ public final class NodeProperties {
      */
     public static final String PAYLOAD = "payload";
 
+    /**
+     * Key for {@link ElementData#getJavaClass()}.
+     */
+    public static final String JAVA_CLASS = "jc";
+
     /**
      * Key for {@link TextNodeMap#getText()}.
      */