Skip to content

Lightpanda: the headless browser designed for AI and automation

better dispatch of currententrychange event

Muki Kiboigodf42a26a3992
diff --git a/src/browser/webapi/navigation/Navigation.zig b/src/browser/webapi/navigation/Navigation.zig
index 63be0bde0..20fbe9328 100644
--- a/src/browser/webapi/navigation/Navigation.zig
+++ b/src/browser/webapi/navigation/Navigation.zig
@@ -144,10 +144,20 @@ pub fn updateEntries(
) !void {
switch (kind) {
.replace => |state| {
- _ = try self.replaceEntry(url, .{ .source = .navigation, .value = state }, frame, should_dispatch);
+ _ = try self.replaceEntry(
+ url,
+ .{ .source = .navigation, .value = state },
+ frame,
+ should_dispatch,
+ );
},
.push => |state| {
- _ = try self.pushEntry(url, .{ .source = .navigation, .value = state }, frame, should_dispatch);
+ _ = try self.pushEntry(
+ url,
+ .{ .source = .navigation, .value = state },
+ frame,
+ should_dispatch,
+ );
},
.traverse => |index| {
self._index = index;
@@ -299,21 +309,30 @@ fn fireCurrentEntryChangeEvent(
kind: ?NavigationKind,
frame: *Frame,
) void {
- if (self._on_currententrychange) |cec| {
- const event =
- NavigationCurrentEntryChangeEvent.initTrusted(
- .wrap("currententrychange"),
- .{ .from = previous, .navigationType = if (kind) |k| @tagName(k) else null },
- frame,
- ) catch |err| {
- log.warn(.event, "Navigation.fireCurrentEntryChange", .{ .err = err });
- return;
- };
+ if (!frame.hasDirectListeners(
+ self.asEventTarget(),
+ "currententrychange",
+ self._on_currententrychange,
+ )) {
+ return;
+ }
- self.dispatch(cec, event.asEvent(), frame) catch |err| {
- log.warn(.event, "Navigation.fireCurrentEntryChange dispatch", .{ .err = err });
+ const event =
+ NavigationCurrentEntryChangeEvent.initTrusted(
+ .wrap("currententrychange"),
+ .{
+ .from = previous,
+ .navigationType = if (kind) |k| @tagName(k) else null,
+ },
+ frame,
+ ) catch |err| {
+ log.warn(.event, "Navigation.fireCurrentEntryChange", .{ .err = err });
+ return;
};
- }
+
+ self.dispatch(self._on_currententrychange, event.asEvent(), frame) catch |err| {
+ log.warn(.event, "Navigation.fireCurrentEntryChange dispatch", .{ .err = err });
+ };
}
const NavigateOptions = struct {
@@ -483,8 +502,8 @@ fn updateCurrentEntry(self: *Navigation, options: UpdateCurrentEntryOptions, fra
self.fireCurrentEntryChangeEvent(previous, null, frame);
}
-pub fn dispatch(self: *Navigation, func: js.Function.Global, event: *Event, frame: *Frame) !void {
- return frame._event_manager.dispatchDirect(
+pub fn dispatch(self: *Navigation, func: ?js.Function.Global, event: *Event, frame: *Frame) !void {
+ return frame.dispatch(
self.asEventTarget(),
event,
func,