fix(anatomy): V1-2.2 the visible wins on the editor canvas
Owner decision 2026-11-01. The canvas paints and hits every point hitbox, then every zone and trigger, then every visible twin, which captures on what it paints; a junction's disc is no longer taken by the zone drawn after it. The PDF view keeps the document order and its bytes. Click spec: the five fixme run unmarked, six projects incl. a 320 px phone.
This commit is contained in:
1 parent
e67715025c
commit
9c606aa567
13 files changed
+504
-64
No files matched your search
@@ -5,7 +5,7 @@
|
||||
mod common;
|
||||
|
||||
use common::svg_tree::{
|
||||
tree_value, view_names, with_ids_scoped_per_view, with_isolated_layer,
|
||||
tree_value, view_names, with_canvas_passes, with_ids_scoped_per_view, with_isolated_layer,
|
||||
with_trigger_names_per_language,
|
||||
};
|
||||
use faunosteo_core::anatomy::svg::tree::parse_svg;
|
||||
@@ -46,6 +46,7 @@ fn golden(view: &str, sheet: &LoadedSheet) -> Value {
|
||||
with_trigger_names_per_language(&mut frozen, &view_names(&sheet.document));
|
||||
with_ids_scoped_per_view(&mut frozen, view);
|
||||
with_isolated_layer(&mut frozen);
|
||||
with_canvas_passes(&mut frozen);
|
||||
frozen
|
||||
}
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ mod common;
|
||||
use std::collections::HashSet;
|
||||
|
||||
use common::svg_tree::{
|
||||
reread, tree_value, view_names, with_ids_scoped_per_view, with_isolated_layer,
|
||||
with_trigger_names_per_language,
|
||||
reread, tree_value, view_names, with_canvas_passes, with_ids_scoped_per_view,
|
||||
with_isolated_layer, with_trigger_names_per_language,
|
||||
};
|
||||
use faunosteo_core::anatomy::compose::{
|
||||
ComposeError, asset_id_of_view, compose_canvas, compose_highlight,
|
||||
@@ -112,6 +112,7 @@ fn canvas_golden(view: &str) -> Value {
|
||||
with_trigger_names_per_language(&mut frozen, &view_names(&draft()));
|
||||
with_ids_scoped_per_view(&mut frozen, view);
|
||||
with_isolated_layer(&mut frozen);
|
||||
with_canvas_passes(&mut frozen);
|
||||
frozen
|
||||
}
|
||||
|
||||
|
||||
@@ -175,3 +175,30 @@ fn take_from(node: &mut Value) -> Option<Value> {
|
||||
}
|
||||
kids.iter_mut().find_map(take_from)
|
||||
}
|
||||
|
||||
/// Owner decision 2026-11-01 (V1-2.2, « the visible wins »), the editor canvas only: applied
|
||||
/// after `with_isolated_layer` to a frozen canvas tree, written apart from the core. The layer's
|
||||
/// markers are put in three passes, each keeping the frozen order: every point hitbox (a circle
|
||||
/// with `fill="transparent"`), then every other shape, then every visible twin (a circle with
|
||||
/// `pointer-events="none"`), which captures on `visiblePainted`.
|
||||
pub fn with_canvas_passes(tree: &mut Value) {
|
||||
let layer = tree["children"].as_array_mut().unwrap().last_mut().unwrap();
|
||||
let markers = std::mem::take(layer["children"].as_array_mut().unwrap());
|
||||
let pass = |m: &Value| match (&m["attrs"]["fill"], &m["attrs"]["pointer-events"]) {
|
||||
(f, _) if m["name"] == "circle" && f == "transparent" => 0,
|
||||
(_, p) if m["name"] == "circle" && p == "none" => 2,
|
||||
_ => 1,
|
||||
};
|
||||
let mut ranked: Vec<(u8, Value)> = markers.into_iter().map(|m| (pass(&m), m)).collect();
|
||||
ranked.sort_by_key(|(rank, _)| *rank);
|
||||
let out: Vec<Value> = ranked
|
||||
.into_iter()
|
||||
.map(|(rank, mut marker)| {
|
||||
if rank == 2 {
|
||||
marker["attrs"]["pointer-events"] = json!("visiblePainted");
|
||||
}
|
||||
marker
|
||||
})
|
||||
.collect();
|
||||
layer["children"] = Value::Array(out);
|
||||
}
|
||||
@@ -170,7 +170,8 @@ fn the_halo_filter_lives_outside_the_drawing() {
|
||||
|
||||
/// Every interactive surface of the canvas: the point hitboxes declare `stroke="none"` and
|
||||
/// capture on their circle only (`visibleFill`), the zones and the trigger declare their
|
||||
/// stroke width; the visible twins never capture.
|
||||
/// stroke width; the visible twins capture on what they paint (« the visible wins », owner
|
||||
/// decision 2026-11-01), with their declared stroke.
|
||||
#[test]
|
||||
fn every_interactive_surface_declares_its_geometry_and_capture() {
|
||||
let draft = draft();
|
||||
@@ -184,7 +185,9 @@ fn every_interactive_surface_declares_its_geometry_and_capture() {
|
||||
assert_eq!(marker.attr("stroke"), Some("none"), "{marker:?}");
|
||||
assert_eq!(capture, Some("visibleFill"), "{marker:?}");
|
||||
}
|
||||
(_, Some("none")) => {}
|
||||
(_, Some("visiblePainted")) => {
|
||||
assert_eq!(marker.attr("stroke-width"), Some("1.5"), "{marker:?}");
|
||||
}
|
||||
(_, Some("all")) => assert!(marker.attr("stroke-width").is_some(), "{marker:?}"),
|
||||
other => panic!("unexpected capture {other:?}"),
|
||||
}
|
||||
@@ -300,3 +303,70 @@ fn nothing_the_reader_keeps_changes_the_layer_or_the_halo() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The role of a marker element of a composed layer, by its capture rule (the PDF view
|
||||
/// recolours the hitbox): 0 a point hitbox, 1 a zone or a trigger, 2 a visible twin.
|
||||
fn pass(marker: &Element) -> u8 {
|
||||
match marker.attr("pointer-events") {
|
||||
Some("visibleFill") => 0,
|
||||
Some("none" | "visiblePainted") => 2,
|
||||
_ => 1,
|
||||
}
|
||||
}
|
||||
|
||||
/// « The visible wins » (owner decision 2026-11-01): the canvas paints every point hitbox, then
|
||||
/// every zone and trigger, then every visible twin, each pass in document order; the PDF view
|
||||
/// keeps the document order (its bytes, the R4 digests and the step6 goldens unchanged).
|
||||
#[test]
|
||||
fn the_canvas_paints_hitboxes_then_shapes_then_twins_and_the_pdf_keeps_document_order() {
|
||||
let draft = draft();
|
||||
for view in ["main", "head"] {
|
||||
let canvas = compose_canvas(&draft, view, &horse()).unwrap();
|
||||
let layer = canvas.element_children().last().unwrap();
|
||||
let passes: Vec<u8> = layer.element_children().map(pass).collect();
|
||||
let mut sorted = passes.clone();
|
||||
sorted.sort_unstable();
|
||||
assert_eq!(passes, sorted, "{view}: {passes:?}");
|
||||
let ids = |p: u8| -> Vec<&str> {
|
||||
layer
|
||||
.element_children()
|
||||
.filter(|m| pass(m) == p)
|
||||
.map(|m| m.attr("data-anno-id").unwrap())
|
||||
.collect()
|
||||
};
|
||||
let document_order: Vec<&str> = draft
|
||||
.annotations
|
||||
.iter()
|
||||
.filter(|a| a.view_id() == view)
|
||||
.map(|a| a.id())
|
||||
.collect();
|
||||
for p in 0..3 {
|
||||
let mut expected = document_order.clone();
|
||||
expected.retain(|id| ids(p).contains(id));
|
||||
assert_eq!(ids(p), expected, "{view} pass {p} keeps document order");
|
||||
}
|
||||
assert_eq!(ids(0), ids(2), "{view}: one twin per hitbox");
|
||||
}
|
||||
let all: HashSet<&str> = draft.annotations.iter().map(|a| a.id()).collect();
|
||||
let pdf = compose_highlight(&draft, "main", horse(), &all, false).unwrap();
|
||||
let layer = pdf.element_children().last().unwrap();
|
||||
let passes: Vec<u8> = layer.element_children().map(pass).collect();
|
||||
assert_ne!(
|
||||
passes,
|
||||
{
|
||||
let mut s = passes.clone();
|
||||
s.sort_unstable();
|
||||
s
|
||||
},
|
||||
"the PDF view keeps the interleaved document order"
|
||||
);
|
||||
let twin_captures: Vec<_> = layer
|
||||
.element_children()
|
||||
.filter(|m| pass(m) == 2)
|
||||
.map(|m| m.attr("pointer-events"))
|
||||
.collect();
|
||||
assert!(
|
||||
twin_captures.iter().all(|c| *c == Some("none")),
|
||||
"{twin_captures:?}"
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user