Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(history): preserve scroll position across History API updates

ldm0276d0e8b5a7b
diff --git a/moli-renderer-v8/src/context_bootstrap/history_mutation.rs b/moli-renderer-v8/src/context_bootstrap/history_mutation.rs
index f56900314..de66569a5 100644
--- a/moli-renderer-v8/src/context_bootstrap/history_mutation.rs
+++ b/moli-renderer-v8/src/context_bootstrap/history_mutation.rs
@@ -298,11 +298,13 @@ fn mutate_history_object<'s>(
dispatch_navigation_success(scope, navigation);
}
} else {
+ // History API updates preserve scroll, even when the new URL has a
+ // fragment. Only queue completion, without a fragment/top fallback.
queue_same_document_navigation_success(
scope,
navigation,
navigate_outcome.as_ref().and_then(|outcome| outcome.signal),
- url.as_str(),
+ None,
);
}
}
diff --git a/moli-renderer-v8/src/context_bootstrap/location_navigation.rs b/moli-renderer-v8/src/context_bootstrap/location_navigation.rs
index c31f3b757..99568c4b2 100644
--- a/moli-renderer-v8/src/context_bootstrap/location_navigation.rs
+++ b/moli-renderer-v8/src/context_bootstrap/location_navigation.rs
@@ -447,7 +447,7 @@ fn navigate_location_object_with_source_element_and_child_navigate_event<'s>(
scope,
navigation,
navigate_outcome.as_ref().and_then(|outcome| outcome.signal),
- resolved.as_str(),
+ Some(resolved.as_str()),
);
}
}
diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_result.rs b/moli-renderer-v8/src/context_bootstrap/navigation_result.rs
index d6ca93237..bc8553305 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigation_result.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigation_result.rs
@@ -226,10 +226,18 @@ pub(super) fn queue_same_document_navigation_success<'s>(
scope: &mut v8::PinScope<'s, '_>,
navigation: v8::Local<'s, v8::Object>,
signal: Option<v8::Local<'s, v8::Object>>,
- href: &str,
+ fallback_scroll_href: Option<&str>,
) {
queue_same_document_navigation_finished(
- scope, navigation, signal, None, None, None, None, None, href,
+ scope,
+ navigation,
+ signal,
+ None,
+ None,
+ None,
+ None,
+ None,
+ fallback_scroll_href.unwrap_or_default(),
);
}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation.rs
index 1b08b017e..8aa13eea5 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/navigation.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/navigation.rs
@@ -3454,6 +3454,51 @@ async fn location_href_double_intercept_cancels_first_settlement() {
"locationInterceptSpoof:false:spoof-location.js:https://example.com/start:null|navigate:https://example.com/start:null|currententrychange:https://example.com/common/blank.html#1:push|handler:https://example.com/common/blank.html#1:push|abort:AbortError:https://example.com/common/blank.html#1:push|navigateerror:AbortError:https://example.com/common/blank.html#1:push|navigate:https://example.com/common/blank.html#1:null|currententrychange:https://example.com/common/blank.html#2:replace|handler:https://example.com/common/blank.html#2:replace|transition-rejected:AbortError:https://example.com/common/blank.html#2:replace|microtask:https://example.com/common/blank.html#2:replace|handler-timeout:https://example.com/common/blank.html#2:replace|handler-timeout:https://example.com/common/blank.html#2:replace|navigatesuccess:https://example.com/common/blank.html#2:replace|transition-finished:https://example.com/common/blank.html#2:null"
);
}
+
+#[test]
+fn history_api_url_updates_preserve_scroll_and_focus() {
+ for method in ["pushState", "replaceState"] {
+ for destination in ["/more?month=8", "#destination"] {
+ let mut vm = new_parsed_test_vm(
+ "https://example.com/profile",
+ r#"<!doctype html><body style="margin:0;width:3000px;height:5000px">
+ <input id="focused">
+ <div id="destination" style="position:absolute;top:3500px">month</div>"#,
+ );
+ refresh_layout_for_test(&mut vm);
+ vm.eval(
+ r#"focused.focus({preventScroll:true}); scrollTo(120,900);
+ window.events=[];
+ for (const type of ['navigate','currententrychange','navigatesuccess'])
+ navigation.addEventListener(type,()=>events.push(type));
+ window.position=()=>[scrollX,scrollY,document.scrollingElement.scrollLeft,
+ document.scrollingElement.scrollTop,document.activeElement.id].join('|');"#,
+ )
+ .unwrap();
+ refresh_layout_for_test(&mut vm);
+ let layouts = vm.layout_pass_observability_for_test().1;
+ assert_eq!(
+ vm.eval(&format!(
+ "history.{method}({{month:8}},'',{destination:?}); position()+'|'+events.join(',')"
+ ))
+ .unwrap(),
+ "120|900|120|900|focused|navigate,currententrychange",
+ "{method}({destination}) before completion"
+ );
+ // History API completion still emits navigatesuccess, but must not
+ // apply the fragment/top scrolling used by an actual navigation.
+ assert_eq!(
+ vm.eval("position()+'|'+events.join(',')").unwrap(),
+ "120|900|120|900|focused|navigate,currententrychange,navigatesuccess",
+ "{method}({destination}) after completion"
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, layouts);
+ refresh_layout_for_test(&mut vm);
+ assert_eq!(vm.eval("position()").unwrap(), "120|900|120|900|focused");
+ }
+ }
+}
+
#[test]
fn same_document_navigation_dispatches_navigatesuccess() {
let mut vm = new_storage_test_vm("https://example.com/base");