refactor: remove usage of Flow component renderer from Popover (#7791)

web-padawan · web-flow · commit f563bfd5ad9d · 2025-08-04T14:59:04.000+03:00
diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow-integration-tests/pom.xml b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow-integration-tests/pom.xml
@@ -80,11 +80,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-renderer-flow</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-testbench-core</artifactId>
diff --git a/vaadin-popover-flow-parent/vaadin-popover-flow/src/main/java/com/vaadin/flow/component/popover/Popover.java b/vaadin-popover-flow-parent/vaadin-popover-flow/src/main/java/com/vaadin/flow/component/popover/Popover.java
@@ -16,15 +16,10 @@
 package com.vaadin.flow.component.popover;
 
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
-import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEvent;
 import com.vaadin.flow.component.ComponentEventListener;
@@ -40,9 +35,6 @@
 import com.vaadin.flow.component.shared.HasThemeVariant;
 import com.vaadin.flow.component.shared.internal.OverlayClassListProxy;
 import com.vaadin.flow.dom.ClassList;
-import com.vaadin.flow.dom.Element;
-import com.vaadin.flow.dom.ElementDetachEvent;
-import com.vaadin.flow.dom.ElementDetachListener;
 import com.vaadin.flow.dom.Style;
 import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.shared.Registration;
@@ -82,8 +74,6 @@ public class Popover extends Component implements HasAriaLabel, HasComponents,
      * Constructs an empty popover.
      */
     public Popover() {
-        getElement().getNode().addAttachListener(this::attachComponentRenderer);
-
         // Workaround for: https://github.com/vaadin/flow/issues/3496
         getElement().setProperty("opened", false);
 
@@ -771,110 +761,6 @@ public void setHeight(String height) {
         getElement().setProperty("contentHeight", height);
     }
 
-    /**
-     * Adds the given components into this popover.
-     * <p>
-     * The elements in the DOM will not be children of the
-     * {@code <vaadin-popover>} element, but will be inserted into an overlay
-     * that is attached into the {@code <body>}.
-     *
-     * @param components
-     *            the components to add
-     */
-    @Override
-    public void add(Collection<Component> components) {
-        HasComponents.super.add(components);
-
-        updateVirtualChildNodeIds();
-    }
-
-    /**
-     * Adds the given component into this popover at the given index.
-     * <p>
-     * The element in the DOM will not be child of the {@code <vaadin-popover>}
-     * element, but will be inserted into an overlay that is attached into the
-     * {@code <body>}.
-     *
-     * @param index
-     *            the index, where the component will be added.
-     *
-     * @param component
-     *            the component to add
-     */
-    @Override
-    public void addComponentAtIndex(int index, Component component) {
-        HasComponents.super.addComponentAtIndex(index, component);
-
-        updateVirtualChildNodeIds();
-    }
-
-    private void attachComponentRenderer() {
-        getElement().executeJs(
-                "Vaadin.FlowComponentHost.patchVirtualContainer(this)");
-
-        String appId = UI.getCurrent().getInternals().getAppId();
-
-        getElement().executeJs(
-                "this.renderer = (root) => Vaadin.FlowComponentHost.setChildNodes($0, this.virtualChildNodeIds, root)",
-                appId);
-    }
-
-    private Map<Element, Registration> childDetachListenerMap = new HashMap<>();
-
-    // Must not use lambda here as that would break serialization. See
-    // https://github.com/vaadin/flow-components/issues/5597
-    private ElementDetachListener childDetachListener = new ElementDetachListener() {
-        @Override
-        public void onDetach(ElementDetachEvent e) {
-            var child = e.getSource();
-            var childDetachedFromContainer = !getElement().getChildren()
-                    .anyMatch(containerChild -> Objects.equals(child,
-                            containerChild));
-
-            if (childDetachedFromContainer) {
-                // The child was removed from the popover
-
-                // Remove the registration for the child detach listener
-                childDetachListenerMap.get(child).remove();
-                childDetachListenerMap.remove(child);
-
-                updateVirtualChildNodeIds();
-            }
-        }
-    };
-
-    @Override
-    protected void onAttach(AttachEvent attachEvent) {
-        super.onAttach(attachEvent);
-
-        updateVirtualChildNodeIds();
-    }
-
-    /**
-     * Updates the virtualChildNodeIds property of the popover element.
-     * <p>
-     * This method is called whenever the popover's child components change.
-     * <p>
-     * Also calls {@code requestContentUpdate} on the popover element to trigger
-     * the content update.
-     */
-    private void updateVirtualChildNodeIds() {
-        // Add detach listeners (child may be removed with removeFromParent())
-        getElement().getChildren().forEach(child -> {
-            if (!childDetachListenerMap.containsKey(child)) {
-                childDetachListenerMap.put(child,
-                        child.addDetachListener(childDetachListener));
-            }
-        });
-
-        getElement().setPropertyList("virtualChildNodeIds",
-                getElement().getChildren()
-                        .map(element -> element.getNode().getId())
-                        .collect(Collectors.toList()));
-
-        getElement().callJsFunction("requestContentUpdate");
-    }
-
     /**
      * Sets the CSS class names of the popover overlay element. This method
      * overwrites any previous set class names.
diff --git a/vaadin-popover-flow-parent/vaadin-popover-flow/src/test/java/com/vaadin/flow/component/popover/PopoverChildrenTest.java b/vaadin-popover-flow-parent/vaadin-popover-flow/src/test/java/com/vaadin/flow/component/popover/PopoverChildrenTest.java
