Lightpanda: the headless browser designed for AI and automation
actions: simplify fill and share the readonly-applies rule
Adrià Arrufat18c2ae1dfde4
diff --git a/src/browser/actions.zig b/src/browser/actions.zigindex e4140a417..d4740acdd 100644--- a/src/browser/actions.zig+++ b/src/browser/actions.zig@@ -27,14 +27,14 @@ const Frame = @import("Frame.zig");const Session = @import("Session.zig");pub fn dispatchInputAndChangeEvents(el: *Element, frame: *Frame) !void {- const input_evt: *Event = try .initTrusted(comptime .wrap("input"), .{ .bubbles = true }, frame.page);- frame._event_manager.dispatch(el.asEventTarget(), input_evt) catch |err| {- lp.log.debug(.app, "dispatch input event failed", .{ .err = err });- };+ try dispatchTrusted(el, "input", frame);+ try dispatchTrusted(el, "change", frame);+}- const change_evt: *Event = try .initTrusted(comptime .wrap("change"), .{ .bubbles = true }, frame.page);- frame._event_manager.dispatch(el.asEventTarget(), change_evt) catch |err| {- lp.log.debug(.app, "dispatch change event failed", .{ .err = err });+fn dispatchTrusted(el: *Element, comptime typ: []const u8, frame: *Frame) !void {+ const event: *Event = try .initTrusted(comptime .wrap(typ), .{ .bubbles = true }, frame.page);+ frame._event_manager.dispatch(el.asEventTarget(), event) catch |err| {+ lp.log.debug(.app, "dispatch " ++ typ ++ " event failed", .{ .err = err });};}@@ -197,28 +197,23 @@ fn fillControl(ctl: anytype, text: []const u8, frame: *Frame) !void {return error.InvalidNodeType;}- if (!ctl.tracksSelection()) {+ if (ctl.tracksSelection()) {+ try ctl.select(frame);+ const edited = Frame.user_input.insertInto(frame, ctl, text) catch |err| {+ lp.log.debug(.app, "fill insert failed", .{ .err = err });+ return error.ActionFailed;+ };+ if (!edited) {+ return error.ActionFailed;+ }+ } else {ctl.setUserValue(text, frame) catch |err| {lp.log.debug(.app, "fill setValue failed", .{ .err = err });return error.ActionFailed;};- return dispatchInputAndChangeEvents(el, frame);- }-- try ctl.select(frame);- const edited = Frame.user_input.insertInto(frame, ctl, text) catch |err| {- lp.log.debug(.app, "fill insert failed", .{ .err = err });- return error.ActionFailed;- };- if (!edited) {- lp.log.debug(.app, "fill prevented", .{});- return error.ActionFailed;+ try dispatchTrusted(el, "input", frame);}-- const change_evt: *Event = try .initTrusted(comptime .wrap("change"), .{ .bubbles = true }, frame.page);- frame._event_manager.dispatch(el.asEventTarget(), change_evt) catch |err| {- lp.log.debug(.app, "dispatch change event failed", .{ .err = err });- };+ try dispatchTrusted(el, "change", frame);}pub const ScrollResult = struct {diff --git a/src/browser/frame/user_input.zig b/src/browser/frame/user_input.zigindex 554dc7c5f..d4b12ce9e 100644--- a/src/browser/frame/user_input.zig+++ b/src/browser/frame/user_input.zig@@ -1007,7 +1007,15 @@ pub fn insertInto(frame: *Frame, ctl: anytype, text: []const u8) !bool {}pub fn acceptsEdit(el: *Element) bool {- return !el.isDisabled() and !el.hasAttributeInterned("readonly");+ if (el.isDisabled()) {+ return false;+ }+ if (el.is(Element.Html.Input)) |input| {+ if (!input.readonlyApplies()) {+ return true;+ }+ }+ return !el.hasAttributeInterned("readonly");}// Caret movement a key's default action performs on `ctl`, if any. On a@@ -1204,12 +1212,8 @@ pub fn insertText(frame: *Frame, v: []const u8) !void {if (html_element.is(Element.Html.Input)) |input| {_ = try insertInto(frame, input, v);- return;- }-- if (html_element.is(Element.Html.TextArea)) |textarea| {+ } else if (html_element.is(Element.Html.TextArea)) |textarea| {_ = try insertInto(frame, textarea, v);- return;}}diff --git a/src/browser/tests/mcp_actions.html b/src/browser/tests/mcp_actions.htmlindex f0b69d565..cfa10cf5e 100644--- a/src/browser/tests/mcp_actions.html+++ b/src/browser/tests/mcp_actions.html@@ -31,7 +31,12 @@<button id="btnDisabled" disabled>Disabled</button><div id="focusTarget" tabindex="0" onclick="window.focusTargetFocused = document.activeElement === this;">Focus me</div><div id="plain" onclick="window.plainBlurred = document.activeElement === document.body;">Not focusable</div>+ <input id="fillPre" value="old" onbeforeinput="fillLog.push(event.type + ':' + event.inputType)" oninput="fillLog.push(event.type + ':' + event.inputType)" onchange="fillLog.push(event.type)">+ <input id="fillCancel" onbeforeinput="event.preventDefault()">+ <input id="fillRo" readonly value="ro">+ <input id="fillDate" type="date" value="2020-01-01"><script>+ window.fillLog = [];window.seq = [];const btn = document.getElementById('btn');for (const t of ['pointerdown', 'mousedown', 'pointerup', 'mouseup', 'click']) {diff --git a/src/browser/webapi/element/html/Input.zig b/src/browser/webapi/element/html/Input.zigindex 7ecc55aa9..bdde7395a 100644--- a/src/browser/webapi/element/html/Input.zig+++ b/src/browser/webapi/element/html/Input.zig@@ -670,6 +670,15 @@ pub const setSelectionStart = entry.setSelectionStart;pub const setSelectionEnd = entry.setSelectionEnd;pub const setSelectionRange = entry.setSelectionRange;+/// https://html.spec.whatwg.org/multipage/input.html#attr-input-readonly+pub fn readonlyApplies(self: *const Input) bool {+ return switch (self._input_type) {+ .text, .password, .email, .url, .tel, .search, .number => true,+ .date, .time, .@"datetime-local", .month, .week => true,+ else => false,+ };+}+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.zigindex 35216a6f0..64ddcbe74 100644--- a/src/browser/webapi/selector/List.zig+++ b/src/browser/webapi/selector/List.zig@@ -522,12 +522,7 @@ fn attributeContainsWord(value: []const u8, word: []const u8) bool {// https://html.spec.whatwg.org/multipage/semantics-other.html#selector-read-writefn isReadWrite(el: *Node.Element) bool {if (el.is(Node.Element.Html.Input)) |input| {- const readonly_applies = switch (input._input_type) {- .text, .password, .email, .url, .tel, .search, .number => true,- .date, .time, .@"datetime-local", .month, .week => true,- else => false,- };- return readonly_applies and !el.hasAttributeInterned("readonly") and !el.isDisabled();+ return input.readonlyApplies() and !el.hasAttributeInterned("readonly") and !el.isDisabled();}if (el.is(Node.Element.Html.TextArea) != null) {return !el.hasAttributeInterned("readonly") and !el.isDisabled();diff --git a/src/mcp/tools.zig b/src/mcp/tools.zigindex bbfbed7e8..b2d11ae7d 100644--- a/src/mcp/tools.zig+++ b/src/mcp/tools.zig@@ -1522,6 +1522,21 @@ test "MCP - Actions by selector: hover, selectOption, setChecked" {out.clearRetainingCapacity();}+ const fills = [_]struct { []const u8, []const u8, bool }{+ .{ "#fillPre", "new", true },+ .{ "#fillCancel", "new", false },+ .{ "#fillRo", "new", false },+ .{ "#fillDate", "2024-05-06", true },+ };+ for (fills) |f| {+ const selector, const value, const ok = f;+ try router.handleMessage(server, aa, try aa.print(+ \\{{"jsonrpc":"2.0","id":5,"method":"tools/call","params":{{"name":"fill","arguments":{{"selector":"{s}","value":"{s}"}}}}}}+ , .{ selector, value }));+ try testing.expectEqual(ok, std.mem.find(u8, out.written(), "Filled element") != null);+ out.clearRetainingCapacity();+ }+var ls: js.Local.Scope = undefined;page.frame.js.localScope(&ls);defer ls.deinit();@@ -1533,6 +1548,11 @@ test "MCP - Actions by selector: hover, selectOption, setChecked" {const result = try ls.local.exec(\\ window.hovered === true &&\\ window.sel2Changed === 'c' &&+ \\ document.getElementById('fillPre').value === 'new' &&+ \\ fillLog.join(' ') === 'beforeinput:insertText input:insertText change' &&+ \\ document.getElementById('fillCancel').value === '' &&+ \\ document.getElementById('fillRo').value === 'ro' &&+ \\ document.getElementById('fillDate').value === '2024-05-06' &&\\ window.chkClicked === true && window.chkChanged === true &&\\ window.radClicked === true && window.radChanged === true, null);@@ -1540,66 +1560,6 @@ test "MCP - Actions by selector: hover, selectOption, setChecked" {try testing.expect(result.isTrue());}-test "MCP - fill types over the value through the shared edit path" {- const aa = testing.arena_allocator;-- var out: std.Io.Writer.Allocating = .init(aa);- const server = try testLoadPage("http://localhost:9582/src/browser/tests/mcp_actions.html", &out.writer);- defer server.deinit();- server.active_session.enterIsolate();- defer server.active_session.exitIsolate();-- const page = server.active_session.session.pages.items[0];-- var ls: js.Local.Scope = undefined;- page.frame.js.localScope(&ls);- defer ls.deinit();-- var try_catch: js.TryCatch = undefined;- try_catch.init(&ls.local);- defer try_catch.deinit();-- _ = try ls.local.exec(- \\ document.body.insertAdjacentHTML('beforeend',- \\ '<input id="fPre" value="old"><input id="fCancel"><input id="fRo" readonly value="ro">' +- \\ '<input id="fDis" disabled><input id="fDate" type="date" value="2020-01-01">');- \\ window.fillLog = [];- \\ const pre = document.getElementById('fPre');- \\ for (const t of ['beforeinput', 'input', 'change']) {- \\ pre.addEventListener(t, (e) => window.fillLog.push(t + ':' + (e.inputType || '') + ':' + e.isTrusted));- \\ }- \\ document.getElementById('fCancel').addEventListener('beforeinput', (e) => e.preventDefault());- , null);-- const cases = [_]struct { selector: []const u8, ok: bool }{- .{ .selector = "#fPre", .ok = true },- .{ .selector = "#fCancel", .ok = false },- .{ .selector = "#fRo", .ok = false },- .{ .selector = "#fDis", .ok = false },- .{ .selector = "#fDate", .ok = true },- };- for (cases) |c| {- const value = if (std.mem.eql(u8, c.selector, "#fDate")) "2024-05-06" else "new";- const msg = try std.fmt.allocPrint(aa,- \\{{"jsonrpc":"2.0","id":1,"method":"tools/call","params":{{"name":"fill","arguments":{{"selector":"{s}","value":"{s}"}}}}}}- , .{ c.selector, value });- try router.handleMessage(server, aa, msg);- const filled = std.mem.find(u8, out.written(), "Filled element") != null;- try testing.expectEqual(c.ok, filled);- out.clearRetainingCapacity();- }-- const result = try ls.local.exec(- \\ document.getElementById('fPre').value === 'new' &&- \\ window.fillLog.join(' ') === 'beforeinput:insertText:true input:insertText:true change::true' &&- \\ document.getElementById('fCancel').value === '' &&- \\ document.getElementById('fRo').value === 'ro' &&- \\ document.getElementById('fDis').value === '' &&- \\ document.getElementById('fDate').value === '2024-05-06'- , null);- try testing.expect(result.isTrue());-}-test "MCP - findElement" {const aa = testing.arena_allocator;