Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: improve form submit

Karl Seguin063fac91a8cf
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index f1f864735..e4da34136 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -3709,12 +3709,6 @@ pub fn submitForm(self: *Frame, submitter_: ?*Element, form_: ?*Element.Html.For
return;
}
- if (submitter_) |submitter| {
- if (submitter.getAttributeInterned("disabled") != null) {
- return;
- }
- }
-
if (self.canScheduleNavigation(.form) == false) {
return;
}
diff --git a/src/browser/tests/element/html/form.html b/src/browser/tests/element/html/form.html
index 7f85034aa..b888174a4 100644
--- a/src/browser/tests/element/html/form.html
+++ b/src/browser/tests/element/html/form.html
@@ -710,3 +710,60 @@
testing.expectEqual(false, Object.getOwnPropertyDescriptor(els, 'user').enumerable);
}
</script>
+
+<form id="image_button_form">
+ <input name="q">
+ <input type="image" name="img">
+</form>
+
+<script id="elements_excludes_image_buttons">
+{
+ // form.elements and the form's named properties skip image buttons, but
+ // the form still submits with one as the submitter.
+ const form = $('#image_button_form')
+ testing.expectEqual(1, form.elements.length)
+ testing.expectEqual(1, form.length)
+ testing.expectEqual(undefined, form.img)
+ testing.expectEqual(undefined, form.elements.img)
+
+ let entries = null
+ form.addEventListener('submit', (e) => {
+ e.preventDefault()
+ entries = Array.from(new FormData(form, e.submitter)).map(([k, v]) => k + '=' + v).join('&')
+ })
+ form.requestSubmit(form.querySelector('[type=image]'))
+ testing.expectEqual('q=&img.x=0&img.y=0', entries)
+}
+</script>
+
+<form id="button_type_form">
+ <button type="invalid" id="invalid_type"></button>
+ <button type="SUBMIT" id="upper_type"></button>
+ <button type="RESET" id="upper_reset"></button>
+ <button type="submit" disabled id="disabled_submit"></button>
+</form>
+
+<script id="requestSubmit_button_type_states">
+{
+ // An invalid type is the Submit Button state; the attribute is matched
+ // case-insensitively. A disabled submitter still submits.
+ const form = $('#button_type_form')
+ const submitted = []
+ form.addEventListener('submit', (e) => {
+ e.preventDefault()
+ submitted.push(e.submitter.id)
+ })
+ form.requestSubmit($('#invalid_type'))
+ form.requestSubmit($('#upper_type'))
+ form.requestSubmit($('#disabled_submit'))
+ testing.expectEqual(['invalid_type', 'upper_type', 'disabled_submit'], submitted)
+
+ let caught = null
+ try {
+ form.requestSubmit($('#upper_reset'))
+ } catch (e) {
+ caught = e.name
+ }
+ testing.expectEqual('TypeError', caught)
+}
+</script>
diff --git a/src/browser/webapi/collections/node_live.zig b/src/browser/webapi/collections/node_live.zig
index c4f1f3366..f76249933 100644
--- a/src/browser/webapi/collections/node_live.zig
+++ b/src/browser/webapi/collections/node_live.zig
@@ -73,7 +73,7 @@ const Filters = union(Mode) {
selected_options,
links,
anchors,
- form: struct { form: *Form, form_id: ?[]const u8 },
+ form: struct { form: *Form, form_id: ?[]const u8, image_buttons: bool },
fn TypeOf(comptime mode: Mode) type {
@setEvalBranchQuota(10_000);
@@ -362,6 +362,13 @@ pub fn NodeLive(comptime mode: Mode) type {
if (!isFormControl(el)) {
return false;
}
+ if (self._filter.image_buttons == false) {
+ if (el.is(Element.Html.Input)) |input| {
+ if (input._input_type == .image) {
+ return false;
+ }
+ }
+ }
if (self._filter.form_id) |form_id| {
if (el.getAttributeSafe(comptime .wrap("form"))) |element_form_attr| {
diff --git a/src/browser/webapi/element/html/Button.zig b/src/browser/webapi/element/html/Button.zig
index 91f057a8a..8de7e9363 100644
--- a/src/browser/webapi/element/html/Button.zig
+++ b/src/browser/webapi/element/html/Button.zig
@@ -53,7 +53,14 @@ pub fn asNode(self: *Button) *Node {
}
pub fn getType(self: *const Button) []const u8 {
- return self.asConstElement().getAttributeInterned("type") orelse "submit";
+ const value = self.asConstElement().getAttributeInterned("type") orelse return "submit";
+ if (std.ascii.eqlIgnoreCase(value, "reset")) {
+ return "reset";
+ }
+ if (std.ascii.eqlIgnoreCase(value, "button")) {
+ return "button";
+ }
+ return "submit";
}
pub fn getForm(self: *Button, frame: *Frame) ?*Form {
diff --git a/src/browser/webapi/element/html/Form.zig b/src/browser/webapi/element/html/Form.zig
index 5dac1f506..99aed958d 100644
--- a/src/browser/webapi/element/html/Form.zig
+++ b/src/browser/webapi/element/html/Form.zig
@@ -92,7 +92,7 @@ pub fn setMethod(self: *Form, method: []const u8, frame: *Frame) !void {
}
pub fn getElements(self: *Form, frame: *Frame) !*HTMLFormControlsCollection {
- const node_live = self.iterator(frame);
+ const node_live = self.iterator(.{ .image_buttons = false }, frame);
const elements = try frame._factory.chained(.{
node_live.htmlCollectionValue(),
HTMLFormControlsCollection{ ._proto = undefined },
@@ -101,14 +101,18 @@ pub fn getElements(self: *Form, frame: *Frame) !*HTMLFormControlsCollection {
return elements;
}
-pub fn iterator(self: *Form, frame: *Frame) NodeLive(.form) {
+const IteratorOpts = struct {
+ image_buttons: bool = true, // form.elements doesn't incude input type=image
+};
+
+pub fn iterator(self: *Form, opts: IteratorOpts, frame: *Frame) NodeLive(.form) {
const form_id = self.asElement().getId();
const root = if (form_id != null)
self.asNode().getRootNode(.{}) // Has ID: walk entire document to find form=ID controls
else
self.asNode(); // No ID: walk only form subtree (no external controls possible)
- return NodeLive(.form).init(root, .{ .form = self, .form_id = form_id }, frame);
+ return NodeLive(.form).init(root, .{ .form = self, .form_id = form_id, .image_buttons = opts.image_buttons }, frame);
}
fn getAction(self: *Form, frame: *Frame) ![]const u8 {
@@ -155,7 +159,9 @@ pub fn submit(self: *Form, frame: *Frame) !void {
pub fn requestSubmit(self: *Form, submitter: ?*Element, frame: *Frame) !void {
const submitter_element = if (submitter) |s| blk: {
// The submitter must be a submit button.
- if (!isSubmitButton(s)) return error.TypeError;
+ if (isSubmitButton(s) == false) {
+ return error.TypeError;
+ }
// The submitter's form owner must be this form element.
const submitter_form = getFormOwner(s, frame);
@@ -199,7 +205,7 @@ fn namedItem(self: *Form, name: []const u8, frame: *Frame) !?HTMLFormControlsCol
}
var first: ?*Element = null;
- var it = self.iterator(frame);
+ var it = self.iterator(.{ .image_buttons = false }, frame);
while (it.next()) |element| {
if (HTMLFormControlsCollection.matchesName(element, name) == false) {
continue;
@@ -221,7 +227,7 @@ fn namedItem(self: *Form, name: []const u8, frame: *Frame) !?HTMLFormControlsCol
/// Returns true if every submittable element in the form is valid. Fires an
/// `invalid` event on each failing element.
pub fn checkValidity(self: *Form, frame: *Frame) !bool {
- var iter = self.iterator(frame);
+ var iter = self.iterator(.{}, frame);
var all_valid = true;
while (iter.next()) |element| {
const ok = try checkElementValidity(element, frame);
@@ -262,7 +268,7 @@ pub const JsApi = struct {
return error.NotHandled;
}
- var it = self.iterator(frame);
+ var it = self.iterator(.{ .image_buttons = false }, frame);
while (it.next()) |element| {
if (HTMLFormControlsCollection.matchesName(element, field_name)) {
return js.v8.DontEnum;
diff --git a/src/browser/webapi/net/FormData.zig b/src/browser/webapi/net/FormData.zig
index 3dbc1c56c..e3bf56136 100644
--- a/src/browser/webapi/net/FormData.zig
+++ b/src/browser/webapi/net/FormData.zig
@@ -796,8 +796,7 @@ fn collectForm(arena: Allocator, form_: ?*Form, submitter_: ?*Element, charset:
var list: std.ArrayList(Entry) = .empty;
const form = form_ orelse return list;
- var elements = try form.getElements(frame);
- var it = try elements.iterator();
+ var it = form.iterator(.{}, frame);
while (it.next()) |element| {
if (element.isDisabled()) {
continue;