Lightpanda: the headless browser designed for AI and automation
input: activate buttons on Enter's keypress, submit once
Adrià Arrufat7b30a7447e30
diff --git a/src/browser/actions.zig b/src/browser/actions.zigindex c1b295b7b..39731b437 100644--- a/src/browser/actions.zig+++ b/src/browser/actions.zig@@ -143,7 +143,7 @@ pub fn press(node: ?*DOMNode, key: []const u8, frame: *Frame) !void {.key = canonical,}, frame);- const prevented = (if (target_el) |el|+ _ = (if (target_el) |el|Frame.user_input.pressKey(frame, el, keydown_event, Frame.user_input.textForKey(keydown_event))elseframe._event_manager.dispatchCancelable(target, keydown_event.asEvent())) catch |err| {@@ -151,14 +151,6 @@ pub fn press(node: ?*DOMNode, key: []const u8, frame: *Frame) !void {return error.ActionFailed;};- if (std.mem.eql(u8, canonical, "Enter") and !prevented) {- if (target_el) |el| implicitFormSubmit(el, frame) catch |err| {- // Don't skip keyup on a submit-listener throw — UIs that gate- // state on keyup (e.g. clearing a "submitting" flag) would hang.- lp.log.warn(.app, "implicit form submit failed", .{ .err = err });- };- }-const keyup_event: *KeyboardEvent = try .initTrusted(comptime .wrap("keyup"), .{.bubbles = true,.cancelable = true,@@ -199,28 +191,6 @@ fn canonicalKey(key: []const u8) []const u8 {return key;}-fn implicitFormSubmit(el: *Element, frame: *Frame) !void {- const Input = Element.Html.Input;- const Button = Element.Html.Button;-- if (el.is(Input)) |input| {- const form = input.getForm(frame) orelse return;- const submitter: ?*Element = switch (input._input_type) {- .submit, .image => el,- // Non-text controls (checkbox, radio, file, ...) don't trigger- // implicit submission; only the text-like family does.- .text, .password, .email, .url, .tel, .search, .number, .date, .time, .@"datetime-local", .month, .week => null,- else => return,- };- return form.requestSubmit(submitter, frame);- }- if (el.is(Button)) |button| {- if (!std.ascii.eqlIgnoreCase(button.getType(), "submit")) return;- const form = button.getForm(frame) orelse return;- return form.requestSubmit(el, frame);- }-}-pub fn selectOption(node: *DOMNode, value: []const u8, frame: *Frame) !void {const el = node.is(Element) orelse return error.InvalidNodeType;const select = el.is(Element.Html.Select) orelse return error.InvalidNodeType;diff --git a/src/browser/frame/user_input.zig b/src/browser/frame/user_input.zigindex 507972949..e838c2beb 100644--- a/src/browser/frame/user_input.zig+++ b/src/browser/frame/user_input.zig@@ -696,6 +696,9 @@ pub fn typeChar(frame: *Frame, target: *Element, keypress: *KeyboardEvent, text:return;}const is_enter = text.len == 1 and (text[0] == '\r' or text[0] == '\n');+ if (is_enter and enterClicks(target)) {+ return dispatchKeyboardClick(frame, target);+ }if (target.is(Element.Html.Input)) |input| {if (is_enter) {@@ -740,10 +743,11 @@ pub fn handleKeydown(frame: *Frame, target: *Node, event: *Event) !void {}if (key == .Enter and event.getIsTrusted()) {- if (target.is(Element)) |element| {- if (enterActivates(element)) {- // Enter generates a button-like "click" for some elements- return dispatchKeyboardClick(frame, element);+ // A link follows Enter on the keydown; buttons wait for the keypress,+ // see typeChar.+ if (target.is(Element.Html.Anchor)) |anchor| {+ if (anchor.asElement().getAttributeInterned("href") != null) {+ return dispatchKeyboardClick(frame, anchor.asElement());}}}@@ -877,15 +881,12 @@ fn dispatchKeyboardClick(frame: *Frame, element: *Element) !void {try frame._event_manager.dispatch(element.asEventTarget(), event.asEvent());}-// elements where enter on a keydown should dispatch a click-click event-fn enterActivates(element: *Element) bool {+// elements where Enter's keypress dispatches a click+fn enterClicks(element: *Element) bool {const html_element = element.is(Element.Html) orelse return false;if (html_element._type == .button) {return true;}- if (html_element._type == .anchor) {- return element.getAttributeInterned("href") != null;- }if (element.is(Element.Html.Input)) |input| {return switch (input._input_type) {.button, .submit, .reset, .image => true,diff --git a/src/server/cdp/domains/input.zig b/src/server/cdp/domains/input.zigindex 2821a0a9e..7dbb790fc 100644--- a/src/server/cdp/domains/input.zig+++ b/src/server/cdp/domains/input.zig@@ -934,3 +934,60 @@ test "cdp.input: dispatchKeyEvent cancelled keyDown suppresses its char" {try ctx.expectSentResult(null, .{ .id = 5 });try testing.expect((try ls.local.compileAndRun("inp.value === 'y' && window.keypresses.join('') === 'y'", null)).isTrue());}++// Enter, as chromedp sends it: keyDown, a "\r" char, keyUp. Buttons click+// after their keypress; the form submits at most once.+test "cdp.input: dispatchKeyEvent Enter clicks buttons and submits once" {+ var ctx = try testing.context();+ defer ctx.deinit();++ const bc = try ctx.loadBrowserContext(.{ .url = "mcp_actions.html" });+ const frame = bc.mainFrame().?;++ var ls: lp.js.Local.Scope = undefined;+ frame.js.localScope(&ls);+ defer ls.deinit();++ const cases = [_]struct { id: []const u8, expect: []const u8 }{+ .{ .id = "text", .expect = "keypress submit" },+ .{ .id = "check", .expect = "keypress submit" },+ .{ .id = "submit", .expect = "keypress click submit" },+ .{ .id = "button", .expect = "keypress click submit" },+ .{ .id = "ibutton", .expect = "keypress click" },+ .{ .id = "reset", .expect = "keypress click" },+ };++ var id: u32 = 1;+ for (cases) |c| {+ var buf: [1024]u8 = undefined;+ _ = try ls.local.compileAndRun(try std.fmt.bufPrint(&buf,+ \\document.body.insertAdjacentHTML('beforeend', '<form id=f>' ++ \\ '<input id=text><input id=check type=checkbox><input id=submit type=submit>' ++ \\ '<button id=button>go</button><input id=ibutton type=button><input id=reset type=reset></form>');+ \\window.events = [];+ \\document.getElementById('f').addEventListener('submit', (e) => {{+ \\ e.preventDefault();+ \\ window.events.push('submit');+ \\}});+ \\var el = document.getElementById('{s}');+ \\el.addEventListener('keypress', () => window.events.push('keypress'));+ \\el.addEventListener('click', () => window.events.push('click'));+ \\el.focus();+ , .{c.id}), null);++ try ctx.processMessage(.{ .id = id, .method = "Input.dispatchKeyEvent", .params = .{ .type = "keyDown", .key = "Enter", .code = "Enter" } });+ try ctx.expectSentResult(null, .{ .id = id });+ id += 1;+ try ctx.processMessage(.{ .id = id, .method = "Input.dispatchKeyEvent", .params = .{ .type = "char", .key = "Enter", .text = "\r" } });+ try ctx.expectSentResult(null, .{ .id = id });+ id += 1;+ try ctx.processMessage(.{ .id = id, .method = "Input.dispatchKeyEvent", .params = .{ .type = "keyUp", .key = "Enter", .code = "Enter" } });+ try ctx.expectSentResult(null, .{ .id = id });+ id += 1;++ const got = try (try ls.local.compileAndRun("window.events.join(' ')", null)).toStringSlice();+ try testing.expectEqualSlices(u8, c.expect, got);++ _ = try ls.local.compileAndRun("document.getElementById('f').remove()", null);+ }+}