RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:07:34 +00:00
Code Issues Activity Actions

LibWeb: Support implicit <label> targets

Browse source 
We already supported "<input id=id><label for=id>".
This patch implements the other labeling mode, where the first labelable
descendant of the <label> element becomes the labeled control.
This commit is contained in:
Andreas Kling 2022-02-15 18:37:33 +01:00
parent 1a323ec8d4
commit f318045a8f
2 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Userland/Libraries/LibWeb/Layout/Label.cpp
View file

@ -31,7 +31,7 @@ void Label::handle_mousedown_on_label(Badge<TextNode>, const Gfx::IntPoint&, uns
if (button != GUI::MouseButton::Primary) if (button != GUI::MouseButton::Primary)
return; return;
if (auto* control = control_node(); control) if (auto* control = labeled_control(); control)
control->handle_associated_label_mousedown({}); control->handle_associated_label_mousedown({});
m_tracking_mouse = true; m_tracking_mouse = true;
@ -45,7 +45,7 @@ void Label::handle_mouseup_on_label(Badge<TextNode>, const Gfx::IntPoint& positi
// NOTE: Changing the checked state of the DOM node may run arbitrary JS, which could disappear this node. // NOTE: Changing the checked state of the DOM node may run arbitrary JS, which could disappear this node.
NonnullRefPtr protect = *this; NonnullRefPtr protect = *this;
if (auto* control = control_node(); control) { if (auto* control = labeled_control(); control) {
bool is_inside_control = enclosing_int_rect(control->absolute_rect()).contains(position); bool is_inside_control = enclosing_int_rect(control->absolute_rect()).contains(position);
bool is_inside_label = enclosing_int_rect(absolute_rect()).contains(position); bool is_inside_label = enclosing_int_rect(absolute_rect()).contains(position);
@ -61,7 +61,7 @@ void Label::handle_mousemove_on_label(Badge<TextNode>, const Gfx::IntPoint& posi
if (!m_tracking_mouse) if (!m_tracking_mouse)
return; return;
if (auto* control = control_node(); control) { if (auto* control = labeled_control(); control) {
bool is_inside_control = enclosing_int_rect(control->absolute_rect()).contains(position); bool is_inside_control = enclosing_int_rect(control->absolute_rect()).contains(position);
bool is_inside_label = enclosing_int_rect(absolute_rect()).contains(position); bool is_inside_label = enclosing_int_rect(absolute_rect()).contains(position);
@ -113,17 +113,20 @@ Label* Label::label_for_control_node(LabelableNode& control)
return label; return label;
} }
LabelableNode* Label::control_node() // https://html.spec.whatwg.org/multipage/forms.html#labeled-control
LabelableNode* Label::labeled_control()
{ {
if (!document().layout_node())
return nullptr;
LabelableNode* control = nullptr; LabelableNode* control = nullptr;
if (!document().layout_node()) // The for attribute may be specified to indicate a form control with which the caption is to be associated.
return control; // If the attribute is specified, the attribute's value must be the ID of a labelable element in the
// same tree as the label element. If the attribute is specified and there is an element in the tree
String for_ = dom_node().for_(); // whose ID is equal to the value of the for attribute, and the first such element in tree order is
if (for_.is_empty()) // a labelable element, then that element is the label element's labeled control.
return control; if (auto for_ = dom_node().for_(); !for_.is_null()) {
document().layout_node()->for_each_in_inclusive_subtree_of_type<LabelableNode>([&](auto& node) { document().layout_node()->for_each_in_inclusive_subtree_of_type<LabelableNode>([&](auto& node) {
if (node.dom_node().attribute(HTML::AttributeNames::id) == for_) { if (node.dom_node().attribute(HTML::AttributeNames::id) == for_) {
control = &node; control = &node;
@ -131,9 +134,15 @@ LabelableNode* Label::control_node()
} }
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
return control;
}
// FIXME: The spec also allows for associating a label with a labelable node by putting the // If the for attribute is not specified, but the label element has a labelable element descendant,
// labelable node inside the label. // then the first such descendant in tree order is the label element's labeled control.
for_each_in_subtree_of_type<LabelableNode>([&](auto& labelable_node) {
control = &labelable_node;
return IterationDecision::Break;
});
return control; return control;
} }

2
Userland/Libraries/LibWeb/Layout/Label.h
View file

@ -30,7 +30,7 @@ private:
virtual bool is_label() const override { return true; } virtual bool is_label() const override { return true; }
static Label* label_for_control_node(LabelableNode&); static Label* label_for_control_node(LabelableNode&);
LabelableNode* control_node(); LabelableNode* labeled_control();
bool m_tracking_mouse { false }; bool m_tracking_mouse { false };
}; };