LibWeb: Test nested elements in InlinePaintable::hit_test()

Before this change we were ignoring nested paintables inside inline paintable during hit-testing, but now we recurse into subtree. Fixes SerenityOS#22927
kalenikaliaksandr · Jan 25, 2024 · 2856874 · 2856874
1 parent 7bcb560
commit 2856874
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/Tests/LibWeb/Text/expected/hit_testing/nested-inline-paintables.txt b/Tests/LibWeb/Text/expected/hit_testing/nested-inline-paintables.txt
@@ -0,0 +1 @@
+   lang "en"    <SPAN id="name" >
diff --git a/Tests/LibWeb/Text/input/hit_testing/nested-inline-paintables.html b/Tests/LibWeb/Text/input/hit_testing/nested-inline-paintables.html
@@ -0,0 +1,14 @@
+<script src="../include.js"></script>
+<body>
+    <span id="outer">
+        <span id="inner">
+            <span id="name">lang</span>
+            <span id="value">"en"</span>
+        </span>
+    </span>
+    <script type="text/javascript">
+        test(() => {
+            printElement(internals.hitTest(10, 10).node.parentNode);
+        });
+    </script>
+</body>
diff --git a/Tests/LibWeb/Text/input/include.js b/Tests/LibWeb/Text/input/include.js
@@ -17,6 +17,14 @@ function println(s) {
     __outputElement.appendChild(document.createTextNode(s + "\n"));
 }
 
+function printElement(e) {
+    let element_string = `<${e.nodeName} `;
+    if (e.id)
+        element_string += `id="${e.id}" `;
+    element_string += ">";
+    println(element_string);
+}
+
 document.addEventListener("DOMContentLoaded", function () {
     __outputElement = document.createElement("pre");
     __outputElement.setAttribute("id", "out");

diff --git a/Userland/Libraries/LibWeb/Painting/InlinePaintable.cpp b/Userland/Libraries/LibWeb/Painting/InlinePaintable.cpp
@@ -162,6 +162,8 @@ void InlinePaintable::for_each_fragment(Callback callback) const
 
 Optional<HitTestResult> InlinePaintable::hit_test(CSSPixelPoint position, HitTestType type) const
 {
+    //    dbgln(">>> InlinePaintable::hit_test({})", layout_node().debug_description());
+
     for (auto& fragment : m_fragments) {
         if (is<Layout::Box>(fragment.layout_node()) && static_cast<Layout::Box const&>(fragment.layout_node()).paintable_box()->stacking_context())
             continue;
@@ -173,7 +175,19 @@ Optional<HitTestResult> InlinePaintable::hit_test(CSSPixelPoint position, HitTes
                 fragment.text_index_at(position.x()) };
         }
     }
-    return {};
+
+    Optional<HitTestResult> hit_test_result;
+    for_each_child([&](Paintable const& child) {
+        if (child.stacking_context())
+            return IterationDecision::Continue;
+        if (auto result = child.hit_test(position, type); result.has_value()) {
+            hit_test_result = result;
+            return IterationDecision::Break;
+        }
+        return IterationDecision::Continue;
+    });
+
+    return hit_test_result;
 }
 
 CSSPixelRect InlinePaintable::bounding_rect() const