Skip to content

Lightpanda: the headless browser designed for AI and automation

tree: keep a multi-line name or value on its node's line

Adrià Arrufat1452f29c799f
diff --git a/src/SemanticTree.zig b/src/SemanticTree.zig
index 34fa05062..39baaad2d 100644
--- a/src/SemanticTree.zig
+++ b/src/SemanticTree.zig
@@ -863,12 +863,16 @@ fn writeTextLine(writer: *std.Io.Writer, node: *Node, data: *NodeData) !TextLine
try writer.print(" {s}", .{data.role});
}
if (name_to_print) |n| {
- try writer.print(" '{s}'", .{n});
+ try writer.writeAll(" '");
+ try writeOneLine(writer, n);
+ try writer.writeByte('\'');
}
if (data.value) |v| {
if (v.len > 0) {
- try writer.print(" value='{s}'", .{v});
+ try writer.writeAll(" value='");
+ try writeOneLine(writer, v);
+ try writer.writeByte('\'');
}
}
@@ -884,7 +888,9 @@ fn writeTextLine(writer: *std.Io.Writer, node: *Node, data: *NodeData) !TextLine
try writer.writeAll(" options=[");
for (options, 0..) |opt, i| {
if (i > 0) try writer.writeAll(",");
- try writer.print("'{s}'", .{opt.value});
+ try writer.writeByte('\'');
+ try writeOneLine(writer, opt.value);
+ try writer.writeByte('\'');
if (opt.selected) {
try writer.writeAll("*");
}
@@ -908,6 +914,16 @@ fn writeTextLine(writer: *std.Io.Writer, node: *Node, data: *NodeData) !TextLine
return .{ .children = children, .contentful = contentful };
}
+/// Each node is one line: a newline in a name or value would start another.
+fn writeOneLine(writer: *std.Io.Writer, s: []const u8) !void {
+ var words = std.mem.tokenizeAny(u8, s, &std.ascii.whitespace);
+ if (words.next()) |first| try writer.writeAll(first);
+ while (words.next()) |word| {
+ try writer.writeByte(' ');
+ try writer.writeAll(word);
+ }
+}
+
const NodeDetails = struct {
backendNodeId: NodeRegistry.Id,
tag_name: []const u8,
@@ -1229,6 +1245,25 @@ test "SemanticTree: a named heading or code keeps its links" {
}
}
+test "SemanticTree: a multi-line name or value stays on its node's line" {
+ var registry: NodeRegistry = .init(testing.allocator);
+ defer registry.deinit();
+
+ var page = try testing.pageTest("cdp/tree_multiline.html", .{});
+ defer page.close();
+ const frame = page.frame().?;
+
+ const st: Self = try .init(testing.arena_allocator, frame.window._document.asNode(), &registry, frame, .{});
+
+ var aw: std.Io.Writer.Allocating = .init(testing.allocator);
+ defer aw.deinit();
+ try st.textStringify(&aw.writer);
+ const out = aw.written();
+
+ try testing.expect(std.mem.find(u8, out, "button 'Close dialog'\n") != null);
+ try testing.expect(std.mem.find(u8, out, "textbox value='first line second line'\n") != null);
+}
+
test "SemanticTree: maxBytes keeps alerts and controls, marks the rest" {
var registry: NodeRegistry = .init(testing.allocator);
defer registry.deinit();
diff --git a/src/browser/tests/cdp/tree_multiline.html b/src/browser/tests/cdp/tree_multiline.html
new file mode 100644
index 000000000..a6750a4ec
--- /dev/null
+++ b/src/browser/tests/cdp/tree_multiline.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body>
+<button aria-label="Close
+ dialog">x</button>
+<textarea>first line
+second line</textarea>
+</body>
+</html>