Skip to content

Lightpanda: the headless browser designed for AI and automation

selector: match :required and :optional on form controls only

Jay Hemnani62ff92142b1d
diff --git a/src/browser/tests/element/pseudo_classes.html b/src/browser/tests/element/pseudo_classes.html
index c17cd3326..e4cd29943 100644
--- a/src/browser/tests/element/pseudo_classes.html
+++ b/src/browser/tests/element/pseudo_classes.html
@@ -268,3 +268,23 @@
testing.expectEqual('sel2-1', $('#checked4').querySelector(':checked')?.value);
}
</script>
+
+<div id=required>
+ <p required id=req-p></p>
+ <input required id=req-text>
+ <input id=opt-text>
+ <input type=hidden required id=opt-hidden>
+ <input type=range required id=opt-range>
+ <input type=checkbox required id=req-checkbox>
+ <select required id=req-select></select>
+ <textarea id=opt-textarea></textarea>
+ <button required id=opt-button></button>
+</div>
+
+<script id="required_optional">
+{
+ const ids = (s) => Array.from($('#required').querySelectorAll(s), (e) => e.id).join(' ');
+ testing.expectEqual('req-text req-checkbox req-select', ids(':required'));
+ testing.expectEqual('opt-text opt-hidden opt-range opt-textarea opt-button', ids(':optional'));
+}
+</script>
diff --git a/src/browser/webapi/selector/List.zig b/src/browser/webapi/selector/List.zig
index 35baf8b73..28639b8f5 100644
--- a/src/browser/webapi/selector/List.zig
+++ b/src/browser/webapi/selector/List.zig
@@ -578,6 +578,22 @@ fn isReadWrite(el: *Node.Element) bool {
return el.isEditable();
}
+// Only input, select and textarea can be required, and an input only for the
+// types the required attribute applies to.
+fn isRequired(el: *Node.Element) bool {
+ if (!el.hasAttributeInterned("required")) return false;
+ if (el.is(Node.Element.Html.Input)) |input| {
+ return switch (input._input_type) {
+ .hidden, .range, .color, .submit, .reset, .button, .image => false,
+ else => true,
+ };
+ }
+ return switch (el.getTag()) {
+ .select, .textarea => true,
+ else => false,
+ };
+}
+
fn matchesPseudoClass(el: *Node.Element, pseudo: Selector.PseudoClass, scope: *Node, nth: ?*NthCache, frame: *Frame) bool {
const node = el.asNode();
switch (pseudo) {
@@ -620,11 +636,10 @@ fn matchesPseudoClass(el: *Node.Element, pseudo: Selector.PseudoClass, scope: *N
}
return ValidityState.isValid(el, frame) == false;
},
- .required => {
- return el.hasAttributeInterned("required");
- },
- .optional => {
- return el.hasAttributeInterned("required") == false;
+ .required => return isRequired(el),
+ .optional => return switch (el.getTag()) {
+ .button, .input, .select, .textarea => !isRequired(el),
+ else => false,
},
.in_range => return false,
.out_of_range => return false,