fix: mark ModalRoot annotation with @inherited (#8140) (#8141)

vaadin-bot · DiegoCardoso · web-flow · commit 529484529fbd · 2025-10-09T16:54:49.000+02:00
This allows the subclasses of any component using the `@ModalRoot`
annotation to access the annotation, which ensures that the Popover's
auto-attach mechanism to work for such subclasses.

Co-authored-by: Diego Cardoso &lt;diego@vaadin.com&gt;
diff --git a/vaadin-flow-components-shared-parent/vaadin-flow-components-base/src/main/java/com/vaadin/flow/component/shared/internal/ModalRoot.java b/vaadin-flow-components-shared-parent/vaadin-flow-components-base/src/main/java/com/vaadin/flow/component/shared/internal/ModalRoot.java
@@ -16,6 +16,7 @@
 package com.vaadin.flow.component.shared.internal;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -40,6 +41,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Inherited
 public @interface ModalRoot {
 
     /**
diff --git a/vaadin-popover-flow-parent/vaadin-popover-flow/src/test/java/com/vaadin/flow/component/popover/PopoverAutoAddTest.java b/vaadin-popover-flow-parent/vaadin-popover-flow/src/test/java/com/vaadin/flow/component/popover/PopoverAutoAddTest.java
@@ -230,6 +230,19 @@ public void popoverWithTargetInModalContainer_popoverAttachedToModal() {
                 popover.getParent().orElse(null));
     }
 
+    @Test
+    public void popoverWithTargetInModalSubContainer_popoverAttachedToModal() {
+        var modal = new TestModalSubContainer();
+        ui.add(modal);
+        var target = new Div();
+        modal.add(target);
+        var popover = new Popover();
+        popover.setTarget(target);
+        fakeClientResponse();
+        Assert.assertEquals("Popover should be attached to modal", modal,
+                popover.getParent().orElse(null));
+    }
+
     @Test
     public void popoverWithTargetInModalContainer_targetRemoved_popoverDetached() {
         var modal = new TestModalContainer();
@@ -311,4 +324,11 @@ public TestModalContainerWithSlot() {
             super();
         }
     }
+
+    @Tag("div")
+    public class TestModalSubContainer extends TestModalContainer {
+        public TestModalSubContainer() {
+            super();
+        }
+    }
 }
