public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-28 14:43:28 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix navigation shortcut URL stitching

Browse Source
This commit is contained in:
Muki Kiboigo
2025-10-17 07:57:10 -07:00
parent 9778eed1ed
commit 0eb639ac76
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/browser/page.zig
View File

@@ -34,7 +34,9 @@ const Http = @import("../http/Http.zig");
const ScriptManager = @import("ScriptManager.zig"); const ScriptManager = @import("ScriptManager.zig");
const SlotChangeMonitor = @import("SlotChangeMonitor.zig"); const SlotChangeMonitor = @import("SlotChangeMonitor.zig");
const HTMLDocument = @import("html/document.zig").HTMLDocument; const HTMLDocument = @import("html/document.zig").HTMLDocument;
const NavigationKind = @import("navigation/navigation.zig").NavigationKind; const NavigationKind = @import("navigation/navigation.zig").NavigationKind;
const NavigationCurrentEntryChangeEvent = @import("navigation/navigation.zig").NavigationCurrentEntryChangeEvent;
const js = @import("js/js.zig"); const js = @import("js/js.zig");
const URL = @import("../url.zig").URL; const URL = @import("../url.zig").URL;
@@ -737,9 +739,6 @@ pub const Page = struct {
var self: *Page = @ptrCast(@alignCast(ctx)); var self: *Page = @ptrCast(@alignCast(ctx));
self.clearTransferArena(); self.clearTransferArena();
// We need to handle different navigation types differently.
try self.session.navigation.processNavigation(self);
switch (self.mode) { switch (self.mode) {
.pre => { .pre => {
// Received a response without a body like: https://httpbin.io/status/200 // Received a response without a body like: https://httpbin.io/status/200
@@ -818,6 +817,9 @@ pub const Page = struct {
unreachable; unreachable;
}, },
} }
// We need to handle different navigation types differently.
try self.session.navigation.processNavigation(self);
} }
fn pageErrorCallback(ctx: *anyopaque, err: anyerror) void { fn pageErrorCallback(ctx: *anyopaque, err: anyerror) void {
@@ -1046,22 +1048,19 @@ pub const Page = struct {
// specifically for this type of lifetime. // specifically for this type of lifetime.
pub fn navigateFromWebAPI(self: *Page, url: []const u8, opts: NavigateOpts, kind: NavigationKind) !void { pub fn navigateFromWebAPI(self: *Page, url: []const u8, opts: NavigateOpts, kind: NavigationKind) !void {
const session = self.session; const session = self.session;
const stitched_url = try URL.stitch(session.transfer_arena, url, self.url.raw, .{ .alloc = .always });
// Force will force a page load. // Force will force a page load.
// // Otherwise, we need to check if this is a true navigation.
// TODO: This needs to be reworked but just ensuring events get fired right.
if (!opts.force) { if (!opts.force) {
// If we are navigating within the same document, just change URL. // If we are navigating within the same document, just change URL.
const new_url = try URL.parse(url, null); const new_url = try URL.parse(stitched_url, null);
if (try self.url.eqlDocument(&new_url, self.arena)) {
const new_duped_url = try session.arena.dupe(u8, url); if (try self.url.eqlDocument(&new_url, session.transfer_arena)) {
self.url = try URL.parse(new_duped_url, null); self.url = new_url;
// TODO: remove this temporary snippet.
const prev = session.navigation.currentEntry(); const prev = session.navigation.currentEntry();
const NavigationCurrentEntryChangeEvent = @import("navigation/navigation.zig").NavigationCurrentEntryChangeEvent;
NavigationCurrentEntryChangeEvent.dispatch(&self.session.navigation, prev, kind); NavigationCurrentEntryChangeEvent.dispatch(&self.session.navigation, prev, kind);
return; return;
} }
} }
@@ -1088,7 +1087,7 @@ pub const Page = struct {
session.queued_navigation = .{ session.queued_navigation = .{
.opts = opts, .opts = opts,
.url = try URL.stitch(session.transfer_arena, url, self.url.raw, .{ .alloc = .always }), .url = stitched_url,
}; };
session.navigation_kind = kind; session.navigation_kind = kind;