Connect native tab chrome to managed Page methods
Verify Tessera GUI / verify (push) Failing after 7m37s
Verify Tessera GUI / verify (push) Failing after 7m37s
This commit is contained in:
+128
-3
@@ -175,6 +175,9 @@ struct Session {
|
||||
pending: Option<Option<ObjectRef>>,
|
||||
nodes: Vec<WeakObjectRef>,
|
||||
last_snapshot: Option<Arc<UiNode>>,
|
||||
tab_ids: Vec<(WeakObjectRef, u64)>,
|
||||
next_tab: u64,
|
||||
last_tabs: Vec<crate::tabs::Tab>,
|
||||
render_cache: crate::snapshot::RenderCache,
|
||||
layout: crate::layout::LayoutRuntime,
|
||||
mounts: crate::mount::MountTable,
|
||||
@@ -991,7 +994,7 @@ impl NativeCallable for Function {
|
||||
.map_err(|_| invalid("UI session poisoned"))?;
|
||||
let window = object(Some(&cx.store().get_attr(session.desktop, "window")?))?;
|
||||
crate::window::unregister_page(cx, window, owner)?;
|
||||
if session.active == Some(owner) || session.pending == Some(Some(owner)) {
|
||||
if session.pending.unwrap_or(session.active) == Some(owner) {
|
||||
let next = crate::window::pages(cx.store(), window)?.first().copied();
|
||||
cx.set_attr(
|
||||
session.desktop,
|
||||
@@ -1078,6 +1081,42 @@ pub struct UiBridge {
|
||||
session: Shared,
|
||||
}
|
||||
|
||||
fn project_tabs(vm: &Vm, state: &mut Session) -> Result<Vec<crate::tabs::Tab>> {
|
||||
let window = object(Some(&vm.get_attr(state.desktop, "window")?))?;
|
||||
let pages = crate::window::pages(vm.object_store(), window)?;
|
||||
let active = state.pending.unwrap_or(state.active);
|
||||
let mut live = Vec::new();
|
||||
let mut tabs = Vec::new();
|
||||
for (index, page) in pages.iter().copied().enumerate() {
|
||||
let weak = vm.object_store().downgrade(page)?;
|
||||
let id = if let Some((_, id)) = state.tab_ids.iter().find(|(w, _)| *w == weak) {
|
||||
*id
|
||||
} else {
|
||||
state.next_tab = state
|
||||
.next_tab
|
||||
.checked_add(1)
|
||||
.ok_or_else(|| anyhow::anyhow!("tab identities exhausted"))?;
|
||||
state.next_tab
|
||||
};
|
||||
live.push((weak, id));
|
||||
let title = match vm.get_attr(page, "title") {
|
||||
Ok(Value::Text(title)) if !title.is_empty() => title
|
||||
.chars()
|
||||
.filter(|c| !c.is_control())
|
||||
.take(120)
|
||||
.collect(),
|
||||
_ => format!("Page {}", index + 1),
|
||||
};
|
||||
tabs.push(crate::tabs::Tab {
|
||||
id,
|
||||
title,
|
||||
active: active == Some(page),
|
||||
});
|
||||
}
|
||||
state.tab_ids = live;
|
||||
Ok(tabs)
|
||||
}
|
||||
|
||||
impl UiBridge {
|
||||
pub fn take_window_commands(&self, vm: &Vm) -> Result<Vec<crate::window::Command>> {
|
||||
let desktop = self
|
||||
@@ -1149,10 +1188,57 @@ impl UiBridge {
|
||||
vm.release_value(page)?;
|
||||
Ok(())
|
||||
}
|
||||
fn dispatch_tab(&self, vm: &mut Vm, input: &crate::events::Input) -> Result<()> {
|
||||
let page = {
|
||||
let state = self
|
||||
.session
|
||||
.lock()
|
||||
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
|
||||
if state.published_version != input.layout_version {
|
||||
bail!("event targets an obsolete presentation");
|
||||
}
|
||||
let weak = state
|
||||
.tab_ids
|
||||
.iter()
|
||||
.find(|(_, id)| *id == input.mount)
|
||||
.map(|(weak, _)| *weak)
|
||||
.ok_or_else(|| anyhow::anyhow!("tab has expired"))?;
|
||||
let window = object(Some(&vm.get_attr(state.desktop, "window")?))?;
|
||||
crate::window::pages(vm.object_store(), window)?
|
||||
.iter()
|
||||
.copied()
|
||||
.find(|page| vm.object_store().downgrade(*page).ok() == Some(weak))
|
||||
.ok_or_else(|| anyhow::anyhow!("Page is no longer open"))?
|
||||
};
|
||||
let method = if input.kind == "tab-close" {
|
||||
"close"
|
||||
} else {
|
||||
"activate"
|
||||
};
|
||||
let bound = vm.bind_attr(page, method)?;
|
||||
let result = match &bound {
|
||||
Value::Object(function) => vm.call_with_limits(
|
||||
*function,
|
||||
&[],
|
||||
endor_core::ExecutionLimits {
|
||||
max_frames: 128,
|
||||
max_instructions: 1_000_000,
|
||||
},
|
||||
),
|
||||
_ => Err(invalid("Page method is not callable")),
|
||||
};
|
||||
vm.release_value(bound)?;
|
||||
vm.release_value(result?)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn dispatch(&self, vm: &mut Vm, input: &crate::events::Input) -> Result<()> {
|
||||
input
|
||||
.validate()
|
||||
.map_err(|message| anyhow::anyhow!(message))?;
|
||||
if matches!(input.kind.as_str(), "tab-activate" | "tab-close") {
|
||||
return self.dispatch_tab(vm, input);
|
||||
}
|
||||
let (weak, desktop, candidates, viewport) = {
|
||||
let state = self
|
||||
.session
|
||||
@@ -1284,7 +1370,12 @@ impl UiBridge {
|
||||
vm.get_attr(state.desktop, "focusRequested"),
|
||||
Ok(Value::Bool(true))
|
||||
);
|
||||
let changed = state.pending.is_some() || !same || focus_changed || state.force_frame;
|
||||
let tabs = project_tabs(vm, &mut state)?;
|
||||
let changed = state.pending.is_some()
|
||||
|| !same
|
||||
|| focus_changed
|
||||
|| state.force_frame
|
||||
|| tabs != state.last_tabs;
|
||||
if changed {
|
||||
state.snapshot_visited = state.render_cache.visited;
|
||||
state.snapshot_reused = state.render_cache.reused;
|
||||
@@ -1318,6 +1409,7 @@ impl UiBridge {
|
||||
vm.set_attr(state.desktop, "focusRequested", Value::Bool(false))?;
|
||||
state.force_frame = false;
|
||||
state.last_snapshot = snapshot;
|
||||
state.last_tabs = frame.tabs.clone();
|
||||
state.published_version = frame.layout_version;
|
||||
// Hooks may call Page/container APIs; never hold the session mutex
|
||||
// across user code. Publish only after the refresh loop settles.
|
||||
@@ -1397,7 +1489,22 @@ impl UiBridge {
|
||||
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?
|
||||
.layout_reads
|
||||
.clear();
|
||||
let frame = crate::document::Frame::default();
|
||||
let frame = {
|
||||
let mut state = self
|
||||
.session
|
||||
.lock()
|
||||
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
|
||||
state.layout.version = state
|
||||
.layout
|
||||
.version
|
||||
.checked_add(1)
|
||||
.ok_or_else(|| anyhow::anyhow!("layout version exhausted"))?;
|
||||
crate::document::Frame {
|
||||
layout_version: state.layout.version,
|
||||
tabs: project_tabs(vm, &mut state)?,
|
||||
..crate::document::Frame::default()
|
||||
}
|
||||
};
|
||||
self.commit_frame(vm, None, &frame)?;
|
||||
return Ok(frame);
|
||||
};
|
||||
@@ -1414,6 +1521,17 @@ impl UiBridge {
|
||||
state.nodes.clone(),
|
||||
)
|
||||
};
|
||||
let tabs = {
|
||||
let mut state = self
|
||||
.session
|
||||
.lock()
|
||||
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
|
||||
project_tabs(vm, &mut state)?
|
||||
};
|
||||
let full_viewport = layout.viewport;
|
||||
if let Some(size) = &mut layout.viewport {
|
||||
size.height = (size.height - crate::tabs::height(&tabs)).max(0.0);
|
||||
}
|
||||
let mut frame = layout.structure(&root)?;
|
||||
let (hooks, mounts) = {
|
||||
let mut state = self
|
||||
@@ -1435,6 +1553,9 @@ impl UiBridge {
|
||||
&mut layout,
|
||||
&mut cache,
|
||||
)?;
|
||||
// Native layout may replace the structural Frame; attach chrome only
|
||||
// after either layout path has produced the final page geometry.
|
||||
frame.tabs = tabs;
|
||||
// Capture versions before lifecycle hooks can change a dependency.
|
||||
let reads = reads
|
||||
.into_iter()
|
||||
@@ -1452,6 +1573,7 @@ impl UiBridge {
|
||||
.session
|
||||
.lock()
|
||||
.map_err(|_| anyhow::anyhow!("UI session poisoned"))?;
|
||||
layout.viewport = full_viewport;
|
||||
state.layout = layout;
|
||||
state.measure_cache = cache;
|
||||
state.layout_reads = reads;
|
||||
@@ -1507,6 +1629,9 @@ pub fn install(vm: &mut Vm, roots: &mut Vec<ObjectRef>) -> Result<UiBridge> {
|
||||
pending: None,
|
||||
nodes: vec![],
|
||||
last_snapshot: None,
|
||||
tab_ids: Vec::new(),
|
||||
next_tab: 0,
|
||||
last_tabs: Vec::new(),
|
||||
render_cache: crate::snapshot::RenderCache::default(),
|
||||
layout: crate::layout::LayoutRuntime::default(),
|
||||
mounts: crate::mount::MountTable::default(),
|
||||
|
||||
Reference in New Issue
Block a user