Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(renderer): hide closed popovers from layout

ldm0bfbfcdcc6251
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py b/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py
index bb19fd529..1d95b4ce0 100644
--- a/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py
+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/classic_scrollbar.py
@@ -184,6 +184,7 @@ async def run_classic_scrollbar_group(state: SmokeState) -> None:
)
await _run_multi_scroller_drag_workflow(state, is_moli)
await _run_root_scrollbar_workflow(state, is_moli)
+ await _run_closed_popover_overflow_workflow(state, is_moli)
await _run_painted_surface_workflow(state, is_moli)
await _run_viewport_policy_and_numeric_gutter_workflow(state, is_moli)
@@ -484,7 +485,6 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> None
"root_classic_scrollbar_layout_and_cdp_drag",
{"engine": "moli" if is_moli else "chromium", "metrics": metrics, "scroll": scroll},
)
-
await page.set_content(
"""
<!doctype html>
@@ -617,6 +617,63 @@ async def _run_root_scrollbar_workflow(state: SmokeState, is_moli: bool) -> None
)
+async def _run_closed_popover_overflow_workflow(state: SmokeState, is_moli: bool) -> None:
+ page = state.page
+ await page.set_viewport_size({"width": 800, "height": 600})
+ await page.set_content(
+ """
+ <!doctype html>
+ <style>
+ html, body { margin: 0; }
+ nav { width: 785px; overflow: hidden; }
+ tool-tip {
+ position: absolute;
+ left: 900px;
+ width: 200px;
+ height: 20px;
+ }
+ main { height: 1200px; }
+ </style>
+ <nav><tool-tip id="tip" popover="manual">hidden tip</tool-tip></nav>
+ <main></main>
+ """,
+ wait_until="domcontentloaded",
+ )
+
+ async def metrics() -> list[float | str]:
+ return await page.evaluate(
+ """() => [
+ getComputedStyle(tip).display,
+ tip.getBoundingClientRect().width,
+ document.documentElement.clientWidth,
+ document.documentElement.scrollWidth,
+ ]"""
+ )
+
+ closed = await metrics()
+ assert_equal(closed, ["none", 0, 785, 785], "closed popover stays out of root overflow")
+ await page.evaluate("() => tip.showPopover()")
+ opened = await metrics()
+ assert_equal(
+ [opened[0], opened[1] > 0, opened[3] > opened[2]],
+ ["block", True, True],
+ "open popover participates in root overflow",
+ )
+ await page.evaluate("() => tip.hidePopover()")
+ reclosed = await metrics()
+ assert_equal(reclosed, closed, "closing popover removes its root overflow contribution")
+
+ state.record(
+ "closed_popover_does_not_create_root_scrollbar",
+ {
+ "engine": "moli" if is_moli else "chromium",
+ "closed": closed,
+ "opened": opened,
+ "reclosed": reclosed,
+ },
+ )
+
+
async def _run_painted_surface_workflow(state: SmokeState, is_moli: bool) -> None:
page = state.page
cdp = state.cdp
diff --git a/moli-renderer-v8/src/native_bridge/element/popover.rs b/moli-renderer-v8/src/native_bridge/element/popover.rs
index af9ca1e01..05c7b8f67 100644
--- a/moli-renderer-v8/src/native_bridge/element/popover.rs
+++ b/moli-renderer-v8/src/native_bridge/element/popover.rs
@@ -5,6 +5,7 @@ use crate::page_task_queue::{
RendererPageElementToggleEventKind, RendererPageElementToggleEventState,
};
use crate::util::{node_wrapper_from_handle, throw_type_error, v8_string, v8str};
+use dom::ElementState as StyloElementState;
use super::super::node::{
node_is_element, node_runtime_and_handle_from_args_or_detached,
@@ -144,6 +145,7 @@ fn set_popover_open_state(
if was_open == open {
return open;
}
+ let old_style_state = runtime.retained_current_element_state(handle);
let (old_state, new_state) = if open {
(
RendererPageElementToggleEventState::Closed,
@@ -188,6 +190,13 @@ fn set_popover_open_state(
.dom_host_mut()
.set_popover_open(handle, open);
if changed {
+ let runtime = unsafe { &mut *runtime_ptr };
+ runtime.note_element_state_style_activity_with_old_state(
+ handle,
+ StyloElementState::POPOVER_OPEN,
+ old_style_state,
+ );
+ runtime.invalidate_layout_after_interaction_state_change();
if open {
autofocus_popover_descendant(scope, runtime_ptr, handle);
} else if !is_manual_popover(unsafe { &*runtime_ptr }, handle) {
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 65919d2a9..a45195101 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
@@ -2112,6 +2112,69 @@ fn root_classic_scrollbars_stay_viewport_fixed_and_drive_window_scroll() {
assert_eq!(result[2], serde_json::json!([]));
}
+#[test]
+fn closed_absolute_popover_does_not_expand_root_scrollable_overflow() {
+ let mut vm = new_storage_test_vm("https://closed-popover-overflow.test/");
+ vm.set_viewport_surface(Some(crate::protocol_types::ViewportSurface {
+ inner_width: 800,
+ inner_height: 600,
+ outer_width: 800,
+ outer_height: 600,
+ device_pixel_ratio: 1.0,
+ screen_width: 1920,
+ screen_height: 1080,
+ screen_avail_width: 1920,
+ screen_avail_height: 1040,
+ }))
+ .expect("popover overflow viewport surface should update");
+ vm.eval(
+ r#"
+ (() => {
+ if (!document.documentElement) {
+ document.appendChild(document.createElement("html"));
+ }
+ if (!document.body) {
+ document.documentElement.appendChild(document.createElement("body"));
+ }
+ document.documentElement.style.margin = "0";
+ document.body.style.margin = "0";
+ document.body.innerHTML = `
+ <nav style="overflow:hidden;width:100%;height:40px">
+ <tool-tip id="tip" popover="manual"
+ style="position:absolute;left:900px;width:200px;height:20px">
+ Tooltip
+ </tool-tip>
+ </nav>
+ <main style="height:1200px"></main>`;
+ })()
+ "#,
+ )
+ .expect("closed popover overflow fixture should initialize");
+
+ refresh_layout_for_test(&mut vm);
+ assert_eq!(
+ vm.eval("JSON.stringify([tip.getBoundingClientRect().width, document.documentElement.scrollWidth])")
+ .expect("closed popover geometry should evaluate"),
+ "[0,785]"
+ );
+
+ vm.eval("tip.showPopover()").expect("popover should open");
+ refresh_layout_for_test(&mut vm);
+ assert_eq!(
+ vm.eval("JSON.stringify([tip.getBoundingClientRect().width, document.documentElement.scrollWidth])")
+ .expect("open popover geometry should evaluate"),
+ "[200,1100]"
+ );
+
+ vm.eval("tip.hidePopover()").expect("popover should close");
+ refresh_layout_for_test(&mut vm);
+ assert_eq!(
+ vm.eval("JSON.stringify([tip.getBoundingClientRect().width, document.documentElement.scrollWidth])")
+ .expect("reclosed popover geometry should evaluate"),
+ "[0,785]"
+ );
+}
+
#[test]
fn root_scrollbar_gutters_size_the_initial_containing_block_once() {
let mut vm = new_storage_test_vm("https://root-scrollbar-containing-block.test/");
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs
index c52d18451..8765b7586 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style.rs
@@ -302,6 +302,32 @@ fn dialog_user_agent_display_tracks_open_state() {
assert_eq!(result, "none|block|none");
}
+#[test]
+fn popover_user_agent_display_tracks_open_state() {
+ let mut vm = new_parsed_test_vm(
+ "https://popover-user-agent-display.test/",
+ "<!doctype html><tool-tip id=target popover=manual>Tooltip</tool-tip>",
+ );
+
+ let result = vm
+ .eval(
+ r#"
+(() => {
+ const popover = document.getElementById('target');
+ const values = [getComputedStyle(popover).display];
+ popover.showPopover();
+ values.push(getComputedStyle(popover).display);
+ popover.hidePopover();
+ values.push(getComputedStyle(popover).display);
+ return values.join('|');
+})()
+"#,
+ )
+ .expect("popover user-agent display should evaluate");
+
+ assert_eq!(result, "none|block|none");
+}
+
#[test]
fn semantic_text_decoration_uses_user_agent_defaults() {
let mut vm = new_parsed_test_vm(
diff --git a/moli-renderer-v8/src/style_engine/ua/html.css b/moli-renderer-v8/src/style_engine/ua/html.css
index 0faf403c6..4cd234d58 100644
--- a/moli-renderer-v8/src/style_engine/ua/html.css
+++ b/moli-renderer-v8/src/style_engine/ua/html.css
@@ -500,11 +500,11 @@ slot {
display: contents;
}
-dialog:not([open]) {
+dialog:not([open]), [popover]:where(:not(:popover-open)) {
display: none;
}
-dialog[open] {
+dialog[open], [popover]:popover-open {
display: block;
}
diff --git a/moli-selector/src/stylo/invalidation.rs b/moli-selector/src/stylo/invalidation.rs
index 8cf762ee8..f4e1cb42f 100644
--- a/moli-selector/src/stylo/invalidation.rs
+++ b/moli-selector/src/stylo/invalidation.rs
@@ -1589,6 +1589,9 @@ fn stylo_retained_dependency_state_for_element(element: &Element) -> ElementStat
state |= ElementState::SEEKING;
}
}
+ if element.popover_open() {
+ state |= ElementState::POPOVER_OPEN;
+ }
state
}
diff --git a/moli-selector/src/stylo/query/pseudo.rs b/moli-selector/src/stylo/query/pseudo.rs
index a36f8b41a..32a99d52c 100644
--- a/moli-selector/src/stylo/query/pseudo.rs
+++ b/moli-selector/src/stylo/query/pseudo.rs
@@ -79,6 +79,9 @@ impl<'a> QueryElement<'a> {
if self.matches_target_pseudo() {
state |= ElementState::URLTARGET;
}
+ if element.popover_open() && self.host.is_connected(self.handle) {
+ state |= ElementState::POPOVER_OPEN;
+ }
state |= self.heading_state();
if element.is_html_media() {
if element.media_paused() {