Skip to content

Lightpanda: the headless browser designed for AI and automation

add dispose event to NavigationHistoryEntry

Muki Kiboigo9b6e203df816
diff --git a/src/browser/webapi/EventTarget.zig b/src/browser/webapi/EventTarget.zig
index b083969be..b8e77a31e 100644
--- a/src/browser/webapi/EventTarget.zig
+++ b/src/browser/webapi/EventTarget.zig
@@ -45,6 +45,7 @@ pub const Type = union(enum) {
broadcast_channel: *@import("BroadcastChannel.zig"),
text_track_cue: *@import("media/TextTrackCue.zig"),
navigation: *@import("navigation/Navigation.zig"),
+ navigation_history_entry: *@import("navigation/NavigationHistoryEntry.zig"),
screen: *@import("Screen.zig"),
screen_orientation: *@import("Screen.zig").Orientation,
visual_viewport: *@import("VisualViewport.zig"),
@@ -234,6 +235,7 @@ pub fn format(self: *EventTarget, writer: *std.Io.Writer) !void {
.idb_database => writer.writeAll("<IDBDatabase>"),
.idb_transaction => writer.writeAll("<IDBTransaction>"),
.notification => writer.writeAll("<Notification>"),
+ .navigation_history_entry => writer.writeAll("<NavigationHistoryEntry>"),
};
}
@@ -263,6 +265,7 @@ pub fn toString(self: *EventTarget) []const u8 {
.idb_database => return "[object IDBDatabase]",
.idb_transaction => return "[object IDBTransaction]",
.notification => return "[object Notification]",
+ .navigation_history_entry => return "[object NavigationHistoryEntry]",
};
}
diff --git a/src/browser/webapi/navigation/Navigation.zig b/src/browser/webapi/navigation/Navigation.zig
index faa325e95..a43f56b59 100644
--- a/src/browser/webapi/navigation/Navigation.zig
+++ b/src/browser/webapi/navigation/Navigation.zig
@@ -56,10 +56,16 @@ fn asEventTarget(self: *Navigation) *EventTarget {
pub fn onRemoveFrame(self: *Navigation) void {
self._proto = undefined;
+ for (self._entries.items) |entry| {
+ entry._proto = undefined;
+ }
}
pub fn onNewFrame(self: *Navigation, frame: *Frame) !void {
self._proto = try frame._factory.standaloneEventTarget(self);
+ for (self._entries.items) |entry| {
+ entry._proto = try frame._factory.standaloneEventTarget(entry);
+ }
}
pub fn getActivation(self: *const Navigation) ?NavigationActivation {
@@ -184,6 +190,9 @@ pub fn pushEntry(
// truncates our history here.
if (self._entries.items.len > self._index + 1) {
+ for (self._entries.items[self._index + 1 ..]) |disposed| {
+ try disposed.fireDispose(frame);
+ }
self._entries.shrinkRetainingCapacity(self._index + 1);
}
@@ -196,6 +205,7 @@ pub fn pushEntry(
const entry = try arena.create(NavigationHistoryEntry);
entry.* = NavigationHistoryEntry{
+ ._proto = try frame._factory.standaloneEventTarget(entry),
._id = id_str,
._key = id_str,
._url = url,
@@ -241,13 +251,16 @@ pub fn replaceEntry(
const entry = try arena.create(NavigationHistoryEntry);
entry.* = NavigationHistoryEntry{
+ ._proto = try frame._factory.standaloneEventTarget(entry),
._id = id_str,
._key = previous._key,
._url = url,
._state = state,
};
+ const old_entry = self._entries.items[self._index];
self._entries.items[self._index] = entry;
+ try old_entry.fireDispose(frame);
if (should_dispatch == false) {
return entry;
diff --git a/src/browser/webapi/navigation/NavigationHistoryEntry.zig b/src/browser/webapi/navigation/NavigationHistoryEntry.zig
index d69422997..35cc1a26f 100644
--- a/src/browser/webapi/navigation/NavigationHistoryEntry.zig
+++ b/src/browser/webapi/navigation/NavigationHistoryEntry.zig
@@ -19,19 +19,26 @@
const std = @import("std");
const URL = @import("../URL.zig");
const NavigationState = @import("root.zig").NavigationState;
+const Event = @import("../Event.zig");
+const EventTarget = @import("../EventTarget.zig");
const Frame = @import("../../Frame.zig");
const js = @import("../../js/js.zig");
const NavigationHistoryEntry = @This();
// https://developer.mozilla.org/en-US/docs/Web/API/NavigationHistoryEntry
-// no proto for now
-// _proto: ?*EventTarget,
+_proto: *EventTarget,
_id: []const u8,
_key: []const u8,
_url: ?[:0]const u8,
_state: NavigationState,
+_on_dispose: ?js.Function.Global = null,
+
+fn asEventTarget(self: *NavigationHistoryEntry) *EventTarget {
+ return self._proto;
+}
+
pub fn id(self: *const NavigationHistoryEntry) []const u8 {
return self._id;
}
@@ -73,6 +80,25 @@ pub fn getState(self: *const NavigationHistoryEntry, frame: *Frame) !StateReturn
return .undefined;
}
+pub fn fireDispose(self: *NavigationHistoryEntry, frame: *Frame) !void {
+ const cec = self._on_dispose orelse return;
+
+ const event = try Event.initTrusted(comptime .wrap("dispose"), .{}, frame._page);
+ try frame.dispatch(self.asEventTarget(), event, cec, .{ .context = "NavigationHistoryEntry" });
+}
+
+fn getOnDispose(self: *const NavigationHistoryEntry) ?js.Function.Global {
+ return self._on_dispose;
+}
+
+pub fn setOnDispose(self: *NavigationHistoryEntry, listener: ?js.Function) !void {
+ if (listener) |listen| {
+ self._on_dispose = try listen.persistWithThis(self);
+ } else {
+ self._on_dispose = null;
+ }
+}
+
pub const JsApi = struct {
pub const bridge = js.Bridge(NavigationHistoryEntry);
@@ -88,4 +114,9 @@ pub const JsApi = struct {
pub const sameDocument = bridge.accessor(NavigationHistoryEntry.sameDocument, null, .{});
pub const url = bridge.accessor(NavigationHistoryEntry.url, null, .{});
pub const getState = bridge.function(NavigationHistoryEntry.getState, .{});
+ pub const ondispose = bridge.accessor(
+ NavigationHistoryEntry.getOnDispose,
+ NavigationHistoryEntry.setOnDispose,
+ .{},
+ );
};