public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2026-02-04 14:33:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

axnode: small fixes

Browse Source
This commit is contained in:
Pierre Tachoire
2026-01-16 17:30:43 +01:00
parent 2074c0149f
commit 4325b80d64
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/cdp/AXNode.zig
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2023-2024 Lightpanda (Selecy SAS) // Copyright (C) 2023-2026 Lightpanda (Selecy SAS)
// //
// Francis Bouvier <francis@lightpanda.io> // Francis Bouvier <francis@lightpanda.io>
// Pierre Tachoire <pierre@lightpanda.io> // Pierre Tachoire <pierre@lightpanda.io>
@@ -60,8 +60,7 @@ pub const Writer = struct {
fn writeNodeChildren(self: *const Writer, parent: AXNode, w: anytype) !void { fn writeNodeChildren(self: *const Writer, parent: AXNode, w: anytype) !void {
// Add ListMarker for listitem elements // Add ListMarker for listitem elements
if (parent.dom.is(DOMNode.Element) != null) { if (parent.dom.is(DOMNode.Element)) |parent_el| {
const parent_el = parent.dom.as(DOMNode.Element);
if (parent_el.getTag() == .li) { if (parent_el.getTag() == .li) {
try self.writeListMarker(parent.dom, w); try self.writeListMarker(parent.dom, w);
} }
@@ -94,9 +93,7 @@ pub const Writer = struct {
fn writeListMarker(self: *const Writer, li_node: *DOMNode, w: anytype) !void { fn writeListMarker(self: *const Writer, li_node: *DOMNode, w: anytype) !void {
// Find the parent list element // Find the parent list element
const parent = li_node._parent orelse return; const parent = li_node._parent orelse return;
if (parent.is(DOMNode.Element) == null) return; const parent_el = parent.is(DOMNode.Element) orelse return;
const parent_el = parent.as(DOMNode.Element);
const list_type = parent_el.getTag(); const list_type = parent_el.getTag();
// Only create markers for actual list elements // Only create markers for actual list elements
@@ -627,7 +624,7 @@ pub const AXRole = enum(u8) {
// zig fmt: off // zig fmt: off
.password, .@"datetime-local", .hidden, .month, .color, .password, .@"datetime-local", .hidden, .month, .color,
.week, .time, .file, .date => .none, .week, .time, .file, .date => .none,
// zig fmt: ofn // zig fmt: on
}; };
}, },
.textarea => .textbox, .textarea => .textbox,
@@ -768,7 +765,6 @@ fn writeName(axnode: AXNode, w: anytype, page: *Page) !?AXSource {
// Parse space-separated list of IDs and concatenate their text content // Parse space-separated list of IDs and concatenate their text content
var it = std.mem.splitScalar(u8, labelledby, ' '); var it = std.mem.splitScalar(u8, labelledby, ' ');
var first = true;
var has_content = false; var has_content = false;
var buf = std.Io.Writer.Allocating.init(page.call_arena); var buf = std.Io.Writer.Allocating.init(page.call_arena);
@@ -777,13 +773,9 @@ fn writeName(axnode: AXNode, w: anytype, page: *Page) !?AXSource {
if (trimmed_id.len == 0) continue; if (trimmed_id.len == 0) continue;
if (doc.getElementById(trimmed_id, page)) |referenced_el| { if (doc.getElementById(trimmed_id, page)) |referenced_el| {
if (!first) {
try buf.writer.writeByte(' ');
}
first = false;
// Get the text content of the referenced element // Get the text content of the referenced element
try referenced_el.getInnerText(&buf.writer); try referenced_el.getInnerText(&buf.writer);
try buf.writer.writeByte(' ');
has_content = true; has_content = true;
} }
} }
@@ -932,14 +924,12 @@ fn isIgnore(self: AXNode, page: *Page) bool {
const role_attr = self.role_attr; const role_attr = self.role_attr;
// Don't ignore non-Element node: CData, Document... // Don't ignore non-Element node: CData, Document...
if (node.is(DOMNode.Element) == null) { const elt = node.is(DOMNode.Element) orelse return false;
return false;
}
// Ignore non-HTML elements: svg... // Ignore non-HTML elements: svg...
if (node.is(DOMNode.Element.Html) == null) { if (elt._type != .html) {
return true; return true;
} }
const elt = node.as(DOMNode.Element);
const tag = elt.getTag(); const tag = elt.getTag();
switch (tag) { switch (tag) {
// zig fmt: off // zig fmt: off