Skip to content

Lightpanda: the headless browser designed for AI and automation

input: simplify disabled-control check in click paths and test fieldset inheritance

Adrià Arrufat17506fcd3824
diff --git a/src/browser/tests/element/html/button.html b/src/browser/tests/element/html/button.html
index 0dd393efd..ff6f67022 100644
--- a/src/browser/tests/element/html/button.html
+++ b/src/browser/tests/element/html/button.html
@@ -5,6 +5,10 @@
<button id="button1">Click me</button>
<button id="button2" disabled>Disabled button</button>
+<fieldset id="fs_disabled" disabled>
+ <button id="btn_in_disabled_fs">Inside disabled fieldset</button>
+</fieldset>
+
<!-- Form association tests -->
<form id="form1">
<button id="button_in_form">In form</button>
@@ -259,3 +263,19 @@
testing.expectEqual(null, b.getAttribute('formnovalidate'))
}
</script>
+
+<script id="click_disabled_button_no_event">
+ {
+ let clicks = 0;
+ const b = document.createElement('button');
+ b.disabled = true;
+ b.addEventListener('click', () => clicks++);
+ b.click();
+ testing.expectEqual(0, clicks);
+
+ const b_fs = $('#btn_in_disabled_fs');
+ b_fs.addEventListener('click', () => clicks++);
+ b_fs.click();
+ testing.expectEqual(0, clicks);
+ }
+</script>
diff --git a/src/browser/webapi/WebDriver.zig b/src/browser/webapi/WebDriver.zig
index 0e472abcb..ca212bc35 100644
--- a/src/browser/webapi/WebDriver.zig
+++ b/src/browser/webapi/WebDriver.zig
@@ -60,12 +60,7 @@ fn getComputedLabel(_: *const WebDriver, element: *Element, frame: *Frame) ![]co
// synchronously so the events are observable when the testdriver promise
// resolves.
pub fn click(_: *const WebDriver, element: *Element, frame: *Frame) !void {
- if (element.is(Element.Html)) |html| {
- switch (html._type) {
- .button, .input, .textarea, .select, .option, .optgroup => if (element.isDisabled()) return,
- else => {},
- }
- }
+ if (element.isDisabled()) return;
// A dispatch error must never reject the testdriver command.
Frame.user_input.triggerClick(frame, element, frame.page.input_modifiers) catch |err| {
diff --git a/src/browser/webapi/element/Html.zig b/src/browser/webapi/element/Html.zig
index ee30dcacb..5a5a3797a 100644
--- a/src/browser/webapi/element/Html.zig
+++ b/src/browser/webapi/element/Html.zig
@@ -401,9 +401,8 @@ pub fn insertAdjacentHTML(
}
pub fn click(self: *HtmlElement, frame: *Frame) !void {
- switch (self._type) {
- .button, .input, .textarea, .select, .option, .optgroup => if (self.asElement().isDisabled()) return,
- else => {},
+ if (self.asElement().isDisabled()) {
+ return;
}
const flags = &self.asElement()._flags;