Skip to content

Lightpanda: the headless browser designed for AI and automation

required/optional are type-checked to avoid tags in other namespaces

Karl Seguinceff7980456f
diff --git a/src/browser/tests/element/pseudo_classes.html b/src/browser/tests/element/pseudo_classes.html
index e4cd29943..0187c0be0 100644
--- a/src/browser/tests/element/pseudo_classes.html
+++ b/src/browser/tests/element/pseudo_classes.html
@@ -279,12 +279,15 @@
<select required id=req-select></select>
<textarea id=opt-textarea></textarea>
<button required id=opt-button></button>
+ <input type=color required id=opt-color>
+ <svg><input id=svg-input /><textarea required id=svg-textarea /></svg>
</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'));
+ testing.expectEqual('opt-text opt-hidden opt-range opt-textarea opt-button opt-color', ids(':optional'));
+ testing.expectEqual(false, $('#opt-color').validity.valueMissing);
}
</script>
diff --git a/src/browser/webapi/element/html/Input.zig b/src/browser/webapi/element/html/Input.zig
index 0c5069674..7a97e66ae 100644
--- a/src/browser/webapi/element/html/Input.zig
+++ b/src/browser/webapi/element/html/Input.zig
@@ -412,12 +412,12 @@ pub fn suffersValueMissing(self: *Input) bool {
.checkbox => !self._checked,
.radio => !self.radioGroupHasChecked(),
.file => if (self._files) |fl| fl._files.len == 0 else true,
- .text, .password, .email, .url, .tel, .search, .number, .date, .time, .@"datetime-local", .month, .week, .color => blk: {
+ .text, .password, .email, .url, .tel, .search, .number, .date, .time, .@"datetime-local", .month, .week => blk: {
const v = self._value orelse self._default_value orelse "";
break :blk v.len == 0;
},
- // submit/reset/button/hidden/image/range never participate in valueMissing.
- .submit, .reset, .button, .hidden, .image, .range => false,
+ // required doesn't apply to these (see requiredApplies).
+ .submit, .reset, .button, .hidden, .image, .range, .color => false,
};
}
@@ -713,6 +713,13 @@ pub fn readonlyApplies(self: *const Input) bool {
};
}
+pub fn requiredApplies(self: *const Input) bool {
+ return switch (self._input_type) {
+ .hidden, .range, .color, .submit, .reset, .button, .image => false,
+ else => true,
+ };
+}
+
pub fn selectionAvailable(self: *const Input) bool {
switch (self._input_type) {
.text, .search, .url, .tel, .password => return true,
diff --git a/src/browser/webapi/selector/List.zig b/src/browser/webapi/selector/List.zig
index 28639b8f5..44f5abb37 100644
--- a/src/browser/webapi/selector/List.zig
+++ b/src/browser/webapi/selector/List.zig
@@ -581,17 +581,24 @@ fn isReadWrite(el: *Node.Element) bool {
// 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.hasAttributeInterned("required") == false) {
+ 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 input.requiredApplies();
}
- return switch (el.getTag()) {
- .select, .textarea => true,
- else => false,
- };
+ return el.is(Node.Element.Html.Select) != null or el.is(Node.Element.Html.TextArea) != null;
+}
+
+fn isOptional(el: *Node.Element) bool {
+ if (el.is(Node.Element.Html.Input) == null and
+ el.is(Node.Element.Html.Select) == null and
+ el.is(Node.Element.Html.TextArea) == null and
+ el.is(Node.Element.Html.Button) == null)
+ {
+ return false;
+ }
+ return isRequired(el) == false;
}
fn matchesPseudoClass(el: *Node.Element, pseudo: Selector.PseudoClass, scope: *Node, nth: ?*NthCache, frame: *Frame) bool {
@@ -637,10 +644,7 @@ fn matchesPseudoClass(el: *Node.Element, pseudo: Selector.PseudoClass, scope: *N
return ValidityState.isValid(el, frame) == false;
},
.required => return isRequired(el),
- .optional => return switch (el.getTag()) {
- .button, .input, .select, .textarea => !isRequired(el),
- else => false,
- },
+ .optional => return isOptional(el),
.in_range => return false,
.out_of_range => return false,
.placeholder_shown => return false,