Skip to content

Lightpanda: the headless browser designed for AI and automation

event: migrate open-coded cancelable event dispatches to dispatchCancelable

Adrià Arrufat707609e0e8a9
diff --git a/src/browser/Frame.zig b/src/browser/Frame.zig
index 201b009b2..2b7ee4509 100644
--- a/src/browser/Frame.zig
+++ b/src/browser/Frame.zig
@@ -3759,14 +3759,7 @@ pub fn submitForm(self: *Frame, submitter_: ?*Element, form_: ?*Element.Html.For
break :blk s.is(HtmlElement);
};
const submit_event = (try SubmitEvent.initTrusted(comptime .wrap("submit"), .{ .bubbles = true, .cancelable = true, .submitter = submitter_html }, self)).asEvent();
-
- // so submit_event is still valid when we check _prevent_default
- submit_event.acquireRef();
- defer _ = submit_event.releaseRef(self.page);
-
- try self._event_manager.dispatch(form_element.asEventTarget(), submit_event);
- // If the submit event was prevented, don't submit the form
- if (submit_event._prevent_default) {
+ if (try self._event_manager.dispatchCancelable(form_element.asEventTarget(), submit_event)) {
return;
}
}
diff --git a/src/browser/frame/user_input.zig b/src/browser/frame/user_input.zig
index 1d17412bd..f4bdf1cc5 100644
--- a/src/browser/frame/user_input.zig
+++ b/src/browser/frame/user_input.zig
@@ -988,10 +988,7 @@ fn allowEdit(frame: *Frame, target: *Element, before_data: ?[]const u8, text_dat
.data = before_data,
.inputType = input_type,
}, frame)).asEvent();
- before.acquireRef(); // need to check its _prevent_default
- defer _ = before.releaseRef(frame.page);
- try frame._event_manager.dispatch(target.asEventTarget(), before);
- if (before._prevent_default) {
+ if (try frame._event_manager.dispatchCancelable(target.asEventTarget(), before)) {
return false;
}
}
@@ -1004,10 +1001,7 @@ fn allowEdit(frame: *Frame, target: *Element, before_data: ?[]const u8, text_dat
.view = frame.window,
.data = data,
}, frame)).asEvent();
- text_event.acquireRef(); // need to check its _prevent_default
- defer _ = text_event.releaseRef(frame.page);
- try frame._event_manager.dispatch(target.asEventTarget(), text_event);
- return text_event._prevent_default == false;
+ return !try frame._event_manager.dispatchCancelable(target.asEventTarget(), text_event);
}
}
diff --git a/src/browser/webapi/WorkerGlobalScope.zig b/src/browser/webapi/WorkerGlobalScope.zig
index 79a98b0aa..f55d45b7f 100644
--- a/src/browser/webapi/WorkerGlobalScope.zig
+++ b/src/browser/webapi/WorkerGlobalScope.zig
@@ -503,7 +503,7 @@ pub fn reportError(self: *WorkerGlobalScope, err: JS.Value) !void {
const event = error_event.asEvent();
// Keep the event alive past dispatch so we can read _prevent_default.
event.acquireRef();
- defer _ = event.releaseRef(self.page);
+ defer event.releaseRef(self.page);
event._prevent_default = prevent_default;
// Pass null as handler: onerror was already called above with 5 args.
diff --git a/src/browser/webapi/element/Html.zig b/src/browser/webapi/element/Html.zig
index ee30dcacb..83c4d7b52 100644
--- a/src/browser/webapi/element/Html.zig
+++ b/src/browser/webapi/element/Html.zig
@@ -420,14 +420,7 @@ pub fn click(self: *HtmlElement, frame: *Frame) !void {
.pointerId = -1,
}, frame)).asEvent();
- // Keep the event alive past dispatch (which runs handlers/microtasks) so we
- // can read _prevent_default afterwards.
- event.acquireRef();
- defer _ = event.releaseRef(frame.page);
-
- try frame._event_manager.dispatch(self.asEventTarget(), event);
-
- if (event._prevent_default == false) {
+ if (!try frame._event_manager.dispatchCancelable(self.asEventTarget(), event)) {
// toggle the popover_target
const explicit: ?*Element = switch (self._type) {
.button => self.subtype(Button)._popover_target,
diff --git a/src/browser/webapi/element/popover.zig b/src/browser/webapi/element/popover.zig
index cf76f979f..de1a62128 100644
--- a/src/browser/webapi/element/popover.zig
+++ b/src/browser/webapi/element/popover.zig
@@ -250,12 +250,7 @@ fn fireToggle(
.newState = new_state,
}, frame)).asEvent();
- // Keep the event alive while dispatching so we can read _prevent_default.
- event.acquireRef();
- defer _ = event.releaseRef(frame.page);
-
- try frame._event_manager.dispatch(el.asEventTarget(), event);
- return event._prevent_default;
+ return frame._event_manager.dispatchCancelable(el.asEventTarget(), event);
}
fn hasChanged(el: *Element, frame: *Frame, original: State) bool {
diff --git a/src/browser/webapi/storage/idb/IDBRequest.zig b/src/browser/webapi/storage/idb/IDBRequest.zig
index 06a2889c0..6dddeabdc 100644
--- a/src/browser/webapi/storage/idb/IDBRequest.zig
+++ b/src/browser/webapi/storage/idb/IDBRequest.zig
@@ -252,7 +252,7 @@ pub fn fireSuccess(self: *IDBRequest, exec: *Execution) !void {
const event = try Event.initTrusted(comptime .wrap("success"), null, exec.page);
event.acquireRef();
- defer _ = event.releaseRef(exec.page);
+ defer event.releaseRef(exec.page);
try exec.dispatch(self.asEventTarget(), event, self._on_success, .{ .context = "IDBRequest.success" });
@@ -281,7 +281,7 @@ fn fireError(self: *IDBRequest, exec: *Execution) !void {
const event = try Event.initTrusted(comptime .wrap("error"), .{ .bubbles = true, .cancelable = true }, exec.page);
event.acquireRef();
- defer _ = event.releaseRef(exec.page);
+ defer event.releaseRef(exec.page);
const et = self.asEventTarget();
event._target = et;