summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibWeb/Layout
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2023-05-25 12:34:54 +0200
committerAndreas Kling <kling@serenityos.org>2023-05-25 14:42:24 +0200
commit7d24c13d8b6b0762b68d44f289083369e45879ae (patch)
treed26dc03fefc4a3ac2e6a7cc4d1d092efda9a1975 /Userland/Libraries/LibWeb/Layout
parent6fb661e781095d844a5f7d8f4d72a968b65960ee (diff)
downloadserenity-7d24c13d8b6b0762b68d44f289083369e45879ae.zip
LibWeb: Make input element placeholders look better
We now create a flex container inside the input element's UA shadow tree and add the placeholder and non-placeholder text as flex items (wrapped in elements whose style we can manipulate). This fixes the visual glitch where the placeholder would appear below the bounding box of the input element. It also allows us to align the text vertically inside the input element (like we're supposed to). In order to achieve this, I had to make two small architectural changes to layout tree building: - Elements can now report that they represent a given pseudo element. This allows us to instantiate the ::placeholder pseudo element as an actual DOM element inside the input element's UA shadow tree. - We no longer create a separate layout node for the shadow root itself. Instead, children of the shadow root are treated as if they were children of the DOM element itself for the purpose of layout tree building.
Diffstat (limited to 'Userland/Libraries/LibWeb/Layout')
-rw-r--r--Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp58
1 files changed, 23 insertions, 35 deletions
diff --git a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
index 7cb1fcda5b..9b3d88bc7d 100644
--- a/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
+++ b/Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
@@ -208,10 +208,6 @@ ErrorOr<void> TreeBuilder::create_pseudo_element_if_needed(DOM::Element& element
ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context& context)
{
- // If the parent doesn't have a layout node, we don't need one either.
- if (dom_node.parent_or_shadow_host() && !dom_node.parent_or_shadow_host()->layout_node())
- return {};
-
Optional<TemporaryChange<bool>> has_svg_root_change;
if (dom_node.is_svg_container()) {
@@ -228,10 +224,24 @@ ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::
if (is<DOM::Element>(dom_node)) {
auto& element = static_cast<DOM::Element&>(dom_node);
- element.clear_pseudo_element_nodes({});
- VERIFY(!element.needs_style_update());
- style = element.computed_css_values();
- display = style->display();
+
+ // Special path for ::placeholder, which corresponds to a synthetic DOM element inside the <input> UA shadow root.
+ // FIXME: This is very hackish. Find a better way to architect this.
+ if (element.pseudo_element() == CSS::Selector::PseudoElement::Placeholder) {
+ auto& input_element = verify_cast<HTML::HTMLInputElement>(*element.root().parent_or_shadow_host());
+ style = TRY(style_computer.compute_style(input_element, CSS::Selector::PseudoElement::Placeholder));
+ if (input_element.placeholder_value().has_value())
+ display = style->display();
+ else
+ display = CSS::Display::from_short(CSS::Display::Short::None);
+ }
+ // Common path: this is a regular DOM element. Style should be present already, thanks to Document::update_style().
+ else {
+ element.clear_pseudo_element_nodes({});
+ VERIFY(!element.needs_style_update());
+ style = element.computed_css_values();
+ display = style->display();
+ }
if (display.is_none())
return {};
layout_node = element.create_layout_node(*style);
@@ -242,9 +252,6 @@ ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::
} else if (is<DOM::Text>(dom_node)) {
layout_node = document.heap().allocate_without_realm<Layout::TextNode>(document, static_cast<DOM::Text&>(dom_node));
display = CSS::Display(CSS::Display::Outside::Inline, CSS::Display::Inside::Flow);
- } else if (is<DOM::ShadowRoot>(dom_node)) {
- layout_node = document.heap().allocate_without_realm<Layout::BlockContainer>(document, &static_cast<DOM::ShadowRoot&>(dom_node), CSS::ComputedValues {});
- display = CSS::Display(CSS::Display::Outside::Block, CSS::Display::Inside::FlowRoot);
}
if (!layout_node)
@@ -262,8 +269,11 @@ ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::
if ((dom_node.has_children() || shadow_root) && layout_node->can_have_children()) {
push_parent(verify_cast<NodeWithStyle>(*layout_node));
- if (shadow_root)
- TRY(create_layout_tree(*shadow_root, context));
+ if (shadow_root) {
+ for (auto* node = shadow_root->first_child(); node; node = node->next_sibling()) {
+ TRY(create_layout_tree(*node, context));
+ }
+ }
// This is the same as verify_cast<DOM::ParentNode>(dom_node).for_each_child
for (auto* node = verify_cast<DOM::ParentNode>(dom_node).first_child(); node; node = node->next_sibling())
@@ -314,28 +324,6 @@ ErrorOr<void> TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::
}
}
- if (is<HTML::HTMLInputElement>(dom_node)) {
- auto& input_element = static_cast<HTML::HTMLInputElement&>(dom_node);
-
- if (auto placeholder_value = input_element.placeholder_value(); placeholder_value.has_value()) {
- auto placeholder_style = TRY(style_computer.compute_style(input_element, CSS::Selector::PseudoElement::Placeholder));
- auto placeholder = DOM::Element::create_layout_node_for_display_type(document, placeholder_style->display(), placeholder_style, nullptr);
-
- auto text = document.heap().allocate<DOM::Text>(document.realm(), document, *placeholder_value).release_allocated_value_but_fixme_should_propagate_errors();
- auto text_node = document.heap().allocate_without_realm<Layout::TextNode>(document, *text);
- text_node->set_generated(true);
-
- push_parent(verify_cast<NodeWithStyle>(*layout_node));
- push_parent(verify_cast<NodeWithStyle>(*placeholder));
- insert_node_into_inline_or_block_ancestor(*text_node, text_node->display(), AppendOrPrepend::Append);
- pop_parent();
- insert_node_into_inline_or_block_ancestor(*placeholder, placeholder->display(), AppendOrPrepend::Append);
- pop_parent();
-
- input_element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::Placeholder, placeholder);
- }
- }
-
return {};
}