LibWeb: Fix select element state update in three ways

1. We were not propagating selectedness updates from option to select
   if the option was inside an optgroup.

2. When two or more options were selected, we were always favoring the
   last one in tree order, instead of the last one that got checked.

3. We were neglecting to return in the `display size is 1` case when
   all elements were disabled.

This was covered by some of the :has() selector tests. :^)
This commit is contained in:
Andreas Kling 2024-10-27 16:39:07 +01:00 committed by Andreas Kling
commit 6c75a93ec0
Notes: github-actions[bot] 2024-10-27 17:41:15 +00:00
4 changed files with 19 additions and 16 deletions

View file

@ -138,8 +138,8 @@ int HTMLOptionElement::index() const
void HTMLOptionElement::ask_for_a_reset()
{
// If an option element in the list of options asks for a reset, then run that select element's selectedness setting algorithm.
if (is<HTMLSelectElement>(parent_element())) {
static_cast<HTMLSelectElement*>(parent())->update_selectedness();
if (auto* select = first_ancestor_of_type<HTMLSelectElement>()) {
select->update_selectedness(this);
}
}

View file

@ -558,7 +558,7 @@ void HTMLSelectElement::update_inner_text_element()
}
// https://html.spec.whatwg.org/multipage/form-elements.html#selectedness-setting-algorithm
void HTMLSelectElement::update_selectedness()
void HTMLSelectElement::update_selectedness(JS::GCPtr<HTML::HTMLOptionElement> last_selected_option)
{
if (has_attribute(AttributeNames::multiple))
return;
@ -581,9 +581,10 @@ void HTMLSelectElement::update_selectedness()
if (!option_element->disabled()) {
option_element->set_selected_internal(true);
update_inner_text_element();
return;
break;
}
}
return;
}
}
@ -601,6 +602,8 @@ void HTMLSelectElement::update_selectedness()
// then set the selectedness of all but the last option element with its selectedness set to true
// in the list of options in tree order to false.
for (auto const& option_element : list_of_options()) {
if (option_element == last_selected_option)
continue;
if (number_of_selected == 1) {
break;
}

View file

@ -92,7 +92,7 @@ public:
void did_select_item(Optional<u32> const& id);
void update_selectedness();
void update_selectedness(JS::GCPtr<HTMLOptionElement> last_selected_option = nullptr);
private:
HTMLSelectElement(DOM::Document&, DOM::QualifiedName);