public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-30 15:41:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Support submit button submitters and check for disabled option on select

Browse Source
This commit is contained in:
Karl Seguin
2025-05-21 21:46:38 +08:00
parent ed79b4ebd8
commit 72944a4e5e
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/browser/xhr/form_data.zig
View File

@@ -221,8 +221,8 @@ fn collectForm(arena: Allocator, form: *parser.Form, submitter_: ?*parser.Elemen
const tag = try parser.elementHTMLGetTagType(@as(*parser.ElementHTML, @ptrCast(element))); const tag = try parser.elementHTMLGetTagType(@as(*parser.ElementHTML, @ptrCast(element)));
switch (tag) { switch (tag) {
.input => { .input => {
const input_type = try parser.elementGetAttribute(element, "type") orelse ""; const tpe = try parser.elementGetAttribute(element, "type") orelse "";
if (std.ascii.eqlIgnoreCase(input_type, "image")) { if (std.ascii.eqlIgnoreCase(tpe, "image")) {
if (submitter_name_) |submitter_name| { if (submitter_name_) |submitter_name| {
if (std.mem.eql(u8, submitter_name, name)) { if (std.mem.eql(u8, submitter_name, name)) {
try entries.append(arena, .{ try entries.append(arena, .{
@@ -237,11 +237,17 @@ fn collectForm(arena: Allocator, form: *parser.Form, submitter_: ?*parser.Elemen
} }
continue; continue;
} }
if (std.ascii.eqlIgnoreCase(input_type, "checkbox") or std.ascii.eqlIgnoreCase(input_type, "radio")) {
if (std.ascii.eqlIgnoreCase(tpe, "checkbox") or std.ascii.eqlIgnoreCase(tpe, "radio")) {
if (try parser.inputGetChecked(@ptrCast(element)) == false) { if (try parser.inputGetChecked(@ptrCast(element)) == false) {
continue; continue;
} }
} }
if (std.ascii.eqlIgnoreCase(tpe, "submit")) {
if (submitter_name_ == null or !std.mem.eql(u8, submitter_name_.?, name)) {
continue;
}
}
const value = (try parser.elementGetAttribute(element, "value")) orelse ""; const value = (try parser.elementGetAttribute(element, "value")) orelse "";
try entries.append(arena, .{ .key = name, .value = value }); try entries.append(arena, .{ .key = name, .value = value });
}, },
@@ -285,6 +291,10 @@ fn collectSelectValues(arena: Allocator, select: *parser.Select, name: []const u
const is_multiple = try parser.selectGetMultiple(select); const is_multiple = try parser.selectGetMultiple(select);
if (is_multiple == false) { if (is_multiple == false) {
const option = try parser.optionCollectionItem(options, @intCast(selected_index)); const option = try parser.optionCollectionItem(options, @intCast(selected_index));
if (try parser.elementGetAttribute(@ptrCast(option), "disabled") != null) {
return;
}
const value = try parser.optionGetValue(option); const value = try parser.optionGetValue(option);
return entries.append(arena, .{ .key = name, .value = value }); return entries.append(arena, .{ .key = name, .value = value });
} }
@@ -317,7 +327,7 @@ fn getSubmitterName(submitter_: ?*parser.ElementHTML) !?[]const u8 {
.input => { .input => {
const tpe = (try parser.elementGetAttribute(element, "type")) orelse ""; const tpe = (try parser.elementGetAttribute(element, "type")) orelse "";
// only an image type can be a sumbitter // only an image type can be a sumbitter
if (std.ascii.eqlIgnoreCase(tpe, "image")) { if (std.ascii.eqlIgnoreCase(tpe, "image") or std.ascii.eqlIgnoreCase(tpe, "submit")) {
return name; return name;
} }
}, },
@@ -356,8 +366,12 @@ test "Browser.FormData" {
\\ \\
\\ <select name="sel-1"><option>blue<option>red</select> \\ <select name="sel-1"><option>blue<option>red</select>
\\ <select name="sel-2"><option>blue<option value=sel-2-v selected>red</select> \\ <select name="sel-2"><option>blue<option value=sel-2-v selected>red</select>
\\ <select name="sel-3"><option disabled>nope1<option>nope2</select>
\\ <select name="mlt-1" multiple><option>water<option>tea</select> \\ <select name="mlt-1" multiple><option>water<option>tea</select>
\\ <select name="mlt-2" multiple><option selected>water<option selected>tea<option>coffee</select> \\ <select name="mlt-2" multiple><option selected>water<option selected>tea<option>coffee</select>
\\ <input type=submit id=s1 name=s1 value=s1-v>
\\ <input type=submit name=s2 value=s2-v>
\\ <input type=image name=i1 value=i1-v>
\\ </form> \\ </form>
}); });
defer runner.deinit(); defer runner.deinit();
@@ -417,7 +431,9 @@ test "Browser.FormData" {
}, .{}); }, .{});
try runner.testCases(&.{ try runner.testCases(&.{
.{ "let f2 = new FormData(document.getElementById('form1'))", null }, .{ "let form1 = document.getElementById('form1')", null },
.{ "let submit1 = document.getElementById('s1')", null },
.{ "let f2 = new FormData(form1, submit1)", null },
.{ "acc = '';", null }, .{ "acc = '';", null },
.{ .{
\\ for (const entry of f2) { \\ for (const entry of f2) {
@@ -437,6 +453,7 @@ test "Browser.FormData" {
\\sel-2=sel-2-v \\sel-2=sel-2-v
\\mlt-2=water \\mlt-2=water
\\mlt-2=tea \\mlt-2=tea
\\s1=s1-v
}, },
}, .{}); }, .{});
} }