Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(input): consume existing snapshots for coordinate mouse input

ldm02812a1de672f
diff --git a/moli-layout/src/error.rs b/moli-layout/src/error.rs
index 080f4165e..b33e6e6d2 100644
--- a/moli-layout/src/error.rs
+++ b/moli-layout/src/error.rs
@@ -3,6 +3,11 @@ use thiserror::Error;
/// A structured failure while constructing or evaluating one layout pass.
#[derive(Clone, Debug, Error, PartialEq, Eq)]
pub enum LayoutError {
+ /// Coordinate input consumes a published snapshot and cannot create one.
+ #[error(
+ "coordinate input requires an existing layout snapshot; request geometry or a screenshot first"
+ )]
+ NoLayoutSnapshot,
/// A geometry consumer forced layout before the Document had an element root.
#[error("current document has no element root to lay out")]
NoLayoutRoot,
diff --git a/moli-protocol/src/conn/dispatch_tests.rs b/moli-protocol/src/conn/dispatch_tests.rs
index 90733366f..562b394ce 100644
--- a/moli-protocol/src/conn/dispatch_tests.rs
+++ b/moli-protocol/src/conn/dispatch_tests.rs
@@ -5416,6 +5416,28 @@ async fn devtools_command_dispatches_coordinate_mouse_input_for_target() {
.await
.expect("navigation should succeed");
+ execute_direct_devtools_command_through_renderer_fence_for_test(
+ &mut ctx,
+ DevToolsCommand::EvaluateScript(DevToolsEvaluateScriptCommand {
+ context: DevToolsCommandContext {
+ target_id: Some(target_id.clone()),
+ ..context.clone()
+ },
+ realm_id: None,
+ world_name: None,
+ expression: "document.elementFromPoint(0, 0); true".to_owned(),
+ await_promise: true,
+ user_gesture: false,
+ webdriver_bidi_file_prompt_handler: None,
+ result_ownership: DevToolsResultOwnership::None,
+ preserve_remote_metadata: false,
+ materialize_bidi_script_result: false,
+ serialization_options: None,
+ }),
+ )
+ .await
+ .expect("publish geometry before coordinate input");
+
for (event_type, buttons) in [
(DevToolsMouseEventType::Pressed, Some(1)),
(DevToolsMouseEventType::Released, Some(0)),
diff --git a/moli-protocol/src/domains/input/tests.rs b/moli-protocol/src/domains/input/tests.rs
index c9610496f..603339d0c 100644
--- a/moli-protocol/src/domains/input/tests.rs
+++ b/moli-protocol/src/domains/input/tests.rs
@@ -5,6 +5,7 @@ use moli_core::LayoutPolicy;
mod element_click;
mod keyboard_events;
+mod mouse_snapshot;
mod text_control_compat;
const INPUT_HIT_X: u32 = 20;
@@ -172,6 +173,7 @@ async fn coordinate_mouse_commands_hit_test_real_layout_and_dispatch_dom_events(
</body></html>"#,
)
.await;
+ assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);
let commands = [
json!({
@@ -222,6 +224,7 @@ async fn coordinate_mouse_release_acknowledges_real_link_navigation() {
</body></html>"#,
)
.await;
+ assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);
ctx.enable_page_events_for_test(None);
ctx.process_and_wait_for_response_async(json!({
@@ -271,6 +274,7 @@ async fn coordinate_mouse_release_acknowledges_real_link_navigation() {
async fn completed_mouse_event_does_not_restore_replaced_page_state() {
let mut ctx = TestContext::new();
with_loaded_document(&mut ctx, "<body>origin</body>").await;
+ assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);
let original_owner = ctx
.conn
@@ -1489,13 +1493,14 @@ async fn dispatch_key_event_selects_and_replaces_contenteditable_text() {
}
#[tokio::test(flavor = "multi_thread")]
-async fn coordinate_mouse_event_completes_through_pending_layout_dispatch() {
+async fn coordinate_mouse_event_completes_through_pending_renderer_dispatch() {
let mut ctx = TestContext::new();
with_loaded_document(
&mut ctx,
r#"<body style='margin:0'><button style='width:80px;height:80px' onclick="window.__clicked = true">go</button></body>"#,
)
.await;
+ assert!(evaluate_bool(&mut ctx, "document.elementFromPoint(0, 0) !== null").await);
for (id, event_type, buttons) in [(4001, "mousePressed", 1), (4002, "mouseReleased", 0)] {
let raw = json!({
@@ -1513,7 +1518,7 @@ async fn coordinate_mouse_event_completes_through_pending_layout_dispatch() {
let pending = match ctx.conn.start_command_dispatch(&raw) {
CdpCommandTaskStep::Pending(pending) => pending,
CdpCommandTaskStep::Complete(_) => {
- panic!("coordinate mouse dispatch should wait for renderer layout")
+ panic!("coordinate mouse dispatch should wait for the renderer")
}
};
let outcome = ctx
diff --git a/moli-protocol/src/domains/input/tests/mouse_snapshot.rs b/moli-protocol/src/domains/input/tests/mouse_snapshot.rs
new file mode 100644
index 000000000..03ceeaf17
--- /dev/null
+++ b/moli-protocol/src/domains/input/tests/mouse_snapshot.rs
@@ -0,0 +1,82 @@
+use super::*;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn cdp_mouse_requires_a_snapshot_then_consumes_geometry_and_screenshot_publications() {
+ let mut ctx = TestContext::new();
+ with_loaded_document(&mut ctx, r#"<html><body style='margin:0;min-height:100px'>
+ <button id='target' style='position:absolute;left:0;top:0;width:100px;height:100px'>go</button>
+ <script>
+ window.events=[];
+ for(const type of ['mousemove','mousedown','mouseup','click','wheel'])
+ document.addEventListener(type,e=>events.push([type,e.target.id]));
+ </script></body></html>"#).await;
+ for (id, event) in [
+ (701, "mouseMoved"),
+ (702, "mousePressed"),
+ (703, "mouseReleased"),
+ (704, "mouseWheel"),
+ ] {
+ ctx.process_async(json!({
+ "id":id, "method":"Input.dispatchMouseEvent",
+ "params":{"type":event,"x":20,"y":20,"button":"left","deltaX":0,"deltaY":10}
+ }))
+ .await;
+ let response = ctx.take_response_by_id(id);
+ assert_eq!(response["error"]["code"], -32000, "{response}");
+ assert!(
+ response["error"]["message"]
+ .as_str()
+ .unwrap()
+ .contains("coordinate input requires an existing layout snapshot"),
+ "{response}"
+ );
+ }
+ assert_eq!(
+ evaluate_string(&mut ctx, "JSON.stringify(events)").await,
+ "[]"
+ );
+
+ let object_id = resolve_selector_object_id(&mut ctx, "#target", 710).await;
+ ctx.process_async(json!({"id":720,"method":"DOM.getBoxModel","params":{"objectId":object_id}}))
+ .await;
+ assert!(ctx.take_response_by_id(720)["result"]["model"].is_object());
+ assert!(
+ evaluate_bool(
+ &mut ctx,
+ "document.getElementById('target').style.left='300px';true"
+ )
+ .await
+ );
+ for (id, event, buttons) in [
+ (721, "mouseMoved", 0),
+ (722, "mousePressed", 1),
+ (723, "mouseReleased", 0),
+ ] {
+ ctx.process_async(json!({
+ "id":id,"method":"Input.dispatchMouseEvent",
+ "params":{"type":event,"x":20,"y":20,"button":"left","buttons":buttons,"clickCount":1}
+ }))
+ .await;
+ ctx.expect_result(id, json!({}), None);
+ }
+ assert_eq!(
+ evaluate_string(&mut ctx, "JSON.stringify(events)").await,
+ r#"[["mousemove","target"],["mousedown","target"],["mouseup","target"],["click","target"]]"#
+ );
+
+ ctx.process_async(json!({"id":724,"method":"Page.captureScreenshot"}))
+ .await;
+ assert!(
+ ctx.take_response_by_id(724)["result"]["data"]
+ .as_str()
+ .is_some_and(|data| !data.is_empty())
+ );
+ for (id, x) in [(725, 20), (726, 320)] {
+ ctx.process_async(json!({"id":id,"method":"Input.dispatchMouseEvent","params":{"type":"mouseMoved","x":x,"y":20}})).await;
+ ctx.expect_result(id, json!({}), None);
+ }
+ assert_eq!(
+ evaluate_string(&mut ctx, "JSON.stringify(events.slice(-2))").await,
+ r#"[["mousemove",""],["mousemove","target"]]"#
+ );
+}
diff --git a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rs b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rs
index 44a0fe3ab..a31a40dfc 100644
--- a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rs
+++ b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/emulation_input_storage.rs
@@ -457,6 +457,14 @@ async fn rust_cdp_capability_input_dispatch_mouse_event_uses_layout_hit_testing(
"data:text/html,<button id='btn' onclick='window.__clicked = true' style='position:absolute;left:0;top:0;width:100px;height:100px'>go</button>".to_owned(),
)
.await;
+ let geometry = evaluate_return_by_value(
+ &mut ctx,
+ &attached.session_id,
+ 120_004,
+ "document.elementFromPoint(0, 0) !== null",
+ )
+ .await;
+ assert_eq!(geometry["result"]["result"]["value"], true);
for (offset, event_type, buttons) in [(0, "mousePressed", 1), (1, "mouseReleased", 0)] {
ctx.process_async(json!({
"id": 120_006 + offset,
diff --git a/moli-protocol/src/domains/target/tests/tests_target_creation.rs b/moli-protocol/src/domains/target/tests/tests_target_creation.rs
index fb17ac4f2..477458e82 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_creation.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_creation.rs
@@ -2121,6 +2121,12 @@ async fn anchor_left_click_activates_blank_target_to_foreground() {
),
)
.await;
+ ctx.process_async(json!({
+ "id": 16_090, "method": "Runtime.evaluate",
+ "params": {"expression":"document.elementFromPoint(0, 0) !== null", "returnByValue":true}
+ })).await;
+ let geometry = ctx.take_response_by_id(16_090);
+ assert_eq!(geometry["result"]["result"]["value"], true);
let _ = ctx.take_all();
dispatch_anchor_left_click(&mut ctx, 16_100, 0).await;
@@ -2163,6 +2169,12 @@ async fn anchor_left_click_activates_popup_while_initial_navigation_waits_for_de
),
)
.await;
+ ctx.process_async(json!({
+ "id": 16_090, "method": "Runtime.evaluate",
+ "params": {"expression":"document.elementFromPoint(0, 0) !== null", "returnByValue":true}
+ })).await;
+ let geometry = ctx.take_response_by_id(16_090);
+ assert_eq!(geometry["result"]["result"]["value"], true);
let _ = ctx.take_all();
ctx.process_async(json!({
"id": 16_150,
@@ -2252,6 +2264,12 @@ async fn anchor_platform_new_tab_click_keeps_blank_target_in_background() {
),
)
.await;
+ ctx.process_async(json!({
+ "id": 16_090, "method": "Runtime.evaluate",
+ "params": {"expression":"document.elementFromPoint(0, 0) !== null", "returnByValue":true}
+ })).await;
+ let geometry = ctx.take_response_by_id(16_090);
+ assert_eq!(geometry["result"]["result"]["value"], true);
let _ = ctx.take_all();
#[cfg(target_os = "macos")]
diff --git a/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs b/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs
index 6814d781d..1107135c1 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/host_environment.rs
@@ -1960,9 +1960,9 @@ impl JsContextHost {
old_state,
);
}
- // Hover selectors may change box generation or geometry. The next hit
- // test must observe that new tree instead of waiting for a paint pass
- // to replace the latest owned layout snapshot.
+ // Hover changes the source style, not the published rendered world.
+ // Explicit geometry/paint demands may refresh it; subsequent pointer
+ // phases continue consuming the retained snapshot.
self.invalidate_layout_after_interaction_state_change();
true
}
diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout.rs b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
index 171020343..c2f29e7da 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout.rs
@@ -538,7 +538,7 @@ impl JsContextHost {
self.clear_layout_rect_cache();
self.document_layout_state
.borrow_mut()
- .clear_latest_layout();
+ .invalidate_latest_layout_for_demand();
}
pub(crate) fn document_web_font_resources_are_current(
diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs b/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs
index 972d445fd..50c1cdb6a 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout_snapshot.rs
@@ -17,6 +17,7 @@ struct LatestFrozenLayout {
document: DomHandle,
tree: Box<FrozenLayoutTree<DomHandle>>,
environment: LayoutEnvironment,
+ reusable_for_demand: bool,
}
/// Single-slot storage for the latest successful frozen layout tree.
@@ -44,9 +45,9 @@ impl LatestLayoutTreeCache {
}
pub(super) fn matches_environment(&self, environment: LayoutEnvironment) -> bool {
- self.latest
- .as_ref()
- .is_some_and(|snapshot| snapshot.environment == environment)
+ self.latest.as_ref().is_some_and(|snapshot| {
+ snapshot.reusable_for_demand && snapshot.environment == environment
+ })
}
pub(super) fn publish(
@@ -59,9 +60,18 @@ impl LatestLayoutTreeCache {
document,
tree: Box::new(tree),
environment,
+ reusable_for_demand: true,
});
}
+ /// Keep the rendered world available to input while the next geometry
+ /// demand rebuilds it after an interaction such as scrolling or hover.
+ pub(super) fn invalidate_for_demand(&mut self) {
+ if let Some(snapshot) = &mut self.latest {
+ snapshot.reusable_for_demand = false;
+ }
+ }
+
pub(super) fn clear(&mut self) {
self.latest = None;
}
diff --git a/moli-renderer-v8/src/native_bridge/context_host/layout_state.rs b/moli-renderer-v8/src/native_bridge/context_host/layout_state.rs
index 5e3e90f7b..3e746992a 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/layout_state.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/layout_state.rs
@@ -146,6 +146,11 @@ impl DocumentLayoutState {
self.mark_visual_state_dirty();
}
+ pub(super) fn invalidate_latest_layout_for_demand(&mut self) {
+ self.latest_layout.invalidate_for_demand();
+ self.mark_visual_state_dirty();
+ }
+
pub(super) fn frame_viewport(&self, frame: DomHandle) -> Option<LayoutViewport> {
self.frame_viewports.get(&frame).copied()
}
diff --git a/moli-renderer-v8/src/native_bridge/current_input.rs b/moli-renderer-v8/src/native_bridge/current_input.rs
index d850435b4..519f48e55 100644
--- a/moli-renderer-v8/src/native_bridge/current_input.rs
+++ b/moli-renderer-v8/src/native_bridge/current_input.rs
@@ -35,12 +35,13 @@ impl InputModifiers {
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
enum CurrentInputEventKind {
MouseUp { button: i32 },
+ Mouse,
EnterKey,
Other,
}
-/// The navigation-relevant subset of the real platform input currently being
-/// handled. DOM events are deliberately not stored here: synthetic events may
+/// The native default-action context of the real platform input currently
+/// being handled. DOM events are deliberately not stored here: synthetic events may
/// describe modifiers, but cannot manufacture the corresponding user intent.
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub(crate) struct CurrentInputEvent {
@@ -54,12 +55,19 @@ impl CurrentInputEvent {
kind: if event_name == "mouseup" {
CurrentInputEventKind::MouseUp { button }
} else {
- CurrentInputEventKind::Other
+ CurrentInputEventKind::Mouse
},
modifiers: InputModifiers::from_bits(modifiers),
}
}
+ pub(crate) fn is_mouse(self) -> bool {
+ matches!(
+ self.kind,
+ CurrentInputEventKind::Mouse | CurrentInputEventKind::MouseUp { .. }
+ )
+ }
+
pub(crate) fn keyboard(key: &str, modifiers: u8) -> Self {
Self {
kind: if key.eq_ignore_ascii_case("enter") {
@@ -75,7 +83,9 @@ impl CurrentInputEvent {
let button = match self.kind {
CurrentInputEventKind::MouseUp { button } => button,
CurrentInputEventKind::EnterKey => 0,
- CurrentInputEventKind::Other => return InputNavigationPolicy::Current,
+ CurrentInputEventKind::Mouse | CurrentInputEventKind::Other => {
+ return InputNavigationPolicy::Current;
+ }
};
navigation_policy_from_modifiers(button, self.modifiers)
}
diff --git a/moli-renderer-v8/src/native_bridge/element.rs b/moli-renderer-v8/src/native_bridge/element.rs
index 48940da6a..7204540f7 100644
--- a/moli-renderer-v8/src/native_bridge/element.rs
+++ b/moli-renderer-v8/src/native_bridge/element.rs
@@ -393,13 +393,13 @@ pub use geometry::ClientRect;
#[cfg(test)]
pub(crate) use geometry::observable_scrollbar_hit_test;
pub(crate) use geometry::{
- apply_scroll_observable_effects, observable_bounding_client_rect, observable_caret_position,
+ InputSurfaceHit, apply_scroll_observable_effects, observable_caret_position,
observable_deep_hit_test, observable_event_offset, observable_geometry_batch,
observable_hit_test, observable_hit_test_all, observable_input_hit_test,
- observable_input_surface_hit_test, observable_scroll_adjusted_client_rect,
- observable_sources_with_fragments, perform_scrollbar_scroll_default_action,
- perform_wheel_scroll_default_action, queue_scroll_observable_effects,
- scroll_node_into_view_at_center, scroll_node_into_view_at_start,
+ observable_scroll_adjusted_client_rect, observable_sources_with_fragments,
+ perform_scrollbar_scroll_default_action, perform_wheel_scroll_default_action,
+ queue_scroll_observable_effects, scroll_node_into_view_at_center,
+ scroll_node_into_view_at_start, snapshot_input_surface_hit_test,
};
pub(super) use geometry::{
node_client_height_getter_function, node_client_left_getter_function,
@@ -7488,4 +7488,4 @@ pub(in crate::native_bridge::element) fn resolved_reflected_element_attribute_ha
.and_then(|candidate| runtime.dom_host().resolve_reference_target_chain(candidate))
}
-pub(crate) use geometry::observable_client_rects;
+pub(crate) use geometry::read_client_rects;
diff --git a/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs b/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs
index 8b8293a6a..15bb97b83 100644
--- a/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs
+++ b/moli-renderer-v8/src/native_bridge/element/activation/default_action.rs
@@ -28,7 +28,7 @@ use super::super::{
construct_input_event, construct_simple_event, contenteditable_editing_host,
dispatch_beforeinput, dispatch_popover_toggle_events, dispatch_public_event, element_attribute,
element_has_attribute, form_associated_form_owner, is_disabled_form_control, is_focusable,
- is_valid_submit_button, label_activation_control_handle, observable_bounding_client_rect,
+ is_valid_submit_button, label_activation_control_handle,
perform_popover_invoker_default_action, perform_summary_click_default_action,
replace_text_control_selection, resolve_url_like_attribute,
resolved_reflected_element_attribute_handle, scroll_node_into_view_at_start,
@@ -1701,10 +1701,10 @@ fn image_submitter_coordinate(
client_x: f64,
client_y: f64,
) -> Result<(u32, u32), moli_layout::LayoutError> {
- let rect = observable_bounding_client_rect(
+ let rect = super::super::geometry::read_bounding_client_rect(
runtime,
handle,
- moli_layout::LayoutFlushReason::SynchronousGeometry,
+ super::super::geometry::GeometryRead::for_default_action(runtime),
)?;
Ok((
image_submitter_coordinate_component(client_x - rect.left, rect.width),
diff --git a/moli-renderer-v8/src/native_bridge/element/focus.rs b/moli-renderer-v8/src/native_bridge/element/focus.rs
index 4b1d7e4cc..dd30888ab 100644
--- a/moli-renderer-v8/src/native_bridge/element/focus.rs
+++ b/moli-renderer-v8/src/native_bridge/element/focus.rs
@@ -6,7 +6,7 @@ use super::super::{
use super::forms::{
dispatch_text_control_event, form_control_is_effectively_disabled, text_control_value,
};
-use super::geometry::{observable_element_metrics, scroll_node_into_view_if_needed};
+use super::geometry::{GeometryRead, read_element_metrics, scroll_node_into_view_if_needed};
use super::styles::{StyleMode, style_property_value};
use super::{
construct_click_event, construct_focus_event, construct_interest_event,
@@ -74,6 +74,14 @@ fn contenteditable_state_from_attr(value: &str) -> Option<bool> {
}
pub(super) fn is_focusable(runtime: &JsContextHost, handle: DomHandle) -> bool {
+ is_focusable_with_geometry(runtime, handle, GeometryRead::for_default_action(runtime))
+}
+
+fn is_focusable_with_geometry(
+ runtime: &JsContextHost,
+ handle: DomHandle,
+ geometry: GeometryRead,
+) -> bool {
let Some(element) = runtime.dom_host().node(handle).and_then(Node::as_element) else {
return false;
};
@@ -90,7 +98,7 @@ pub(super) fn is_focusable(runtime: &JsContextHost, handle: DomHandle) -> bool {
"body" | "input" | "button" | "select" | "textarea" | "a" | "iframe" | "frame"
) || element.has_attribute("tabindex")
|| contenteditable_editing_host(runtime, handle) == Some(handle)
- || element_is_scrollable(runtime, handle)
+ || element_is_scrollable_with_geometry(runtime, handle, geometry)
}
fn overflow_makes_scroll_container(value: &str) -> bool {
@@ -101,6 +109,14 @@ fn overflow_makes_scroll_container(value: &str) -> bool {
}
fn element_is_scrollable(runtime: &JsContextHost, handle: DomHandle) -> bool {
+ element_is_scrollable_with_geometry(runtime, handle, GeometryRead::for_default_action(runtime))
+}
+
+fn element_is_scrollable_with_geometry(
+ runtime: &JsContextHost,
+ handle: DomHandle,
+ geometry: GeometryRead,
+) -> bool {
let scrolls_x = overflow_makes_scroll_container(&style_property_value(
runtime,
handle,
@@ -116,11 +132,7 @@ fn element_is_scrollable(runtime: &JsContextHost, handle: DomHandle) -> bool {
if !scrolls_x && !scrolls_y {
return false;
}
- match observable_element_metrics(
- runtime,
- handle,
- moli_layout::LayoutFlushReason::SynchronousGeometry,
- ) {
+ match read_element_metrics(runtime, handle, geometry) {
Ok(Some(metrics)) => {
metrics.is_scroll_container
&& (scrolls_x && metrics.maximum_scroll_offset.x > metrics.minimum_scroll_offset.x
@@ -164,6 +176,7 @@ fn first_delegates_focus_descendant(
runtime: &JsContextHost,
root: DomHandle,
autofocus_only: bool,
+ geometry: GeometryRead,
) -> Option<DomHandle> {
let mut stack = runtime.dom_host().child_handles(root).collect::<Vec<_>>();
stack.reverse();
@@ -173,14 +186,14 @@ fn first_delegates_focus_descendant(
.node(handle)
.and_then(Node::as_element)
.is_some_and(|element| element.has_attribute("autofocus"));
- if (!autofocus_only || autofocus) && is_focusable(runtime, handle) {
+ if (!autofocus_only || autofocus) && is_focusable_with_geometry(runtime, handle, geometry) {
return Some(handle);
}
if let Some(shadow_root) = runtime.dom_host().shadow_root_handle(handle)
&& runtime.dom_host().shadow_root_delegates_focus(shadow_root) == Some(true)
&& let Some(target) =
- first_delegates_focus_descendant(runtime, shadow_root, autofocus_only)
+ first_delegates_focus_descendant(runtime, shadow_root, autofocus_only, geometry)
{
return Some(target);
}
@@ -192,12 +205,24 @@ fn first_delegates_focus_descendant(
None
}
-fn first_delegates_focus_target(runtime: &JsContextHost, root: DomHandle) -> Option<DomHandle> {
- first_delegates_focus_descendant(runtime, root, true)
- .or_else(|| first_delegates_focus_descendant(runtime, root, false))
+fn first_delegates_focus_target(
+ runtime: &JsContextHost,
+ root: DomHandle,
+ geometry: GeometryRead,
+) -> Option<DomHandle> {
+ first_delegates_focus_descendant(runtime, root, true, geometry)
+ .or_else(|| first_delegates_focus_descendant(runtime, root, false, geometry))
}
fn delegated_focus_target(runtime: &JsContextHost, handle: DomHandle) -> Option<DomHandle> {
+ delegated_focus_target_with_geometry(runtime, handle, GeometryRead::for_default_action(runtime))
+}
+
+fn delegated_focus_target_with_geometry(
+ runtime: &JsContextHost,
+ handle: DomHandle,
+ geometry: GeometryRead,
+) -> Option<DomHandle> {
let root = runtime.dom_host().shadow_root_handle(handle)?;
if runtime.dom_host().shadow_root_delegates_focus(root) != Some(true) {
return None;
@@ -207,7 +232,7 @@ fn delegated_focus_target(runtime: &JsContextHost, handle: DomHandle) -> Option<
{
return Some(active);
}
- first_delegates_focus_target(runtime, root)
+ first_delegates_focus_target(runtime, root, geometry)
}
fn first_autofocus_candidate(runtime: &JsContextHost) -> Option<DomHandle> {
@@ -1226,7 +1251,13 @@ pub(crate) fn focus_element(
runtime_ptr: *mut JsContextHost,
handle: DomHandle,
) {
- if let Err(error) = focus_element_with_options(scope, runtime_ptr, handle, false) {
+ if let Err(error) = focus_element_with_options(
+ scope,
+ runtime_ptr,
+ handle,
+ false,
+ GeometryRead::for_default_action(unsafe { &*runtime_ptr }),
+ ) {
tracing::warn!(?handle, %error, "failed to scroll focused element into view");
}
}
@@ -1288,28 +1319,26 @@ fn focus_element_with_options(
runtime_ptr: *mut JsContextHost,
handle: DomHandle,
prevent_scroll: bool,
+ geometry: GeometryRead,
) -> Result<(), moli_layout::LayoutError> {
let runtime = unsafe { &*runtime_ptr };
- if runtime.dom_host().is_html_element_named(handle, "label")
+ let target = if runtime.dom_host().is_html_element_named(handle, "label")
&& !label_receives_programmatic_focus(runtime, handle)
{
- if let Some(control) = label_control_handle(runtime, handle)
- && is_focusable(runtime, control)
- {
- focus_target(scope, runtime_ptr, control, prevent_scroll)?;
- }
- return Ok(());
- }
- if let Some(shadow_root) = runtime.dom_host().shadow_root_handle(handle)
+ label_control_handle(runtime, handle)
+ .filter(|control| is_focusable_with_geometry(runtime, *control, geometry))
+ } else if let Some(shadow_root) = runtime.dom_host().shadow_root_handle(handle)
&& runtime.dom_host().shadow_root_delegates_focus(shadow_root) == Some(true)
{
- if let Some(target) = delegated_focus_target(runtime, handle) {
- focus_target(scope, runtime_ptr, target, prevent_scroll)?;
+ delegated_focus_target_with_geometry(runtime, handle, geometry)
+ } else {
+ is_focusable_with_geometry(runtime, handle, geometry).then_some(handle)
+ };
+ if let Some(target) = target {
+ update_focus(scope, runtime_ptr, Some(target));
+ if !prevent_scroll {
+ scroll_node_into_view_if_needed(scope, runtime_ptr, target, None, geometry)?;
}
- return Ok(());
- }
- if is_focusable(runtime, handle) {
- focus_target(scope, runtime_ptr, handle, prevent_scroll)?;
}
Ok(())
}
@@ -1341,19 +1370,6 @@ pub(crate) fn focus_live_element_for_inspector(
RendererDomFocusOutcome::Focused
}
-fn focus_target(
- scope: &mut v8::PinScope<'_, '_>,
- runtime_ptr: *mut JsContextHost,
- handle: DomHandle,
- prevent_scroll: bool,
-) -> Result<(), moli_layout::LayoutError> {
- update_focus(scope, runtime_ptr, Some(handle));
- if !prevent_scroll {
- let _ = scroll_node_into_view_if_needed(scope, runtime_ptr, handle, None)?;
- }
- Ok(())
-}
-
fn focus_options_prevent_scroll(
scope: &mut v8::PinScope<'_, '_>,
args: &v8::FunctionCallbackArguments<'_>,
@@ -1387,7 +1403,13 @@ pub(in crate::native_bridge) fn node_focus_callback<'s>(
let Some(prevent_scroll) = focus_options_prevent_scroll(scope, &args) else {
return;
};
- if let Err(error) = focus_element_with_options(scope, runtime_ptr, handle, prevent_scroll) {
+ if let Err(error) = focus_element_with_options(
+ scope,
+ runtime_ptr,
+ handle,
+ prevent_scroll,
+ moli_layout::LayoutFlushReason::SynchronousGeometry.into(),
+ ) {
throw_focus_layout_error(scope, error);
}
rv.set_undefined();
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry.rs b/moli-renderer-v8/src/native_bridge/element/geometry.rs
index e402bb858..d7ddbf586 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry.rs
@@ -11,8 +11,8 @@ pub use client_rect::ClientRect;
#[cfg(test)]
pub(crate) use hit_test::observable_scrollbar_hit_test;
pub(crate) use hit_test::{
- observable_deep_hit_test, observable_hit_test, observable_input_hit_test,
- observable_input_surface_hit_test,
+ InputSurfaceHit, observable_deep_hit_test, observable_hit_test, observable_input_hit_test,
+ snapshot_input_surface_hit_test,
};
pub(in crate::native_bridge) use metrics::{
node_client_height_getter_function, node_client_left_getter_function,
@@ -30,10 +30,11 @@ pub(crate) use mock::{
compute_mock_intersection_scrollport_client_rect,
};
pub(crate) use provider::{
- observable_bounding_client_rect, observable_bounding_client_rects, observable_caret_position,
- observable_client_rects, observable_element_metrics, observable_event_offset,
- observable_geometry_batch, observable_hit_test_all, observable_scroll_adjusted_client_rect,
- observable_sources_with_fragments, observable_used_grid_tracks,
+ GeometryRead, observable_bounding_client_rects, observable_caret_position,
+ observable_event_offset, observable_geometry_batch, observable_hit_test_all,
+ observable_scroll_adjusted_client_rect, observable_sources_with_fragments,
+ observable_used_grid_tracks, read_bounding_client_rect, read_client_rects,
+ read_element_metrics,
};
pub(in crate::native_bridge) use rects::{
node_get_bounding_client_rect_callback, node_get_client_rects_callback,
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs b/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs
index 67a89e31c..930e9e661 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/hit_test.rs
@@ -103,6 +103,28 @@ pub(crate) fn observable_input_surface_hit_test(
point: LayoutPoint,
ignore_pointer_events_none: bool,
include_scrollbars: bool,
+) -> Result<InputSurfaceHit, LayoutError> {
+ if runtime.layout_policy().uses_real_layout() {
+ let viewport = runtime.layout_viewport_for_document(document);
+ runtime.ensure_layout_at_viewport(document, LayoutFlushReason::HitTest, viewport)?;
+ }
+ snapshot_input_surface_hit_test(
+ runtime,
+ document,
+ point,
+ ignore_pointer_events_none,
+ include_scrollbars,
+ )
+}
+
+/// Coordinate input must not create or refresh geometry, including embedded
+/// frame geometry. Live DOM checks only reject sources that no longer exist.
+pub(crate) fn snapshot_input_surface_hit_test(
+ runtime: &JsContextHost,
+ document: DomHandle,
+ point: LayoutPoint,
+ ignore_pointer_events_none: bool,
+ include_scrollbars: bool,
) -> Result<InputSurfaceHit, LayoutError> {
if !runtime.layout_policy().uses_real_layout() {
return input_hit_test_via_documents(runtime, document, point, ignore_pointer_events_none)
@@ -111,11 +133,16 @@ pub(crate) fn observable_input_surface_hit_test(
control: None,
});
}
-
- let viewport = runtime.layout_viewport_for_document(document);
- runtime.ensure_layout_at_viewport(document, LayoutFlushReason::HitTest, viewport)?;
runtime
.with_latest_layout_tree_for_document(document, |tree| {
+ if runtime
+ .dom_host()
+ .dom()
+ .document_element_handle_for_document(document)
+ != Some(tree.source_root())
+ {
+ return Err(LayoutError::NoLayoutSnapshot);
+ }
input_surface_hit_test_in_tree(
runtime,
tree,
@@ -126,7 +153,7 @@ pub(crate) fn observable_input_surface_hit_test(
0,
)
})
- .ok_or(LayoutError::NoLayoutRoot)
+ .ok_or(LayoutError::NoLayoutSnapshot)?
}
pub(crate) fn observable_deep_hit_test(
@@ -194,7 +221,7 @@ fn input_surface_hit_test_in_tree(
ignore_pointer_events_none: bool,
include_scrollbars: bool,
depth: usize,
-) -> InputSurfaceHit {
+) -> Result<InputSurfaceHit, LayoutError> {
let live_dom_hit = if include_scrollbars {
let mut live_dom_hit = None;
for surface in tree.painted_surface_hits(point, ignore_pointer_events_none) {
@@ -210,10 +237,10 @@ fn input_surface_hit_test_in_tree(
hit.viewport_to_local.concatenate(root_to_frame);
}
}
- return InputSurfaceHit {
+ return Ok(InputSurfaceHit {
input: None,
control: Some(control),
- };
+ });
}
LayoutPaintedSurfaceHit::Dom(layout_hit) => {
let Some(target) = element_for_hit_source(runtime, layout_hit.source) else {
@@ -231,44 +258,46 @@ fn input_surface_hit_test_in_tree(
live_hit_in_tree(runtime, tree, point, ignore_pointer_events_none)
};
let Some((layout_hit, target)) = live_dom_hit else {
- return InputSurfaceHit::default();
+ return Ok(InputSurfaceHit::default());
};
let target_hit = InputHit {
handle: target,
root_to_frame,
};
if depth >= CHILD_FRAME_DEPTH_LIMIT {
- return InputSurfaceHit {
+ return Ok(InputSurfaceHit {
input: Some(target_hit),
control: None,
- };
+ });
}
- let Some(child_tree) = tree.embedded_frame_tree(target) else {
- return InputSurfaceHit {
+ let Some(child_document) = runtime.child_browsing_context_document_handle(target) else {
+ return Ok(InputSurfaceHit {
input: Some(target_hit),
control: None,
- };
+ });
};
- if runtime
- .child_browsing_context_document_handle(target)
- .is_none()
- {
- return InputSurfaceHit {
- input: Some(target_hit),
- control: None,
- };
- }
let Some(content_box) = layout_hit.local_content_box else {
- return InputSurfaceHit {
+ return Ok(InputSurfaceHit {
input: Some(target_hit),
control: None,
- };
+ });
};
if !content_box.contains(layout_hit.local_point) {
- return InputSurfaceHit {
+ return Ok(InputSurfaceHit {
input: Some(target_hit),
control: None,
- };
+ });
+ }
+ let child_tree = tree
+ .embedded_frame_tree(target)
+ .ok_or(LayoutError::NoLayoutSnapshot)?;
+ if runtime
+ .dom_host()
+ .dom()
+ .document_element_handle_for_document(child_document)
+ != Some(child_tree.source_root())
+ {
+ return Err(LayoutError::NoLayoutSnapshot);
}
let frame_to_child = LayoutTransform2D::translation(-content_box.x, -content_box.y)
.concatenate(layout_hit.viewport_to_local);
@@ -280,14 +309,14 @@ fn input_surface_hit_test_in_tree(
ignore_pointer_events_none,
include_scrollbars,
depth + 1,
- );
+ )?;
if child_hit.input.is_some() || child_hit.control.is_some() {
- child_hit
+ Ok(child_hit)
} else {
- InputSurfaceHit {
+ Ok(InputSurfaceHit {
input: Some(target_hit),
control: None,
- }
+ })
}
}
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rs b/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rs
index 72ac2560d..b8024716c 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/metrics.rs
@@ -9,7 +9,7 @@ use super::super::styles::raw_inline_style_property_value;
use super::super::{queue_revealed_lazy_image_loads, queue_revealed_lazy_media_loads};
use super::client_rect::ClientRect;
use super::mock::compute_mock_client_rect;
-use super::provider::observable_element_metrics;
+use super::provider::read_element_metrics;
use super::scroll::{
apply_observable_window_scroll, node_scroll_position, queue_scroll_observable_effects,
set_node_scroll_position,
@@ -24,7 +24,7 @@ fn node_scroll_position_value<'s>(
horizontal: bool,
) -> Result<f64, moli_layout::LayoutError> {
if let Ok((runtime_ptr, handle)) = node_runtime_and_handle_from_object(scope, object) {
- let metrics = observable_element_metrics(
+ let metrics = read_element_metrics(
unsafe { &*runtime_ptr },
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
@@ -63,7 +63,7 @@ fn node_scroll_position_setter_for_object<'s>(
}
let runtime = unsafe { &mut *runtime_ptr };
let (minimum, maximum) = if runtime.layout_policy().uses_real_layout() {
- observable_element_metrics(
+ read_element_metrics(
runtime,
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
@@ -231,7 +231,7 @@ fn scroll_node_to<'s>(
} else {
parse_scroll_coordinates(scope, &args, current_left, current_top)
};
- let metrics = observable_element_metrics(
+ let metrics = read_element_metrics(
unsafe { &*runtime_ptr },
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
@@ -273,7 +273,7 @@ fn node_box_metric_from_object<'s>(
metric: &str,
) -> Result<i32, moli_layout::LayoutError> {
if let Ok((runtime_ptr, handle)) = node_runtime_and_handle_from_object(scope, object) {
- let metrics = observable_element_metrics(
+ let metrics = read_element_metrics(
unsafe { &*runtime_ptr },
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
@@ -562,7 +562,7 @@ pub(in crate::native_bridge) fn node_offset_parent_getter_function<'s>(
return;
};
let runtime = unsafe { &mut *runtime_ptr };
- let metrics = match observable_element_metrics(
+ let metrics = match read_element_metrics(
runtime,
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
@@ -607,7 +607,13 @@ pub(in crate::native_bridge) fn node_scroll_into_view_if_needed_callback(
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
if let Ok((runtime_ptr, handle)) = node_runtime_and_handle_from_object(scope, args.this())
- && let Err(error) = scroll_node_into_view_if_needed(scope, runtime_ptr, handle, None)
+ && let Err(error) = scroll_node_into_view_if_needed(
+ scope,
+ runtime_ptr,
+ handle,
+ None,
+ moli_layout::LayoutFlushReason::SynchronousGeometry.into(),
+ )
{
throw_scroll_layout_error(scope, "scrollIntoViewIfNeeded", error);
}
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
index 41fe6d1d1..7369f722c 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/provider.rs
@@ -12,6 +12,67 @@ use super::mock::{
};
use crate::{document_runtime::DomHandle, native_bridge::JsContextHost};
+/// Native input reads the rendered snapshot; explicit geometry APIs may
+/// prepare layout. Both paths share the query and result conversion below.
+#[derive(Clone, Copy)]
+pub(crate) enum GeometryRead {
+ Demand(LayoutFlushReason),
+ Snapshot,
+}
+
+impl From<LayoutFlushReason> for GeometryRead {
+ fn from(reason: LayoutFlushReason) -> Self {
+ Self::Demand(reason)
+ }
+}
+
+impl GeometryRead {
+ pub(crate) fn for_default_action(runtime: &JsContextHost) -> Self {
+ if runtime
+ .current_input_event()
+ .is_some_and(|event| event.is_mouse())
+ {
+ Self::Snapshot
+ } else {
+ Self::Demand(LayoutFlushReason::SynchronousGeometry)
+ }
+ }
+}
+
+fn query_source(
+ runtime: &JsContextHost,
+ source: DomHandle,
+ read: impl Into<GeometryRead>,
+ query: LayoutQuery<DomHandle>,
+) -> Result<Option<LayoutQueryAnswer<DomHandle>>, LayoutError> {
+ if !runtime.dom_host().is_connected(source) {
+ return Ok(None);
+ }
+ let Some(document) = runtime.layout_document_for_source(source) else {
+ return Ok(None);
+ };
+ let reason = match read.into() {
+ GeometryRead::Snapshot if runtime.layout_policy().uses_real_layout() => {
+ return Ok(runtime
+ .with_latest_layout_tree_for_document(document, |tree| tree.answer_query(&query)));
+ }
+ GeometryRead::Snapshot => LayoutFlushReason::SynchronousGeometry,
+ GeometryRead::Demand(reason) => reason,
+ };
+ let answers = observable_geometry_batch(
+ runtime,
+ document,
+ reason,
+ &LayoutQueryBatch::new(vec![query]),
+ )?;
+ answers
+ .answers
+ .into_iter()
+ .next()
+ .map(Some)
+ .ok_or_else(|| provider_contract_error("source geometry"))
+}
+
pub(crate) fn observable_geometry_batch(
runtime: &JsContextHost,
document: DomHandle,
@@ -25,27 +86,16 @@ pub(crate) fn observable_geometry_batch(
}
}
-pub(crate) fn observable_client_rects(
+pub(crate) fn read_client_rects(
runtime: &JsContextHost,
source: DomHandle,
- reason: LayoutFlushReason,
+ reason: impl Into<GeometryRead>,
) -> Result<Vec<ClientRect>, LayoutError> {
- if !runtime.dom_host().is_connected(source) {
- return Ok(Vec::new());
- }
- let Some(document) = runtime.layout_document_for_source(source) else {
- return Ok(Vec::new());
- };
- let answers = observable_geometry_batch(
- runtime,
- document,
- reason,
- &LayoutQueryBatch::new(vec![LayoutQuery::ClientRects { source }]),
- )?;
- match answers.answers.into_iter().next() {
+ match query_source(runtime, source, reason, LayoutQuery::ClientRects { source })? {
Some(LayoutQueryAnswer::ClientRects(rects)) => {
Ok(rects.into_iter().map(client_rect_from_quad).collect())
}
+ None => Ok(Vec::new()),
_ => Err(provider_contract_error("client rects")),
}
}
@@ -83,12 +133,12 @@ pub(crate) fn observable_sources_with_fragments(
Ok(rendered)
}
-pub(crate) fn observable_bounding_client_rect(
+pub(crate) fn read_bounding_client_rect(
runtime: &JsContextHost,
source: DomHandle,
- reason: LayoutFlushReason,
+ reason: impl Into<GeometryRead>,
) -> Result<ClientRect, LayoutError> {
- let mut rects = observable_client_rects(runtime, source, reason)?.into_iter();
+ let mut rects = read_client_rects(runtime, source, reason)?.into_iter();
let Some(mut bounds) = rects.next() else {
return Ok(zero_client_rect());
};
@@ -145,25 +195,14 @@ pub(crate) fn observable_bounding_client_rects(
.collect()
}
-pub(crate) fn observable_box_model(
+pub(crate) fn read_box_model(
runtime: &JsContextHost,
source: DomHandle,
- reason: LayoutFlushReason,
+ reason: impl Into<GeometryRead>,
) -> Result<Option<LayoutBoxModel>, LayoutError> {
- if !runtime.dom_host().is_connected(source) {
- return Ok(None);
- }
- let Some(document) = runtime.layout_document_for_source(source) else {
- return Ok(None);
- };
- let answers = observable_geometry_batch(
- runtime,
- document,
- reason,
- &LayoutQueryBatch::new(vec![LayoutQuery::BoxModel { source }]),
- )?;
- match answers.answers.into_iter().next() {
+ match query_source(runtime, source, reason, LayoutQuery::BoxModel { source })? {
Some(LayoutQueryAnswer::BoxModel(model)) => Ok(model),
+ None => Ok(None),
_ => Err(provider_contract_error("box model")),
}
}
@@ -179,7 +218,7 @@ pub(crate) fn observable_scroll_adjusted_client_rect(
reason: LayoutFlushReason,
) -> Result<ClientRect, LayoutError> {
if runtime.layout_policy().uses_real_layout() {
- observable_bounding_client_rect(runtime, source, reason)
+ read_bounding_client_rect(runtime, source, reason)
} else {
Ok(compute_mock_scroll_adjusted_client_rect(
runtime, source, scroll_x, scroll_y,
@@ -193,43 +232,31 @@ pub(crate) fn observable_event_offset(
point: LayoutPoint,
reason: LayoutFlushReason,
) -> Result<LayoutPoint, LayoutError> {
- if !runtime.dom_host().is_connected(source) {
- return Ok(point);
- }
- let Some(document) = runtime.layout_document_for_source(source) else {
- return Ok(point);
- };
- let answers = observable_geometry_batch(
+ match query_source(
runtime,
- document,
+ source,
reason,
- &LayoutQueryBatch::new(vec![LayoutQuery::EventOffset { source, point }]),
- )?;
- match answers.answers.into_iter().next() {
+ LayoutQuery::EventOffset { source, point },
+ )? {
Some(LayoutQueryAnswer::EventOffset(offset)) => Ok(offset.unwrap_or(point)),
+ None => Ok(point),
_ => Err(provider_contract_error("event offset")),
}
}
-pub(crate) fn observable_element_metrics(
+pub(crate) fn read_element_metrics(
runtime: &JsContextHost,
source: DomHandle,
- reason: LayoutFlushReason,
+ reason: impl Into<GeometryRead>,
) -> Result<Option<LayoutElementMetrics<DomHandle>>, LayoutError> {
- if !runtime.dom_host().is_connected(source) {
- return Ok(None);
- }
- let Some(document) = runtime.layout_document_for_source(source) else {
- return Ok(None);
- };
- let answers = observable_geometry_batch(
+ match query_source(
runtime,
- document,
+ source,
reason,
- &LayoutQueryBatch::new(vec![LayoutQuery::ElementMetrics { source }]),
- )?;
- match answers.answers.into_iter().next() {
+ LayoutQuery::ElementMetrics { source },
+ )? {
Some(LayoutQueryAnswer::ElementMetrics(metrics)) => Ok(metrics),
+ None => Ok(None),
_ => Err(provider_contract_error("element metrics")),
}
}
@@ -239,43 +266,31 @@ pub(crate) fn observable_used_grid_tracks(
source: DomHandle,
reason: LayoutFlushReason,
) -> Result<Option<LayoutResolvedGridTracks>, LayoutError> {
- if !runtime.dom_host().is_connected(source) {
- return Ok(None);
- }
- let Some(document) = runtime.layout_document_for_source(source) else {
- return Ok(None);
- };
- let answers = observable_geometry_batch(
+ match query_source(
runtime,
- document,
+ source,
reason,
- &LayoutQueryBatch::new(vec![LayoutQuery::UsedGridTracks { source }]),
- )?;
- match answers.answers.into_iter().next() {
+ LayoutQuery::UsedGridTracks { source },
+ )? {
Some(LayoutQueryAnswer::UsedGridTracks(tracks)) => Ok(tracks),
+ None => Ok(None),
_ => Err(provider_contract_error("used Grid tracks")),
}
}
-pub(crate) fn observable_scroll_into_view_geometry(
+pub(crate) fn read_scroll_into_view_geometry(
runtime: &JsContextHost,
source: DomHandle,
- reason: LayoutFlushReason,
+ reason: impl Into<GeometryRead>,
) -> Result<Option<LayoutScrollIntoViewGeometry<DomHandle>>, LayoutError> {
- if !runtime.dom_host().is_connected(source) {
- return Ok(None);
- }
- let Some(document) = runtime.layout_document_for_source(source) else {
- return Ok(None);
- };
- let answers = observable_geometry_batch(
+ match query_source(
runtime,
- document,
+ source,
reason,
- &LayoutQueryBatch::new(vec![LayoutQuery::ScrollIntoViewGeometry { source }]),
- )?;
- match answers.answers.into_iter().next() {
+ LayoutQuery::ScrollIntoViewGeometry { source },
+ )? {
Some(LayoutQueryAnswer::ScrollIntoViewGeometry(geometry)) => Ok(geometry),
+ None => Ok(None),
_ => Err(provider_contract_error("scroll-into-view geometry")),
}
}
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/rects.rs b/moli-renderer-v8/src/native_bridge/element/geometry/rects.rs
index 16c8c4a62..c4b3fca21 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/rects.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/rects.rs
@@ -2,7 +2,7 @@ use super::super::super::node::{
node_runtime_and_handle_from_args_or_detached, require_element_method_receiver,
throw_incompatible_method_receiver,
};
-use super::{ClientRect, observable_bounding_client_rect, observable_client_rects};
+use super::{ClientRect, read_bounding_client_rect, read_client_rects};
use crate::context_bootstrap::build_dom_rect_object;
use crate::util::{serialize_v8_array, v8_string};
@@ -57,7 +57,7 @@ pub(in crate::native_bridge) fn node_get_bounding_client_rect_callback(
) {
return;
};
- let rect = match observable_bounding_client_rect(
+ let rect = match read_bounding_client_rect(
unsafe { &*runtime_ptr },
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
@@ -89,7 +89,7 @@ pub(in crate::native_bridge) fn node_get_client_rects_callback(
if !require_element_method_receiver(scope, unsafe { &*runtime_ptr }, handle, "getClientRects") {
return;
};
- let rects = match observable_client_rects(
+ let rects = match read_client_rects(
unsafe { &*runtime_ptr },
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs b/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs
index 0815889d1..49a74eb5e 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/scroll.rs
@@ -1,7 +1,7 @@
use crate::{document_runtime::DomHandle, dom::native::Node, native_bridge::JsContextHost};
use super::super::{queue_revealed_lazy_image_loads, queue_revealed_lazy_media_loads};
-use super::provider::{observable_element_metrics, observable_scroll_into_view_geometry};
+use super::provider::{GeometryRead, read_element_metrics, read_scroll_into_view_geometry};
pub(super) fn node_scroll_position(runtime: &JsContextHost, handle: DomHandle) -> (f64, f64) {
runtime
@@ -151,8 +151,8 @@ pub(crate) fn apply_scroll_observable_effects(
}
// Native lazy loading deliberately combines the retained pre-scroll
// projection with live element offsets, so admit those requests before
- // retiring the sampled projection. Observable geometry and author
- // IntersectionObservers, on the other hand, must see a fresh projection.
+ // invalidating it for subsequent geometry demands. Coordinate input
+ // retains this projection until such a demand publishes a replacement.
for effects in &effects {
if let Some(document) = effects.document() {
queue_revealed_lazy_image_loads(scope, runtime_ptr, document);
@@ -205,11 +205,8 @@ pub(crate) fn perform_wheel_scroll_default_action(
let Some(target) = resolve_scroll_target(runtime, handle) else {
return Ok(false);
};
- let Some(mut geometry) = observable_scroll_into_view_geometry(
- runtime,
- target,
- moli_layout::LayoutFlushReason::SynchronousGeometry,
- )?
+ let Some(mut geometry) =
+ read_scroll_into_view_geometry(runtime, target, GeometryRead::Snapshot)?
else {
return Ok(false);
};
@@ -217,11 +214,8 @@ pub(crate) fn perform_wheel_scroll_default_action(
// ScrollIntoView geometry begins at the target's parent. Include the
// target itself so an empty overflow scroller still responds when its own
// background is the hit-test result.
- if let Some(metrics) = observable_element_metrics(
- runtime,
- target,
- moli_layout::LayoutFlushReason::SynchronousGeometry,
- )? && metrics.is_scroll_container
+ if let Some(metrics) = read_element_metrics(runtime, target, GeometryRead::Snapshot)?
+ && metrics.is_scroll_container
&& geometry
.scroll_containers
.iter()
diff --git a/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rs b/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rs
index 54573c67e..528075ece 100644
--- a/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rs
+++ b/moli-renderer-v8/src/native_bridge/element/geometry/scroll_into_view.rs
@@ -2,7 +2,7 @@ use moli_page_types::DomScrollIntoViewRect;
use crate::{document_runtime::DomHandle, native_bridge::JsContextHost};
-use super::provider::{observable_box_model, observable_scroll_into_view_geometry};
+use super::provider::{GeometryRead, read_box_model, read_scroll_into_view_geometry};
use super::scroll::{
apply_observable_window_scroll, resolve_scroll_target, set_node_scroll_position,
};
@@ -19,6 +19,7 @@ pub(super) enum ScrollIntoViewAlignment {
#[derive(Clone, Copy)]
struct ScrollIntoViewParams {
+ geometry_read: GeometryRead,
horizontal: ScrollIntoViewAlignment,
vertical: ScrollIntoViewAlignment,
center_if_fully_hidden: bool,
@@ -72,6 +73,7 @@ pub(crate) fn scroll_node_into_view_if_needed(
runtime_ptr: *mut JsContextHost,
handle: DomHandle,
relative_rect: Option<DomScrollIntoViewRect>,
+ geometry_read: GeometryRead,
) -> Result<Option<bool>, moli_layout::LayoutError> {
scroll_node_into_view_with_params(
scope,
@@ -79,6 +81,7 @@ pub(crate) fn scroll_node_into_view_if_needed(
handle,
relative_rect,
ScrollIntoViewParams {
+ geometry_read,
horizontal: ScrollIntoViewAlignment::Nearest,
vertical: ScrollIntoViewAlignment::Nearest,
center_if_fully_hidden: true,
@@ -100,6 +103,7 @@ pub(super) fn scroll_node_into_view(
handle,
relative_rect,
ScrollIntoViewParams {
+ geometry_read: moli_layout::LayoutFlushReason::SynchronousGeometry.into(),
horizontal,
vertical,
center_if_fully_hidden: false,
@@ -118,11 +122,7 @@ fn scroll_node_into_view_with_params(
let Some(target) = resolve_scroll_target(runtime, handle) else {
return Ok(None);
};
- let Some(mut geometry) = observable_scroll_into_view_geometry(
- runtime,
- target,
- moli_layout::LayoutFlushReason::SynchronousGeometry,
- )?
+ let Some(mut geometry) = read_scroll_into_view_geometry(runtime, target, params.geometry_read)?
else {
return Ok(None);
};
@@ -157,6 +157,7 @@ pub(crate) fn scroll_node_into_view_at_center(
handle,
None,
ScrollIntoViewParams {
+ geometry_read: moli_layout::LayoutFlushReason::SynchronousGeometry.into(),
horizontal: ScrollIntoViewAlignment::Center,
vertical: ScrollIntoViewAlignment::Center,
center_if_fully_hidden: false,
@@ -175,6 +176,7 @@ pub(crate) fn scroll_node_into_view_at_start(
handle,
None,
ScrollIntoViewParams {
+ geometry_read: GeometryRead::for_default_action(unsafe { &*runtime_ptr }),
horizontal: ScrollIntoViewAlignment::Nearest,
vertical: ScrollIntoViewAlignment::Start,
center_if_fully_hidden: false,
@@ -300,12 +302,9 @@ fn perform_bubbling_scroll_into_view(
let Some(frame) = runtime.child_browsing_context_host_for_document_handle(document) else {
return Ok(changed);
};
- let Some(frame_content) = observable_box_model(
- runtime,
- frame,
- moli_layout::LayoutFlushReason::SynchronousGeometry,
- )?
- .map(|model| model.content) else {
+ let Some(frame_content) =
+ read_box_model(runtime, frame, params.geometry_read)?.map(|model| model.content)
+ else {
return Ok(changed);
};
let Some(parent_target_rects) = convert_quads_to_parent_frame(
@@ -315,11 +314,8 @@ fn perform_bubbling_scroll_into_view(
) else {
return Ok(changed);
};
- let Some(mut parent_geometry) = observable_scroll_into_view_geometry(
- runtime,
- frame,
- moli_layout::LayoutFlushReason::SynchronousGeometry,
- )?
+ let Some(mut parent_geometry) =
+ read_scroll_into_view_geometry(runtime, frame, params.geometry_read)?
else {
return Ok(changed);
};
diff --git a/moli-renderer-v8/src/native_bridge/element/images/geometry.rs b/moli-renderer-v8/src/native_bridge/element/images/geometry.rs
index 0e54afbbc..9598d68cf 100644
--- a/moli-renderer-v8/src/native_bridge/element/images/geometry.rs
+++ b/moli-renderer-v8/src/native_bridge/element/images/geometry.rs
@@ -1,4 +1,4 @@
-use super::super::{geometry::observable_element_metrics, html_element_getter_receiver};
+use super::super::{geometry::read_element_metrics, html_element_getter_receiver};
#[derive(Clone, Copy)]
enum ImageCoordinateAxis {
@@ -34,7 +34,7 @@ fn image_root_coordinate<'s>(
};
let runtime = unsafe { &*runtime_ptr };
- let origin = observable_element_metrics(
+ let origin = read_element_metrics(
runtime,
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
diff --git a/moli-renderer-v8/src/native_bridge/element/media/attributes.rs b/moli-renderer-v8/src/native_bridge/element/media/attributes.rs
index 3e22fb2ce..b71c4f0a9 100644
--- a/moli-renderer-v8/src/native_bridge/element/media/attributes.rs
+++ b/moli-renderer-v8/src/native_bridge/element/media/attributes.rs
@@ -1,4 +1,4 @@
-use super::super::geometry::observable_bounding_client_rect;
+use super::super::geometry::read_bounding_client_rect;
use super::super::{
canonical_cross_origin_value, canonical_loading_value, canonical_preload_value,
construct_simple_event, dispatch_public_event, element_attribute, element_has_attribute,
@@ -424,7 +424,7 @@ fn media_is_inside_initial_viewport(
runtime: &JsContextHost,
handle: crate::document_runtime::DomHandle,
) -> bool {
- let Ok(rect) = observable_bounding_client_rect(
+ let Ok(rect) = read_bounding_client_rect(
runtime,
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
diff --git a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rs b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rs
index 8d50fd4b0..47939953e 100644
--- a/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rs
+++ b/moli-renderer-v8/src/native_bridge/element/styles/declaration/values.rs
@@ -12,8 +12,8 @@ use crate::{
},
document_runtime::DomHandle,
native_bridge::element::geometry::{
- ClientRect, observable_bounding_client_rect, observable_bounding_client_rects,
- observable_used_grid_tracks,
+ ClientRect, observable_bounding_client_rects, observable_used_grid_tracks,
+ read_bounding_client_rect,
},
style_engine::{
ComputedDisplayKind, ComputedRenderedStyleFacts, FullStyleWorldSnapshot, StyleViewport,
@@ -6206,7 +6206,7 @@ fn runtime_static_position_offset(
}
fn computed_style_geometry_rect(runtime: &JsContextHost, handle: DomHandle) -> Option<ClientRect> {
- observable_bounding_client_rect(
+ read_bounding_client_rect(
runtime,
handle,
moli_layout::LayoutFlushReason::SynchronousGeometry,
diff --git a/moli-renderer-v8/src/runtime/page_vm/page_action_window.rs b/moli-renderer-v8/src/runtime/page_vm/page_action_window.rs
index dbb1b2051..547d7babc 100644
--- a/moli-renderer-v8/src/runtime/page_vm/page_action_window.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/page_action_window.rs
@@ -73,6 +73,7 @@ impl PageVm {
if let Some(batch) = self.page_action_window.window.take_due(admitted_at) {
self.apply_page_action_batch(batch)?;
}
+ self.vm().mouse_input_surface_hit(x, y, "wheel")?;
let scope = self.document_lifecycle.identity();
let admission = self.page_action_window.window.push(
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rs b/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rs
index d99e6079b..d9624645c 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/lifecycle.rs
@@ -63,6 +63,7 @@ async fn history_keeps_action_window_but_document_open_cancels_it() {
local_executor
.run(async move {
let mut page_vm = page_vm;
+ page_vm.vm_mut().eval("const root=document.documentElement || document.appendChild(document.createElement('html')); root.getBoundingClientRect()")?;
let initial_document = page_vm.document_lifecycle.identity();
let outcome = page_vm.queue_wheel_event(
10.0,
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
index 0298a7d02..7fb68ce1d 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
@@ -10237,6 +10237,8 @@ async fn page_vm_input_event_commits_child_navigation_before_document_script_rea
"#,
)?;
+ page_vm.vm_mut().eval("document.elementFromPoint(0, 0)")?;
+
let mouse_down_handled = page_vm
.vm_mut()
.dispatch_mouse_event_at_point(10.0, 10.0, "mousedown", 0, None, 0.0, 0.0)?
diff --git a/moli-renderer-v8/src/runtime/tests.rs b/moli-renderer-v8/src/runtime/tests.rs
index e3688d909..eb53822d8 100644
--- a/moli-renderer-v8/src/runtime/tests.rs
+++ b/moli-renderer-v8/src/runtime/tests.rs
@@ -1325,6 +1325,13 @@ async fn mouse_input_completion_preserves_standalone_and_child_navigation_scope(
Some(serde_json::json!("target")),
"{case}"
);
+ page.run_async_command(RendererPageCommand::EvaluateExpression {
+ expression: "document.elementFromPoint(0, 0); true".to_owned(),
+ await_promise: false,
+ })
+ .await
+ .expect("publish root geometry before mouse input");
+
output_rx.drain();
let (reply, _) = page
.run_async_command(RendererPageCommand::DispatchMouseEventAtPoint {
@@ -12464,6 +12471,13 @@ addEventListener("wheel", event => {
.await
.expect("capture barrier viewport should update");
+ page.run_async_command(RendererPageCommand::EvaluateExpression {
+ expression: "document.elementFromPoint(0, 0); true".to_owned(),
+ await_promise: false,
+ })
+ .await
+ .expect("publish root geometry before mouse input");
+
assert!(
dispatch_wheel_for_action_window_test(&page, 10.0)
.await
@@ -12544,6 +12558,13 @@ document.addEventListener("wheel", event => {
)
.await;
+ page.run_async_command(RendererPageCommand::EvaluateExpression {
+ expression: "document.elementFromPoint(0, 0); true".to_owned(),
+ await_promise: false,
+ })
+ .await
+ .expect("publish root geometry before mouse input");
+
for delta_y in [10.0, 20.0, 30.0] {
assert!(
dispatch_wheel_for_action_window_test(&page, delta_y)
diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rs
index c9e84bf54..dc8befa0f 100644
--- a/moli-renderer-v8/src/script_vm.rs
+++ b/moli-renderer-v8/src/script_vm.rs
@@ -4495,6 +4495,7 @@ impl ScriptVm {
runtime_ptr,
handle,
rect,
+ moli_layout::LayoutFlushReason::SynchronousGeometry.into(),
)? {
Some(_) => RendererScrollIntoViewResult::ScrolledOrAlreadyVisible,
None => RendererScrollIntoViewResult::NodeDoesNotHaveLayoutObject,
diff --git a/moli-renderer-v8/src/script_vm/element_click.rs b/moli-renderer-v8/src/script_vm/element_click.rs
index ba64c9ad7..a2767d982 100644
--- a/moli-renderer-v8/src/script_vm/element_click.rs
+++ b/moli-renderer-v8/src/script_vm/element_click.rs
@@ -2,7 +2,7 @@ use super::ScriptVm;
use super::input_helpers::clear_input_dispatch_state;
use crate::document_runtime::DomHandle;
use crate::dom::{forms::InputType, native::Node};
-use crate::native_bridge::element::{observable_client_rects, scroll_node_into_view_at_center};
+use crate::native_bridge::element::{read_client_rects, scroll_node_into_view_at_center};
use crate::runtime::{
RendererElementClickError as ClickError, RendererElementClickTarget as ClickTarget,
RendererInputDispatchOutcome, RendererPointerEventProperties, RendererPreparedPointerClick,
@@ -59,12 +59,11 @@ impl ScriptVm {
.dom_host()
.owner_document_handle(handle)
.ok_or(ClickError::StaleNode)?;
- let rect =
- observable_client_rects(&host, handle, LayoutFlushReason::SynchronousGeometry)
- .map_err(layout_error)?
- .into_iter()
- .next()
- .ok_or(ClickError::NoClickableRect)?;
+ let rect = read_client_rects(&host, handle, LayoutFlushReason::SynchronousGeometry)
+ .map_err(layout_error)?
+ .into_iter()
+ .next()
+ .ok_or(ClickError::NoClickableRect)?;
let viewport = host.layout_viewport_for_document(document);
let left = rect.left.max(0.0);
let top = rect.top.max(0.0);
diff --git a/moli-renderer-v8/src/script_vm/input_dispatch.rs b/moli-renderer-v8/src/script_vm/input_dispatch.rs
index 17ad5addb..2bfb0df1f 100644
--- a/moli-renderer-v8/src/script_vm/input_dispatch.rs
+++ b/moli-renderer-v8/src/script_vm/input_dispatch.rs
@@ -25,12 +25,12 @@ use crate::native_bridge::element::{
construct_pointer_event_with_related_target_and_modifiers, construct_simple_event,
construct_touch_event, construct_touch_event_with_points, construct_wheel_event,
contenteditable_editing_host, dispatch_public_event, is_text_control,
- observable_input_hit_test, observable_input_surface_hit_test,
- perform_auxiliary_link_default_action, perform_drop_default_action,
+ observable_input_hit_test, perform_auxiliary_link_default_action, perform_drop_default_action,
perform_implicit_submission_from_control, perform_mouse_focus_default_action,
perform_scrollbar_scroll_default_action, perform_wheel_scroll_default_action,
replace_contenteditable_selection, replace_text_control_selection,
- select_contenteditable_contents, text_control_set_selection_range_internal,
+ select_contenteditable_contents, snapshot_input_surface_hit_test,
+ text_control_set_selection_range_internal,
text_control_set_selection_range_with_direction_internal, text_control_value, update_focus,
};
use crate::native_bridge::{
@@ -378,6 +378,7 @@ impl ScriptVm {
pointer: RendererPointerEventProperties,
modifiers: u8,
) -> Result<RendererInputDispatchOutcome> {
+ let surface_hit = self.mouse_input_surface_hit(x, y, event_name)?;
let prepared = self.prepare_mouse_input_dispatch(event_name, button, buttons);
let _current_input_event = CurrentInputEventScope::enter(
Rc::clone(&self._context_host),
@@ -388,6 +389,7 @@ impl ScriptVm {
y,
event_name,
prepared,
+ surface_hit,
click_count,
delta_x,
delta_y,
@@ -447,6 +449,7 @@ impl ScriptVm {
pointer: RendererPointerEventProperties,
modifiers: u8,
) -> Result<RendererInputDispatchOutcome> {
+ let surface_hit = self.mouse_input_surface_hit(x, y, event_name)?;
let prepared = self.prepare_mouse_input_dispatch(event_name, button, buttons);
let _current_input_event = CurrentInputEventScope::enter(
Rc::clone(&self._context_host),
@@ -457,6 +460,7 @@ impl ScriptVm {
y,
event_name,
prepared,
+ surface_hit,
click_count,
delta_x,
delta_y,
@@ -465,6 +469,21 @@ impl ScriptVm {
)
}
+ pub(crate) fn mouse_input_surface_hit(
+ &self,
+ x: f64,
+ y: f64,
+ event_name: &str,
+ ) -> Result<crate::native_bridge::element::InputSurfaceHit> {
+ Ok(snapshot_input_surface_hit_test(
+ &self._context_host.borrow(),
+ self.document_runtime.document_handle(),
+ moli_layout::LayoutPoint::new(x as f32, y as f32),
+ false,
+ matches!(event_name, "mousedown" | "mouseup" | "mousemove"),
+ )?)
+ }
+
fn prepare_mouse_input_dispatch(
&mut self,
event_name: &str,
@@ -531,6 +550,7 @@ impl ScriptVm {
y: f64,
event_name: &str,
prepared: PreparedMouseInputDispatch,
+ surface_hit: crate::native_bridge::element::InputSurfaceHit,
click_count: i32,
delta_x: f64,
delta_y: f64,
@@ -550,13 +570,6 @@ impl ScriptVm {
}
let root_point = moli_layout::LayoutPoint::new(x as f32, y as f32);
- let surface_hit = observable_input_surface_hit_test(
- &self._context_host.borrow(),
- self.document_runtime.document_handle(),
- root_point,
- false,
- matches!(event_name, "mousedown" | "mouseup" | "mousemove"),
- )?;
if let Some(control) = surface_hit.control {
return match control {
moli_layout::LayoutControlSurfaceHit::Scrollbar(scrollbar) => {
@@ -1132,11 +1145,25 @@ impl ScriptVm {
fn dispatch_native_scrollbar_hit(
&mut self,
- hit: moli_layout::LayoutScrollbarHit<DomHandle>,
+ mut hit: moli_layout::LayoutScrollbarHit<DomHandle>,
event_name: &str,
button: i32,
) -> Result<RendererInputDispatchOutcome> {
if event_name == "mousedown" && button == 0 {
+ // Geometry and range come from the rendered snapshot. Apply each
+ // new scroll action to the live offset, even before the next paint.
+ if let Some(element) = self
+ ._context_host
+ .borrow()
+ .dom_host()
+ .node(hit.source)
+ .and_then(Node::as_element)
+ {
+ hit.scrollbar.current_offset = match hit.scrollbar.axis {
+ moli_layout::LayoutScrollbarAxis::Horizontal => element.scroll_left() as f32,
+ moli_layout::LayoutScrollbarAxis::Vertical => element.scroll_top() as f32,
+ };
+ }
match hit.part {
moli_layout::LayoutScrollbarPart::Thumb => {
self.active_scrollbar_drag = Some(ActiveScrollbarDrag {
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs
index fbfa2a4e2..c8d81766d 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface.rs
@@ -538,6 +538,9 @@ fn transformed_constrained_iframe_routes_hover_click_and_wheel_in_child_coordina
assert!((rect[2].as_f64().unwrap() - 719.94).abs() < 0.1);
assert!((rect[3].as_f64().unwrap() - 499.98).abs() < 0.1);
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish the composite snapshot before coordinate input");
+
// Child point (240, 90) is the visible center of #hover-target. The
// iframe's 0.78 transform maps it to root-frame point (287.2, 190.2).
vm.dispatch_mouse_event_at_point(287.2, 190.2, "mousemove", -1, Some(0), 0.0, 0.0)
@@ -654,30 +657,25 @@ fn iframe_input_reuses_one_top_level_snapshot_without_parent_child_ping_pong() {
"true"
);
let passes_before = vm.layout_pass_observability_for_test().1;
- vm.dispatch_mouse_event_at_point(140.0, 130.0, "mousemove", -1, Some(0), 0.0, 0.0)
- .expect("cold child hover should dispatch");
- let passes_after_cold = vm.layout_pass_observability_for_test().1;
- assert_eq!(
- passes_after_cold,
- passes_before + 1,
- "input must upgrade a geometry-only tree through one shared recursive layout demand"
- );
-
- // The first hover transition invalidates its sampled tree because :hover
- // may affect geometry. Rebuilding for the same target publishes one complete
- // top-level snapshot; a third move can then reuse it without a child publish
- // evicting the parent.
- vm.dispatch_mouse_event_at_point(140.0, 130.0, "mousemove", -1, Some(0), 0.0, 0.0)
- .expect("stable child hover should rebuild once");
- let passes_after_rebuild = vm.layout_pass_observability_for_test().1;
- assert_eq!(passes_after_rebuild, passes_after_cold + 1);
- vm.dispatch_mouse_event_at_point(140.0, 130.0, "mousemove", -1, Some(0), 0.0, 0.0)
- .expect("stable child hover should reuse the top-level snapshot");
- assert_eq!(
- vm.layout_pass_observability_for_test().1,
- passes_after_rebuild,
- "an embedded hit must leave the top-level composite snapshot reusable"
- );
+ let error = vm
+ .dispatch_mouse_event_at_point(140.0, 130.0, "mousedown", 0, Some(1), 0.0, 0.0)
+ .expect_err("input cannot build the missing iframe projection");
+ assert_eq!(
+ error.downcast_ref::<moli_layout::LayoutError>(),
+ Some(&moli_layout::LayoutError::NoLayoutSnapshot)
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, passes_before);
+ assert_eq!(vm.pressed_mouse_buttons, 0);
+ assert!(vm.pending_mouse_press.is_none());
+ vm.eval("document.elementFromPoint(140, 130)")
+ .expect("explicit deep geometry demand");
+ let prepared = vm.layout_pass_observability_for_test().1;
+ assert_eq!(prepared, passes_before + 1);
+ for _ in 0..3 {
+ vm.dispatch_mouse_event_at_point(140.0, 130.0, "mousemove", -1, Some(0), 0.0, 0.0)
+ .expect("child hover should consume the published composite snapshot");
+ assert_eq!(vm.layout_pass_observability_for_test().1, prepared);
+ }
let cached = vm
.layout_snapshot_cache_observability_for_test()
@@ -734,6 +732,8 @@ fn iframe_wheel_batch_reuses_one_composite_snapshot_for_every_scroll_step() {
)
.expect("iframe wheel snapshot fixture should initialize");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish the composite snapshot before wheel input");
let passes_before = vm.layout_pass_observability_for_test().1;
vm.begin_batched_mouse_event_dispatch();
for delta_y in [10.0, 20.0, 30.0] {
@@ -753,14 +753,14 @@ fn iframe_wheel_batch_reuses_one_composite_snapshot_for_every_scroll_step() {
}
assert_eq!(
vm.layout_pass_observability_for_test().1,
- passes_before + 1,
- "every wheel step must share the hit-test pass's recursively frozen snapshot"
+ passes_before,
+ "every wheel step must share the previously published snapshot"
);
vm.finish_batched_mouse_event_dispatch(Ok(()), true)
.expect("batched child wheel effects should commit");
assert_eq!(
vm.layout_pass_observability_for_test().1,
- passes_before + 1,
+ passes_before,
"committing derived effects must not perform another layout"
);
@@ -831,6 +831,9 @@ fn focusing_visible_child_target_does_not_scroll_partially_hidden_transformed_if
)
.expect("iframe focus fixture should initialize");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish the composite snapshot before coordinate input");
+
// Child point (60, 40), the button center, maps through scale(.78) to
// root-frame point (146.8, 431.2). The button is visible, while the frame
// continues below the 600px-high top viewport.
@@ -989,6 +992,9 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coord
"[220,160,90,70,50,40]"
);
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish the composite snapshot before coordinate input");
+
// Nested client point (20, 20) maps through scale(.5), the inner frame's
// 5px border+padding edge, scale(.75), the outer frame's 10px edge, and
// the scrolled parent to root point (136.875, 109.375).
@@ -1034,6 +1040,9 @@ fn nested_transformed_iframe_input_composes_scroll_border_padding_and_exit_coord
.expect("nested scrollbar result should evaluate"),
format!("[70,{events_before_scrollbar}]")
);
+ // The child scrollTop observation above published a child-only snapshot.
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish root geometry before leaving the child frame");
// Move to a top-document element. The outgoing events must still convert
// this new root point through the previous nested frame chain.
vm.dispatch_mouse_event_at_point(10.0, 10.0, "mousemove", -1, Some(0), 0.0, 0.0)
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs
index 805312e52..8b051f713 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/dom.rs
@@ -5069,6 +5069,9 @@ fn mouse_dragstart_bubbles_to_window_once() {
)
.expect("dragstart listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should dispatch");
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousemove", 0, Some(1), 0.0, 0.0)
@@ -5115,6 +5118,9 @@ fn mouse_drop_requires_prevented_dragover() {
)
.expect("drag listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)
.expect("first mousedown should dispatch");
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousemove", 0, Some(1), 0.0, 0.0)
@@ -5182,6 +5188,9 @@ fn mouse_dragstart_prevent_default_cancels_drag_session() {
)
.expect("drag cancel listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should dispatch");
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousemove", 0, Some(1), 0.0, 0.0)
@@ -5231,6 +5240,9 @@ fn mouse_dispatch_emits_pointer_event_properties() {
)
.expect("pointer listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point_with_pointer(
20.0,
20.0,
@@ -5305,6 +5317,9 @@ fn canceled_pointerdown_suppresses_compat_mouse_events_but_keeps_click() {
)
.expect("compat suppression listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should dispatch pointerdown");
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mouseup", 0, None, 0.0, 0.0)
@@ -5352,6 +5367,9 @@ fn pointer_capture_routes_mouse_pointer_until_pointerup() {
)
.expect("pointer capture listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should dispatch pointerdown");
vm.dispatch_mouse_event_at_point(10.0, 35.0, "mousemove", -1, None, 0.0, 0.0)
@@ -5392,6 +5410,9 @@ fn pointer_capture_lost_dispatches_before_compat_mouseup() {
)
.expect("pointer capture mouseup order listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should dispatch pointerdown");
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mouseup", 0, None, 0.0, 0.0)
@@ -5430,6 +5451,9 @@ fn pointer_capture_mouse_events_preserve_modifiers() {
)
.expect("pointer capture modifier listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(
10.0,
11.0,
@@ -5623,6 +5647,9 @@ fn pointer_raw_update_dispatches_after_pointer_boundary_before_mouse_boundary()
)
.expect("pointer raw update listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousemove", -1, None, 0.0, 0.0)
.expect("initial mousemove should establish previous hover target");
vm.dispatch_mouse_event_at_point(10.0, 35.0, "mousemove", -1, None, 0.0, 0.0)
@@ -5674,6 +5701,9 @@ fn pointer_raw_update_flushes_capture_before_pointermove() {
)
.expect("pointer raw update capture listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should set pending capture");
vm.dispatch_mouse_event_at_point(10.0, 35.0, "mousemove", -1, None, 0.0, 0.0)
@@ -5729,6 +5759,9 @@ fn release_pointer_capture_clears_pending_capture_before_got_event() {
)
.expect("release capture listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should dispatch pointerdown");
vm.dispatch_mouse_event_at_point(10.0, 35.0, "mousemove", -1, None, 0.0, 0.0)
@@ -5784,6 +5817,9 @@ fn removing_got_pointer_capture_target_dispatches_lost_on_document() {
)
.expect("capture removal listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should set pending pointer capture");
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mouseup", 0, None, 0.0, 0.0)
@@ -5837,6 +5873,9 @@ fn lost_pointer_capture_can_remove_pending_target_before_got() {
)
.expect("pending capture removal listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should set first pending capture");
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousemove", -1, None, 0.0, 0.0)
@@ -5887,6 +5926,9 @@ fn removed_pending_pointer_capture_target_is_cleared_immediately() {
)
.expect("pending capture hook listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should set then clear pending pointer capture");
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mouseup", 0, None, 0.0, 0.0)
@@ -5938,6 +5980,9 @@ fn removed_active_pointer_capture_target_loses_capture_on_next_event() {
)
.expect("active capture hook listener setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousedown", 0, None, 0.0, 0.0)
.expect("mousedown should set pending pointer capture");
vm.dispatch_mouse_event_at_point(10.0, 11.0, "mousemove", -1, None, 0.0, 0.0)
@@ -5995,6 +6040,9 @@ fn mouse_hover_dispatches_pointer_boundary_before_mouse_boundary() {
tilt_y: 0.0,
twist: 0.0,
};
+
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
vm.dispatch_mouse_event_at_point_with_pointer(
10.0,
10.0,
@@ -6030,7 +6078,7 @@ fn mouse_hover_dispatches_pointer_boundary_before_mouse_boundary() {
}
#[test]
-fn mouse_hover_persists_stylo_state_and_reflows_dropdown_before_next_hit_test() {
+fn mouse_hover_persists_stylo_state_and_reflows_dropdown_on_geometry_demand() {
let mut vm = new_parsed_test_vm(
"https://hover-dropdown.test/",
r#"
@@ -6091,6 +6139,9 @@ fn mouse_hover_persists_stylo_state_and_reflows_dropdown_before_next_hit_test()
"false|none"
);
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(10.0, 10.0, "mousemove", -1, Some(0), 0.0, 0.0)
.expect("mousemove should establish hover state");
assert_eq!(
@@ -6099,6 +6150,8 @@ fn mouse_hover_persists_stylo_state_and_reflows_dropdown_before_next_hit_test()
"true|true|true|true|block"
);
+ vm.eval("document.getElementById('submenu').getBoundingClientRect()")
+ .expect("explicit geometry demand publishes the displayed submenu");
vm.dispatch_mouse_event_at_point(10.0, 35.0, "mousedown", 0, Some(1), 0.0, 0.0)
.expect("mousedown should hit the newly displayed submenu");
vm.dispatch_mouse_event_at_point(10.0, 35.0, "mouseup", 0, Some(0), 0.0, 0.0)
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs
index a77b9c3c3..e3753f008 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/forms.rs
@@ -3714,6 +3714,9 @@ fn trusted_alt_click_downloads_an_anchor_without_a_download_attribute() {
</body></html>"#,
);
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(
20.0,
20.0,
@@ -3771,6 +3774,9 @@ fn alt_input_does_not_turn_window_open_into_a_download_or_background_popup() {
)
.expect("Alt window.open fixture should initialize");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(
20.0,
20.0,
@@ -3835,6 +3841,10 @@ fn window_open_in_click_listener_uses_current_input_event() {
"#,
)
.expect("trusted window.open fixture should initialize");
+
+ trusted
+ .eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
trusted
.dispatch_mouse_event_at_point_with_pointer_and_modifiers(
20.0,
@@ -3936,6 +3946,9 @@ fn current_mouseup_input_covers_pointer_mouse_click_and_microtask_callbacks() {
)
.expect("current input scope fixture should initialize");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point_with_pointer_and_modifiers(
20.0,
20.0,
@@ -4012,6 +4025,9 @@ fn middle_auxclick_runs_the_anchor_default_action_in_the_background() {
)
.expect("auxclick listener should install");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 1, None, 0.0, 0.0)
.expect("middle mousedown should dispatch");
let outcome = vm
@@ -4059,6 +4075,9 @@ fn canceling_middle_auxclick_suppresses_the_anchor_default_action() {
)
.expect("canceling auxclick listener should install");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 1, None, 0.0, 0.0)
.expect("middle mousedown should dispatch");
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mouseup", 1, None, 0.0, 0.0)
@@ -4213,6 +4232,9 @@ form.addEventListener('submit', event => {
)
.expect("image submit coordinate fixture should initialize");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(125.4, 68.6, "mousedown", 0, None, 0.0, 0.0)
.expect("image submitter mousedown should dispatch");
let outcome = vm
@@ -4235,6 +4257,9 @@ fn button_click_listener_window_open_self_reports_top_level_navigation() {
</body></html>"#,
);
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(20.0, 20.0, "mousedown", 0, None, 0.0, 0.0)
.expect("button mousedown should dispatch");
let outcome = vm
@@ -4346,6 +4371,9 @@ fn file_input_click_returns_pending_file_chooser_activation() {
);
let source_document = lifecycle.identity();
vm.set_root_document_lifecycle(lifecycle);
+
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
vm.dispatch_mouse_event_at_point(
FILE_INPUT_HIT_X,
FILE_INPUT_HIT_Y,
@@ -4537,6 +4565,9 @@ fn label_click_for_file_input_returns_pending_file_chooser_activation() {
);
let source_document = lifecycle.identity();
vm.set_root_document_lifecycle(lifecycle);
+
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
vm.dispatch_mouse_event_at_point(LABEL_HIT_X, LABEL_HIT_Y, "mousedown", 0, None, 0.0, 0.0)
.expect("label mousedown should dispatch");
let outcome = vm
@@ -4699,6 +4730,9 @@ root.appendChild(label);
)
.expect("shadow label setup should evaluate");
+ vm.eval("document.elementFromPoint(0, 0)")
+ .expect("publish geometry before coordinate input");
+
vm.dispatch_mouse_event_at_point(LABEL_HIT_X, LABEL_HIT_Y, "mousedown", 0, None, 0.0, 0.0)
.expect("shadow label mousedown should dispatch");
let outcome = vm
diff --git a/moli-renderer-v8/src/script_vm/tests/element_click.rs b/moli-renderer-v8/src/script_vm/tests/element_click.rs
index ad0e60d3d..02a1940a7 100644
--- a/moli-renderer-v8/src/script_vm/tests/element_click.rs
+++ b/moli-renderer-v8/src/script_vm/tests/element_click.rs
@@ -86,8 +86,8 @@ fn native_element_click_reuses_frozen_layout_after_dom_and_style_changes() {
if native_sequence {
vm.dispatch_prepared_element_click(click).unwrap();
} else {
- // Compare to the existing independent pointer phases. Their hover
- // transitions can invalidate layout; preparation must not add more.
+ // Both native sequences and individual mouse commands consume
+ // the prepared snapshot without adding a layout demand.
for (event, buttons) in [("mousemove", 0), ("mousedown", 1), ("mouseup", 0)] {
vm.dispatch_mouse_event_at_point_with_pointer(
click.root_x,
@@ -104,6 +104,10 @@ fn native_element_click_reuses_frozen_layout_after_dom_and_style_changes() {
}
}
let passes = vm.layout_pass_observability_for_test().1 - before;
+ assert_eq!(
+ passes, 1,
+ "the entire mouse sequence must reuse one snapshot: {mutation}"
+ );
let events = vm.eval("JSON.stringify([clicks,events])").unwrap();
if let Some((existing_passes, existing_events)) = &reference {
assert!(passes <= *existing_passes, "extra layout for {mutation}");
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index 4cceae269..990f48189 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -15129,6 +15129,7 @@ mod indexed_db;
mod inspector_unwrap;
mod lazy_storage;
mod lazy_window_surfaces;
+mod mouse_snapshot;
mod no_cors_header_fill;
mod observer_callbacks;
mod post_parse;
diff --git a/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
new file mode 100644
index 000000000..52421f63f
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/mouse_snapshot.rs
@@ -0,0 +1,171 @@
+use super::*;
+use crate::RendererInputDispatchOutcome;
+
+fn mouse(
+ vm: &mut StandaloneScriptVmHarness,
+ event: &str,
+) -> anyhow::Result<RendererInputDispatchOutcome> {
+ vm.dispatch_mouse_event_at_point(
+ 60.0,
+ 60.0,
+ event,
+ 0,
+ Some(i32::from(event == "mousedown")),
+ 0.0,
+ 0.0,
+ )
+}
+
+#[test]
+fn mouse_input_rejects_missing_snapshot_without_layout_or_input_state_changes() {
+ let mut vm = new_parsed_test_vm(
+ "https://mouse-snapshot.test/",
+ "<!doctype html><button id=target style='position:absolute;left:20px;top:20px;width:100px;height:100px'>go</button>",
+ );
+ vm.eval("window.events=[];for(const type of ['mousemove','mousedown','mouseup','click','wheel'])document.addEventListener(type,e=>events.push(type))").unwrap();
+ let before = vm.layout_pass_observability_for_test().1;
+ for event in ["mousemove", "mousedown", "mouseup", "wheel"] {
+ let error = mouse(&mut vm, event).unwrap_err();
+ assert_eq!(
+ error.downcast_ref::<moli_layout::LayoutError>(),
+ Some(&moli_layout::LayoutError::NoLayoutSnapshot)
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, before);
+ assert_eq!(vm.pressed_mouse_buttons, 0);
+ assert!(vm.pending_mouse_press.is_none());
+ }
+ assert_eq!(vm.eval("JSON.stringify(events)").unwrap(), "[]");
+ vm.eval("target.getBoundingClientRect()").unwrap();
+ let prepared = vm.layout_pass_observability_for_test().1;
+ // A rejected down must not leave a press that a subsequent up can activate.
+ mouse(&mut vm, "mouseup").unwrap();
+ assert_eq!(vm.eval("JSON.stringify(events)").unwrap(), r#"["mouseup"]"#);
+ assert_eq!(vm.layout_pass_observability_for_test().1, prepared);
+}
+
+#[test]
+fn mouse_input_rejects_a_snapshot_from_a_replaced_document() {
+ let mut vm = new_parsed_test_vm(
+ "https://mouse-snapshot.test/",
+ "<!doctype html><button>old</button>",
+ );
+ vm.eval("document.body.getBoundingClientRect();document.open();document.write('<button>new</button>');document.close()").unwrap();
+ let before = vm.layout_pass_observability_for_test().1;
+ let error = mouse(&mut vm, "mousedown").unwrap_err();
+ assert_eq!(
+ error.downcast_ref::<moli_layout::LayoutError>(),
+ Some(&moli_layout::LayoutError::NoLayoutSnapshot)
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, before);
+ assert_eq!(vm.pressed_mouse_buttons, 0);
+}
+
+#[test]
+fn mouse_click_consumes_snapshot_through_hover_focus_and_dom_mutation() {
+ for markup in [
+ "<button id=target>go</button>",
+ "<input id=target>",
+ "<div id=target style='overflow:auto'><div style='height:1000px;pointer-events:none'>scroll</div></div>",
+ "<form onsubmit='event.preventDefault()'><input id=target type=image></form>",
+ "<a id=target href='#destination'>go</a><div id=destination style='position:absolute;top:2000px'>destination</div>",
+ ] {
+ let mut vm = new_parsed_test_vm(
+ "https://mouse-snapshot.test/",
+ &format!(
+ "<!doctype html><style>#target{{position:absolute;left:20px;top:20px;width:100px;height:100px}}#target:hover{{left:300px}}</style>{markup}"
+ ),
+ );
+ vm.eval(
+ r#"window.events=[];
+ for(const type of ['mousemove','mousedown','mouseup','click'])
+ document.addEventListener(type,e=>events.push([type,e.target.id]));
+ target.addEventListener('mousedown',()=>{
+ const veil=document.createElement('div');
+ veil.style.cssText='position:fixed;inset:0;z-index:999';
+ document.body.appendChild(veil);
+ });
+ target.getBoundingClientRect();"#,
+ )
+ .unwrap();
+ let before = vm.layout_pass_observability_for_test().1;
+ for event in ["mousemove", "mousedown", "mouseup"] {
+ mouse(&mut vm, event).unwrap();
+ assert_eq!(
+ vm.layout_pass_observability_for_test().1,
+ before,
+ "{markup}: {event}"
+ );
+ }
+ assert_eq!(
+ vm.eval("JSON.stringify(events)").unwrap(),
+ r#"[["mousemove","target"],["mousedown","target"],["mouseup","target"],["click","target"]]"#,
+ "{markup}"
+ );
+ assert!(
+ vm.layout_snapshot_cache_observability_for_test()
+ .3
+ .is_some()
+ );
+ }
+}
+
+#[test]
+fn mouse_input_uses_latest_published_geometry_until_an_explicit_refresh() {
+ let mut vm = new_parsed_test_vm(
+ "https://mouse-snapshot.test/",
+ r#"<!doctype html><style>body{min-height:100px}</style>
+ <button id=target style='position:absolute;left:20px;top:20px;width:100px;height:100px'>go</button>"#,
+ );
+ vm.eval("window.hits=[];document.onmousemove=e=>hits.push(e.target.id);target.getBoundingClientRect();target.style.left='300px'").unwrap();
+ let before = vm.layout_pass_observability_for_test().1;
+ mouse(&mut vm, "mousemove").unwrap();
+ assert_eq!(vm.eval("JSON.stringify(hits)").unwrap(), r#"["target"]"#);
+ assert_eq!(vm.layout_pass_observability_for_test().1, before);
+ // Hover invalidation is observed by the next geometry demand, never input.
+ assert_eq!(
+ vm.eval("String(target.getBoundingClientRect().left)")
+ .unwrap(),
+ "300"
+ );
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
+ mouse(&mut vm, "mousemove").unwrap();
+ assert_eq!(vm.eval("JSON.stringify(hits)").unwrap(), r#"["target",""]"#);
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
+}
+
+#[test]
+fn mouse_handlers_can_explicitly_demand_geometry() {
+ let mut vm = new_parsed_test_vm(
+ "https://mouse-snapshot.test/",
+ r#"<!doctype html>
+ <button id=target style='position:absolute;left:20px;top:20px;width:100px;height:100px'>go</button>"#,
+ );
+ vm.eval("target.getBoundingClientRect();target.onmousemove=()=>{target.style.left='300px';window.observedLeft=target.getBoundingClientRect().left}").unwrap();
+ let before = vm.layout_pass_observability_for_test().1;
+ mouse(&mut vm, "mousemove").unwrap();
+ assert_eq!(vm.eval("String(observedLeft)").unwrap(), "300");
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
+}
+
+#[test]
+fn mouse_wheel_updates_scroll_without_refreshing_the_rendered_world() {
+ let mut vm = new_parsed_test_vm(
+ "https://mouse-snapshot.test/",
+ r#"<!doctype html>
+ <div id=target style='position:absolute;left:20px;top:20px;width:100px;height:100px;overflow:auto'>
+ <div style='height:1000px'>content</div>
+ </div>"#,
+ );
+ vm.eval("target.getBoundingClientRect()").unwrap();
+ let before = vm.layout_pass_observability_for_test().1;
+ for _ in 0..3 {
+ vm.dispatch_mouse_event_at_point(60.0, 60.0, "wheel", -1, Some(0), 0.0, 50.0)
+ .unwrap();
+ assert_eq!(vm.layout_pass_observability_for_test().1, before);
+ }
+ // scrollTop is an explicit geometry observation in Moli and can refresh.
+ assert_eq!(vm.eval("String(target.scrollTop)").unwrap(), "150");
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
+ vm.eval("target.getBoundingClientRect()").unwrap();
+ assert_eq!(vm.layout_pass_observability_for_test().1, before + 1);
+}