Lightpanda: the headless browser designed for AI and automation
dedupe field validity check between webapi and selector
Karl Seguin784b45c1780f
diff --git a/src/browser/webapi/ElementInternals.zig b/src/browser/webapi/ElementInternals.zigindex 01d9a78bb..c78dda075 100644--- a/src/browser/webapi/ElementInternals.zig+++ b/src/browser/webapi/ElementInternals.zig@@ -23,7 +23,6 @@ const js = @import("../js/js.zig");const Frame = @import("../Frame.zig");const Node = @import("Node.zig");-const Event = @import("Event.zig");const Element = @import("Element.zig");const Blob = @import("Blob.zig");const File = @import("File.zig");@@ -291,18 +290,9 @@ fn normalizeNewlines(message: []const u8, frame: *Frame) ![]const u8 {return out.items;}-pub fn checkValidity(self: *ElementInternals, frame: *Frame) !bool {- if (!self.willValidate() or !self._flags.any()) {- return true;- }- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);- try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);- return false;-}--fn _checkValidity(self: *ElementInternals, frame: *Frame) !bool {+fn checkValidity(self: *ElementInternals, frame: *Frame) !bool {try self.assertFormAssociated();- return self.checkValidity(frame);+ return ValidityState.checkValidity(self.asElement(), frame);}pub const JsApi = struct {@@ -324,8 +314,8 @@ pub const JsApi = struct {pub const willValidate = bridge.accessor(ElementInternals.getWillValidate, null, .{});pub const validity = bridge.accessor(ElementInternals.getValidity, null, .{});pub const validationMessage = bridge.accessor(ElementInternals.getValidationMessage, null, .{});- pub const checkValidity = bridge.function(ElementInternals._checkValidity, .{});- pub const reportValidity = bridge.function(ElementInternals._checkValidity, .{});+ pub const checkValidity = bridge.function(ElementInternals.checkValidity, .{});+ pub const reportValidity = bridge.function(ElementInternals.checkValidity, .{});// ARIAMixinpub const role = ariaAccessor("role");diff --git a/src/browser/webapi/element/html/Button.zig b/src/browser/webapi/element/html/Button.zigindex b340121f0..20ee3a828 100644--- a/src/browser/webapi/element/html/Button.zig+++ b/src/browser/webapi/element/html/Button.zig@@ -24,7 +24,6 @@ const Factory = @import("../../../Factory.zig");const Frame = @import("../../../Frame.zig");const Node = @import("../../Node.zig");-const Event = @import("../../Event.zig");const Element = @import("../../Element.zig");const HtmlElement = @import("../Html.zig");@@ -147,13 +146,8 @@ fn getValidationMessage(self: *const Button) []const u8 {return self._custom_validity orelse "";}-pub fn checkValidity(self: *Button, frame: *Frame) !bool {- if (!self.getWillValidate()) return true;- if (self._custom_validity == null) return true;-- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);- try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);- return false;+fn checkValidity(self: *Button, frame: *Frame) !bool {+ return ValidityState.checkValidity(self.asElement(), frame);}fn reportValidity(self: *Button, frame: *Frame) !bool {diff --git a/src/browser/webapi/element/html/Form.zig b/src/browser/webapi/element/html/Form.zigindex 51603eda1..83ece88fb 100644--- a/src/browser/webapi/element/html/Form.zig+++ b/src/browser/webapi/element/html/Form.zig@@ -35,6 +35,7 @@ pub const Button = @import("Button.zig");pub const Select = @import("Select.zig");pub const TextArea = @import("TextArea.zig");const Output = @import("Output.zig");+const ValidityState = @import("ValidityState.zig");const NodeLive = collections.NodeLive;const HTMLFormControlsCollection = collections.HTMLFormControlsCollection;@@ -323,7 +324,7 @@ pub fn checkValidity(self: *Form, frame: *Frame) !bool {var iter = self.iterator(.{}, frame);var all_valid = true;while (iter.next()) |element| {- const ok = try checkElementValidity(element, frame);+ const ok = try ValidityState.checkValidity(element, frame);if (!ok) all_valid = false;}return all_valid;@@ -335,18 +336,6 @@ fn reportValidity(self: *Form, frame: *Frame) !bool {return self.checkValidity(frame);}-fn checkElementValidity(element: *Element, frame: *Frame) !bool {- if (element.is(Input)) |input| return input.checkValidity(frame);- if (element.is(Select)) |select| return select.checkValidity(frame);- if (element.is(TextArea)) |textarea| return textarea.checkValidity(frame);- if (element.is(Button)) |button| return button.checkValidity(frame);- if (element.is(Custom)) |custom| {- const internals = custom._internals orelse return true;- return internals.checkValidity(frame);- }- return true;-}-pub fn getNoValidate(self: *const Form) bool {return self.asConstElement().getAttributeInterned("novalidate") != null;}diff --git a/src/browser/webapi/element/html/Input.zig b/src/browser/webapi/element/html/Input.zigindex 851015925..3344ca21d 100644--- a/src/browser/webapi/element/html/Input.zig+++ b/src/browser/webapi/element/html/Input.zig@@ -380,14 +380,8 @@ fn getValidationMessage(self: *Input, frame: *Frame) []const u8 {return "";}-pub fn checkValidity(self: *Input, frame: *Frame) !bool {- if (!self.getWillValidate()) return true;- const v = ValidityState{ ._owner = self.asElement() };- if (v.getValid(frame)) return true;-- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);- try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);- return false;+fn checkValidity(self: *Input, frame: *Frame) !bool {+ return ValidityState.checkValidity(self.asElement(), frame);}fn reportValidity(self: *Input, frame: *Frame) !bool {diff --git a/src/browser/webapi/element/html/Select.zig b/src/browser/webapi/element/html/Select.zigindex 9e1117071..ab3538040 100644--- a/src/browser/webapi/element/html/Select.zig+++ b/src/browser/webapi/element/html/Select.zig@@ -23,7 +23,6 @@ const Factory = @import("../../../Factory.zig");const Frame = @import("../../../Frame.zig");const Node = @import("../../Node.zig");-const Event = @import("../../Event.zig");const Element = @import("../../Element.zig");const collections = @import("../../collections.zig");@@ -473,14 +472,8 @@ fn getValidationMessage(self: *const Select) []const u8 {return "";}-pub fn checkValidity(self: *Select, frame: *Frame) !bool {- if (!self.getWillValidate()) return true;- const v = ValidityState{ ._owner = self.asElement() };- if (v.getValid(frame)) return true;-- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);- try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);- return false;+fn checkValidity(self: *Select, frame: *Frame) !bool {+ return ValidityState.checkValidity(self.asElement(), frame);}fn reportValidity(self: *Select, frame: *Frame) !bool {diff --git a/src/browser/webapi/element/html/TextArea.zig b/src/browser/webapi/element/html/TextArea.zigindex a8ad23487..a1c867756 100644--- a/src/browser/webapi/element/html/TextArea.zig+++ b/src/browser/webapi/element/html/TextArea.zig@@ -24,7 +24,6 @@ const Frame = @import("../../../Frame.zig");const Factory = @import("../../../Factory.zig");const Node = @import("../../Node.zig");-const Event = @import("../../Event.zig");const Element = @import("../../Element.zig");const Selection = @import("../../Selection.zig");@@ -195,14 +194,8 @@ fn getValidationMessage(self: *const TextArea) []const u8 {return "";}-pub fn checkValidity(self: *TextArea, frame: *Frame) !bool {- if (!self.getWillValidate()) return true;- const v = ValidityState{ ._owner = self.asElement() };- if (v.getValid(frame)) return true;-- const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);- try frame._event_manager.dispatch(self.asElement().asEventTarget(), event);- return false;+fn checkValidity(self: *TextArea, frame: *Frame) !bool {+ return ValidityState.checkValidity(self.asElement(), frame);}fn reportValidity(self: *TextArea, frame: *Frame) !bool {diff --git a/src/browser/webapi/element/html/ValidityState.zig b/src/browser/webapi/element/html/ValidityState.zigindex f22aca24f..dcf9cd3ae 100644--- a/src/browser/webapi/element/html/ValidityState.zig+++ b/src/browser/webapi/element/html/ValidityState.zig@@ -21,6 +21,7 @@const js = @import("../../../js/js.zig");const Frame = @import("../../../Frame.zig");+const Event = @import("../../Event.zig");const Element = @import("../../Element.zig");const ElementInternals = @import("../../ElementInternals.zig");@@ -122,6 +123,39 @@ pub fn getValid(self: *const ValidityState, frame: *Frame) bool {!self.getCustomError();}+// Whether the element satisfies its constraints, or null when it is not a+// candidate for constraint validation (it then matches neither :valid nor+// :invalid).+pub fn isValid(element: *Element, frame: *Frame) ?bool {+ const will_validate = if (element.is(Input)) |input|+ input.getWillValidate()+ else if (element.is(Select)) |select|+ select.getWillValidate()+ else if (element.is(TextArea)) |textarea|+ textarea.getWillValidate()+ else if (element.is(Button)) |button|+ button.getWillValidate()+ else if (element.is(Custom)) |custom|+ custom.isFormAssociated() and custom.willValidate()+ else+ return null;+ if (will_validate == false) {+ return null;+ }+ const validity: ValidityState = .{ ._owner = element };+ return validity.getValid(frame);+}++// https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#check-validity-steps+pub fn checkValidity(element: *Element, frame: *Frame) !bool {+ if (isValid(element, frame) orelse true) {+ return true;+ }+ const event = try Event.initTrusted(comptime .wrap("invalid"), .{ .cancelable = true }, frame.page);+ try frame._event_manager.dispatch(element.asEventTarget(), event);+ return false;+}+// A form-associated custom element's flags are whatever its ElementInternals// last passed to setValidity().fn customFlags(self: *const ValidityState) ?ElementInternals.ValidityFlags {diff --git a/src/browser/webapi/selector/List.zig b/src/browser/webapi/selector/List.zigindex c52422511..2e14a8df7 100644--- a/src/browser/webapi/selector/List.zig+++ b/src/browser/webapi/selector/List.zig@@ -572,13 +572,13 @@ fn matchesPseudoClass(el: *Node.Element, pseudo: Selector.PseudoClass, scope: *Nif (el.is(Node.Element.Html.Form) != null or el.is(Node.Element.Html.FieldSet) != null) {return !hasInvalidDescendant(node, frame);}- return isControlValid(el, frame) orelse false;+ return ValidityState.isValid(el, frame) orelse false;},.invalid => {if (el.is(Node.Element.Html.Form) != null or el.is(Node.Element.Html.FieldSet) != null) {return hasInvalidDescendant(node, frame);}- return isControlValid(el, frame) == false;+ return ValidityState.isValid(el, frame) == false;},.required => {return el.hasAttributeInterned("required");@@ -749,47 +749,11 @@ fn matchesPseudoClass(el: *Node.Element, pseudo: Selector.PseudoClass, scope: *N}}-fn isCustomValid(custom: *Node.Element.Html.Custom) ?bool {- if (custom.isFormAssociated() == false) {- // matches neither:valid nor :invalid- return null;- }- if (custom.willValidate() == false) {- // matches neither:valid nor :invalid- return null;- }- const internals = custom._internals orelse return true;- return internals._flags.any() == false;-}--// null when the element is not a candidate for constraint validation-fn isControlValid(el: *Node.Element, frame: *Frame) ?bool {- const Html = Node.Element.Html;- if (el.is(Html.Custom)) |custom| {- return isCustomValid(custom);- }- const will_validate = if (el.is(Html.Input)) |input|- input.getWillValidate()- else if (el.is(Html.Select)) |select|- select.getWillValidate()- else if (el.is(Html.TextArea)) |textarea|- textarea.getWillValidate()- else if (el.is(Html.Button)) |button|- button.getWillValidate()- else- return null;- if (!will_validate) {- return null;- }- const validity: ValidityState = .{ ._owner = el };- return validity.getValid(frame);-}-fn hasInvalidDescendant(parent: *Node, frame: *Frame) bool {var child = parent.firstChild();while (child) |c| {if (c.is(Node.Element)) |child_el| {- if (isControlValid(child_el, frame) == false) return true;+ if (ValidityState.isValid(child_el, frame) == false) return true;}if (hasInvalidDescendant(c, frame)) return true;child = c.nextSibling();