RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-19 01:17:35 +00:00
Code Issues Activity Actions

LibWeb: Do paint-order traversal in Document::element_from_point()

Browse source 
Specify callback for hit-test function to identify closest DOM element,
excluding text nodes. Add a previously failing test case.
This commit is contained in:
Aliaksandr Kalenik 2024-02-13 23:39:22 +01:00 • committed by Andreas Kling
parent 9d2809146f
commit 88ad871e2b
3 changed files with 48 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibWeb/Text/expected/DOM/Element-from-point-2.txt Normal file
View file

@ -0,0 +1 @@
hello <DIV id="c" >

36
Tests/LibWeb/Text/input/DOM/Element-from-point-2.html Normal file
View file

@ -0,0 +1,36 @@
<!DOCTYPE html>
<style>
.box {
width: 100px;
height: 100px;
position: absolute;
}
#a {
background-color: magenta;
z-index: 1;
transform: translate(110px, 10px);
}
#b {
background-color: mediumaquamarine;
z-index: 2;
transform: translate(120px, 20px);
}
#c {
background-color: greenyellow;
z-index: 3;
transform: translate(130px, 30px);
}
</style>
<div id="a" class="box"></div>
<div id="b" class="box"></div>
<div id="c" class="box">hello</div>
<script src="../include.js"></script>
<script>
test(() => {
const element = document.elementFromPoint(150, 50);
printElement(element);
});
</script>

15
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -3793,12 +3793,19 @@ Element const* Document::element_from_point(double x, double y)
// 2. If there is a box in the viewport that would be a target for hit testing at coordinates x,y, when applying the transforms // 2. If there is a box in the viewport that would be a target for hit testing at coordinates x,y, when applying the transforms
// that apply to the descendants of the viewport, return the associated element and terminate these steps. // that apply to the descendants of the viewport, return the associated element and terminate these steps.
Optional<Painting::HitTestResult> hit_test_result;
if (auto const* paintable_box = this->paintable_box(); paintable_box) { if (auto const* paintable_box = this->paintable_box(); paintable_box) {
if (auto result = paintable_box->hit_test(position, Painting::HitTestType::Exact); result.has_value()) { (void)paintable_box->hit_test(position, Painting::HitTestType::Exact, [&](Painting::HitTestResult result) {
if (auto* dom_node = result->dom_node(); dom_node && dom_node->is_element()) auto* dom_node = result.dom_node();
return static_cast<Element const*>(dom_node); if (dom_node && dom_node->is_element()) {
} hit_test_result = result;
return Painting::TraversalDecision::Break;
}
return Painting::TraversalDecision::Continue;
});
} }
if (hit_test_result.has_value())
return static_cast<Element*>(hit_test_result->dom_node());
// 3. If the document has a root element, return the root element and terminate these steps. // 3. If the document has a root element, return the root element and terminate these steps.
if (auto const* document_root_element = first_child_of_type<Element>(); document_root_element) if (auto const* document_root_element = first_child_of_type<Element>(); document_root_element)