Lightpanda: the headless browser designed for AI and automation
cdp: match Chrome on checked defaults and mixed state
Adrià Arrufat9be4b259c1f4
diff --git a/src/browser/tests/cdp/ax_aria_states.html b/src/browser/tests/cdp/ax_aria_states.htmlindex d7e62681e..8d00fd397 100644--- a/src/browser/tests/cdp/ax_aria_states.html+++ b/src/browser/tests/cdp/ax_aria_states.html@@ -21,4 +21,8 @@<div role="menuitemradio" aria-checked="true" tabindex="0">Menu radio checked</div><a role="button" aria-label="Custom anchor" aria-expanded="true" tabindex="0">Anchor widget</a><img role="button" aria-label="Custom image" aria-expanded="true" tabindex="0" alt="Image widget">+<div role="radio" aria-label="Radio absent" tabindex="0">Radio absent</div>+<div role="switch" aria-label="Switch mixed" aria-checked="mixed" tabindex="0">Switch mixed</div>+<div role="menuitemcheckbox" aria-label="Menu checkbox mixed" aria-checked="mixed" tabindex="0">Menu checkbox mixed</div>+<div role="switch" aria-label="Expanded switch" aria-expanded="true" tabindex="0">Expanded switch</div></body></html>diff --git a/src/server/cdp/AXNode.zig b/src/server/cdp/AXNode.zigindex 6c5846e68..c505ad5d1 100644--- a/src/server/cdp/AXNode.zig+++ b/src/server/cdp/AXNode.zig@@ -321,8 +321,10 @@ pub const Writer = struct {fn supportsExpanded(role: []const u8) bool {inline for (.{- "button", "combobox", "gridcell", "link", "listbox", "menuitem",- "menuitemcheckbox", "menuitemradio", "row", "rowheader", "tab", "treeitem",+ "application", "button", "checkbox", "columnheader", "combobox",+ "gridcell", "link", "listbox", "menuitem", "menuitemcheckbox",+ "menuitemradio", "row", "rowheader", "switch", "tab",+ "treeitem",}) |supported| {if (std.ascii.eqlIgnoreCase(role, supported)) return true;}@@ -515,25 +517,25 @@ pub const Writer = struct {}// Inputs already emitted their native checked property above.+ // Only checkbox and menuitemcheckbox are tri-state; mixed on the+ // other checkable roles reads as false.+ const tri_state = std.ascii.eqlIgnoreCase(role, "checkbox") or+ std.ascii.eqlIgnoreCase(role, "menuitemcheckbox");if (el.getTag() != .input and- (std.ascii.eqlIgnoreCase(role, "checkbox") or+ (tri_state orstd.ascii.eqlIgnoreCase(role, "switch") or- std.ascii.eqlIgnoreCase(role, "menuitemcheckbox") orstd.ascii.eqlIgnoreCase(role, "radio") orstd.ascii.eqlIgnoreCase(role, "menuitemradio"))){- var checked_value: ?[]const u8 = null;- if (el.getAttributeSafe(.wrap("aria-checked"))) |checked| {- if (std.ascii.eqlIgnoreCase(checked, "true")) {- checked_value = "true";- } else if (std.ascii.eqlIgnoreCase(checked, "false")) {- checked_value = "false";- } else if (std.ascii.eqlIgnoreCase(checked, "mixed")) {- checked_value = "mixed";- }- } else if (std.ascii.eqlIgnoreCase(role, "checkbox")) {- checked_value = "false";- }+ const checked = el.getAttributeSafe(.wrap("aria-checked")) orelse "false";+ const checked_value: ?[]const u8 = if (std.ascii.eqlIgnoreCase(checked, "true"))+ "true"+ else if (std.ascii.eqlIgnoreCase(checked, "false"))+ "false"+ else if (std.ascii.eqlIgnoreCase(checked, "mixed"))+ (if (tri_state) "mixed" else "false")+ else+ null;if (checked_value) |value| {try self.writeAXProperty(.{ .name = .checked, .value = .{ .token = value } }, w);}@@ -2396,6 +2398,9 @@ test "AXNode: custom ARIA states and tabindex focusability" {.{ "menuitemcheckbox", "Menu checkbox checked", "true" },.{ "radio", "Radio unchecked", "false" },.{ "menuitemradio", "Menu radio checked", "true" },+ .{ "radio", "Radio absent", "false" },+ .{ "switch", "Switch mixed", "false" },+ .{ "menuitemcheckbox", "Menu checkbox mixed", "mixed" },};inline for (checked_cases) |case| {const role_node = findNode(nodes, case[0], case[1]) orelse return error.CheckedRoleNotFound;@@ -2409,6 +2414,8 @@ test "AXNode: custom ARIA states and tabindex focusability" {try testing.expectEqual(true, (nodeProperty(custom_anchor, "focusable") orelse return error.CustomAnchorFocusMissing).get("value").?.bool);const custom_image = findNode(nodes, "button", "Custom image") orelse return error.CustomImageNotFound;try testing.expectEqual(true, (nodeProperty(custom_image, "expanded") orelse return error.CustomImageExpandedMissing).get("value").?.bool);+ const expanded_switch = findNode(nodes, "switch", "Expanded switch") orelse return error.ExpandedSwitchNotFound;+ try testing.expectEqual(true, (nodeProperty(expanded_switch, "expanded") orelse return error.ExpandedSwitchMissing).get("value").?.bool);try testing.expect(findNode(nodes, "checkbox", "Inert terms") == null);try testing.expect(findNode(nodes, "checkbox", "Hidden terms") == null);