Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: update location and the entry URL in a same-document navigation.navigate()

Jay Hemnani59c4db411c61
diff --git a/src/browser/tests/navigation/navigate_event.html b/src/browser/tests/navigation/navigate_event.html
index 8332ba1f4..23389e8d8 100644
--- a/src/browser/tests/navigation/navigate_event.html
+++ b/src/browser/tests/navigation/navigate_event.html
@@ -284,10 +284,12 @@
navigation.addEventListener('navigatesuccess', onsuccess);
const r = navigation.navigate('#n1', {info: 'I', state: {k: 1}});
+ let after;
Promise.all([
r.committed.then(() => order.push('committed')),
r.finished.then(() => order.push('finished')),
]).then(() => {
+ after = [location.href, navigation.currentEntry.url];
navigation.removeEventListener('navigate', onnavigate);
navigation.removeEventListener('navigatesuccess', onsuccess);
history.replaceState(null, '', original);
@@ -304,6 +306,8 @@
testing.expectTrue(e.hashChange);
testing.expectTrue(order.includes('navigatesuccess'));
testing.expectEqual(order.indexOf('navigatesuccess') < order.indexOf('finished'), true);
+ const expected = new URL('#n1', original).href;
+ testing.expectEqual([expected, expected], after);
});
}
</script>
diff --git a/src/browser/webapi/navigation/Navigation.zig b/src/browser/webapi/navigation/Navigation.zig
index 89824ef7a..717f93918 100644
--- a/src/browser/webapi/navigation/Navigation.zig
+++ b/src/browser/webapi/navigation/Navigation.zig
@@ -676,6 +676,9 @@ pub fn navigateInner(
if (is_same_document) {
frame.url = new_url;
+ try frame.window._location._url.setHref(new_url, &frame.js.execution);
+ // `:target` matches off the fragment, which might have just changed.
+ frame.styleChanged();
frame._session.notification.dispatch(.frame_navigated_within_document, &.{
.url = new_url,
@@ -693,7 +696,7 @@ pub fn navigateInner(
switch (kind) {
.push => |state| {
if (is_same_document) {
- _ = try self.pushEntry(url, .{ .source = .navigation, .value = state }, frame, true);
+ _ = try self.pushEntry(new_url, .{ .source = .navigation, .value = state }, frame, true);
try self.settleSameDocument(finished, signal, frame);
} else {
try frame.scheduleNavigation(url, .{ .reason = .navigation, .kind = kind }, .{ .script = frame });
@@ -701,7 +704,7 @@ pub fn navigateInner(
},
.replace => |state| {
if (is_same_document) {
- _ = try self.replaceEntry(url, .{ .source = .navigation, .value = state }, frame, true);
+ _ = try self.replaceEntry(new_url, .{ .source = .navigation, .value = state }, frame, true);
try self.settleSameDocument(finished, signal, frame);
} else {
try frame.scheduleNavigation(url, .{ .reason = .navigation, .kind = kind }, .{ .script = frame });
@@ -711,10 +714,6 @@ pub fn navigateInner(
self._index = index;
if (is_same_document) {
- try frame.window._location._url.setHref(new_url, &frame.js.execution);
- // `:target` matches off the fragment, which might have just changed.
- frame.styleChanged();
-
try self.fireCurrentEntryChangeEvent(previous, kind, frame);
try self.settleSameDocument(finished, signal, frame);
} else {