Skip to content

Lightpanda: the headless browser designed for AI and automation

actions: fill through the shared text-entry path

Adrià Arrufatb7b38643976a
diff --git a/src/browser/actions.zig b/src/browser/actions.zig
index d88a686b0..e4140a417 100644
--- a/src/browser/actions.zig
+++ b/src/browser/actions.zig
@@ -178,25 +178,47 @@ pub fn fill(node: *DOMNode, text: []const u8, frame: *Frame) !void {
};
if (el.is(Element.Html.Input)) |input| {
- input.setValue(text, frame) catch |err| {
- lp.log.debug(.app, "fill input failed", .{ .err = err });
- return error.ActionFailed;
- };
- } else if (el.is(Element.Html.TextArea)) |textarea| {
- textarea.setValue(text, frame) catch |err| {
- lp.log.debug(.app, "fill textarea failed", .{ .err = err });
- return error.ActionFailed;
- };
- } else if (el.is(Element.Html.Select)) |select| {
- select.setValue(text, frame) catch |err| {
- lp.log.debug(.app, "fill select failed", .{ .err = err });
+ return fillControl(input, text, frame);
+ }
+ if (el.is(Element.Html.TextArea)) |textarea| {
+ return fillControl(textarea, text, frame);
+ }
+ if (el.is(Element.Html.Select) != null) {
+ return selectOption(node, text, frame);
+ }
+ return error.InvalidNodeType;
+}
+
+/// A control without a caret (date, color, range) takes the value whole, as
+/// its picker would. `change` fires right away: nothing commits it on blur.
+fn fillControl(ctl: anytype, text: []const u8, frame: *Frame) !void {
+ const el = ctl.asElement();
+ if (!ctl.acceptsTextEntry() or !Frame.user_input.acceptsEdit(el)) {
+ return error.InvalidNodeType;
+ }
+
+ if (!ctl.tracksSelection()) {
+ ctl.setUserValue(text, frame) catch |err| {
+ lp.log.debug(.app, "fill setValue failed", .{ .err = err });
return error.ActionFailed;
};
- } else {
- return error.InvalidNodeType;
+ return dispatchInputAndChangeEvents(el, frame);
}
- try 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;
+ }
+
+ 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 });
+ };
}
pub const ScrollResult = struct {
diff --git a/src/browser/frame/user_input.zig b/src/browser/frame/user_input.zig
index 88e34d377..554dc7c5f 100644
--- a/src/browser/frame/user_input.zig
+++ b/src/browser/frame/user_input.zig
@@ -916,17 +916,19 @@ pub fn typeChar(frame: *Frame, target: *Element, keypress: *KeyboardEvent, text:
if (is_enter) {
return frame.submitForm(input.asElement(), input.getForm(frame), .{});
}
- return insertInto(frame, input, text);
+ _ = try insertInto(frame, input, text);
+ return;
}
if (target.is(Element.Html.TextArea)) |textarea| {
if (is_enter) {
- if (try allowEdit(frame, textarea.asElement(), null, "\n", "insertLineBreak")) {
+ if (acceptsEdit(textarea.asElement()) and try allowEdit(frame, textarea.asElement(), null, "\n", "insertLineBreak")) {
try textarea.innerInsert("\n", frame);
}
return;
}
- return insertInto(frame, textarea, text);
+ _ = try insertInto(frame, textarea, text);
+ return;
}
}
@@ -984,7 +986,7 @@ fn editKey(frame: *Frame, keyboard_event: *KeyboardEvent, ctl: anytype, key: Key
return ctl.moveCaret(move, keyboard_event.getShiftKey(), frame);
}
- if (key == .Backspace or key == .Delete) {
+ if ((key == .Backspace or key == .Delete) and acceptsEdit(ctl.asElement())) {
const forward = key == .Delete;
if (!keyboard_event.asEvent().getIsTrusted() or try allowEdit(frame, ctl.asElement(), null, null, deleteInputType(forward))) {
try ctl.innerDelete(forward, frame);
@@ -992,13 +994,20 @@ fn editKey(frame: *Frame, keyboard_event: *KeyboardEvent, ctl: anytype, key: Key
}
}
-fn insertInto(frame: *Frame, ctl: anytype, text: []const u8) !void {
- if (!ctl.acceptsTextEntry()) {
- return;
+/// Returns whether the edit happened.
+pub fn insertInto(frame: *Frame, ctl: anytype, text: []const u8) !bool {
+ if (!ctl.acceptsTextEntry() or !acceptsEdit(ctl.asElement())) {
+ return false;
}
- if (try allowEdit(frame, ctl.asElement(), text, text, "insertText")) {
- try ctl.innerInsert(text, frame);
+ if (!try allowEdit(frame, ctl.asElement(), text, text, "insertText")) {
+ return false;
}
+ try ctl.innerInsert(text, frame);
+ return true;
+}
+
+pub fn acceptsEdit(el: *Element) bool {
+ return !el.isDisabled() and !el.hasAttributeInterned("readonly");
}
// Caret movement a key's default action performs on `ctl`, if any. On a
@@ -1194,11 +1203,13 @@ pub fn insertText(frame: *Frame, v: []const u8) !void {
const html_element = frame.document._active_element orelse return;
if (html_element.is(Element.Html.Input)) |input| {
- return insertInto(frame, input, v);
+ _ = try insertInto(frame, input, v);
+ return;
}
if (html_element.is(Element.Html.TextArea)) |textarea| {
- return insertInto(frame, textarea, v);
+ _ = try insertInto(frame, textarea, v);
+ return;
}
}
diff --git a/src/browser/webapi/element/html/Input.zig b/src/browser/webapi/element/html/Input.zig
index 48853f7fc..7ecc55aa9 100644
--- a/src/browser/webapi/element/html/Input.zig
+++ b/src/browser/webapi/element/html/Input.zig
@@ -660,7 +660,7 @@ const entry = text_entry.TextEntry(Input);
pub const select = entry.select;
pub const innerInsert = entry.innerInsert;
pub const acceptsTextEntry = entry.acceptsTextEntry;
-const tracksSelection = entry.tracksSelection;
+pub const tracksSelection = entry.tracksSelection;
pub const innerDelete = entry.innerDelete;
pub const moveCaret = entry.moveCaret;
pub const caretToEnd = entry.caretToEnd;
diff --git a/src/browser/webapi/element/html/TextArea.zig b/src/browser/webapi/element/html/TextArea.zig
index 34868058d..7c438ccb4 100644
--- a/src/browser/webapi/element/html/TextArea.zig
+++ b/src/browser/webapi/element/html/TextArea.zig
@@ -144,6 +144,7 @@ const entry = text_entry.TextEntry(TextArea);
pub const select = entry.select;
pub const innerInsert = entry.innerInsert;
pub const acceptsTextEntry = entry.acceptsTextEntry;
+pub const tracksSelection = entry.tracksSelection;
pub const innerDelete = entry.innerDelete;
pub const moveCaret = entry.moveCaret;
pub const caretToEnd = entry.caretToEnd;
diff --git a/src/mcp/tools.zig b/src/mcp/tools.zig
index dc028ebb1..bbfbed7e8 100644
--- a/src/mcp/tools.zig
+++ b/src/mcp/tools.zig
@@ -1540,6 +1540,66 @@ 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;