mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-10-28 11:47:21 -06:00
refactor(ui-egui): move panels/text_styles.rs tests to panels/text_styles/tests.rs
This commit is contained in:
aiongg
@@ -193,484 +193,4 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui, kind: Kind) {
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use vectorcraft_doc::{NodeId, NodeKind};
|
||||
|
||||
use super::super::tests_appearance::{click, frame_events, text_rect};
|
||||
|
||||
#[test]
|
||||
fn panels_draw_and_apply_headless() {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.session.execute("file.new", &json!({"width": 100, "height": 100})).unwrap();
|
||||
let id = app.session.execute("text.create", &json!({"x": 10, "y": 40, "text": "Hi"})).unwrap()["id"].clone();
|
||||
app.session.execute("select.set", &json!({"ids": [id]})).unwrap();
|
||||
app.session.execute("charStyle.new", &json!({"name": "Big", "attrs": {"size": 30.0}})).unwrap();
|
||||
for kind in [Kind::Char, Kind::Para] {
|
||||
let ctx = egui::Context::default();
|
||||
let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
|
||||
show(&mut app, ui, kind);
|
||||
menu(&mut app, ui, kind);
|
||||
});
|
||||
out.textures_delta.clear();
|
||||
}
|
||||
app.run("charStyle.apply", target(&app, Kind::Char, json!({"name": "Big"}))).unwrap();
|
||||
let (name, attrs) = current(&app, Kind::Char).unwrap();
|
||||
assert_eq!((name.as_deref(), attrs["size"].as_f64()), (Some("Big"), Some(30.0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn auto_leading_style_marks_only_real_overrides() {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.run("file.new", json!({"width": 100, "height": 100})).unwrap();
|
||||
let id = app.run("text.create", json!({"x": 10, "y": 40, "text": "Hi"})).unwrap()["id"].clone();
|
||||
app.run("select.set", json!({"ids": [id]})).unwrap();
|
||||
app.run("charStyle.new", json!({"name": "Automatic", "attrs": {"leading": null}})).unwrap();
|
||||
app.run("charStyle.apply", json!({"name": "Automatic"})).unwrap();
|
||||
for (leading, label) in [(json!("auto"), "Automatic"), (json!(30), "Automatic+")] {
|
||||
app.run("text.setStyle", json!({"leading": leading})).unwrap();
|
||||
let shown = crate::tests_labels::painted_text(&mut app, |app, ui| show(app, ui, Kind::Char));
|
||||
assert!(shown.lines().any(|line| line == label), "expected {label} in {shown}");
|
||||
}
|
||||
app.run("charStyle.apply", json!({"name": "Automatic", "clearOverrides": true})).unwrap();
|
||||
let shown = crate::tests_labels::painted_text(&mut app, |app, ui| show(app, ui, Kind::Char));
|
||||
assert!(shown.lines().any(|line| line == "Automatic"), "no override after clearing: {shown}");
|
||||
}
|
||||
|
||||
/// Styles made from new type hold its Auto alignment and its attributes at their defaults;
|
||||
/// the type they were made from shows no override until one of those attributes changes.
|
||||
#[test]
|
||||
fn styles_made_from_type_mark_only_real_overrides() {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.run("file.new", json!({"width": 100, "height": 100})).unwrap();
|
||||
let id = app.run("text.create", json!({"x": 10, "y": 40, "text": "Hi"})).unwrap()["id"].clone();
|
||||
app.run("select.set", json!({"ids": [id]})).unwrap();
|
||||
for kind in [Kind::Char, Kind::Para] {
|
||||
app.run(&format!("{}.new", kind.prefix()), json!({"name": "Plain"})).unwrap();
|
||||
app.run(&format!("{}.apply", kind.prefix()), json!({"name": "Plain"})).unwrap();
|
||||
}
|
||||
for (change, label) in [(None, "Plain"), (Some(json!({"kerning": 40, "composer": "singleLine"})), "Plain+")] {
|
||||
if let Some(p) = change {
|
||||
app.run("text.setFormat", p).unwrap();
|
||||
}
|
||||
for kind in [Kind::Char, Kind::Para] {
|
||||
let shown = crate::tests_labels::painted_text(&mut app, |app, ui| show(app, ui, kind));
|
||||
assert!(shown.lines().any(|line| line == label), "expected {label} in the {} styles: {shown}", kind.what());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn capture_app() -> (VectorcraftApp, NodeId, egui::Context) {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.run("file.new", json!({"width": 300, "height": 200})).unwrap();
|
||||
app.run("charStyle.new", json!({"name": "Untouched", "attrs": {"size": 22}})).unwrap();
|
||||
let other = app.run("text.create", json!({"x": 20, "y": 100, "text": "Other", "size": 22})).unwrap()["id"].clone();
|
||||
app.run("charStyle.apply", json!({"name": "Untouched", "id": other})).unwrap();
|
||||
let id = NodeId(app.run("text.create", json!({"x": 20, "y": 50, "text": "ABcdef", "size": 18})).unwrap()["id"].as_u64().unwrap());
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": 2, "end": 6, "size": 34})).unwrap();
|
||||
let ctx = egui::Context::default();
|
||||
crate::theme::install_fonts(&ctx);
|
||||
assert_eq!(text_editing(&app), None);
|
||||
(app, id, ctx)
|
||||
}
|
||||
|
||||
fn select_type_range(app: &mut VectorcraftApp, id: NodeId, start: usize, end: usize) {
|
||||
// The same editing handshake and selection API as character::tests::scaled_range_fields_follow_the_type_tool_selection.
|
||||
app.session.select_tool("type", Default::default()).unwrap();
|
||||
app.session.apply_actions(vec![vectorcraft_tools::Action::Notify("text.editNew".into())]).unwrap();
|
||||
app.session.set_tool_option("select", &json!({"start": start, "end": end}));
|
||||
super::super::character::end_typing(app);
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(false));
|
||||
assert!(!app.session.in_interaction(), "settle typing before taking the history baseline");
|
||||
assert_eq!(text_editing(app), Some((id, start, end)));
|
||||
}
|
||||
|
||||
/// Click production panel/menu content with the existing hover/press/release helper.
|
||||
/// A live range guard and command counter distinguish a dispatch failure from a missed click or lost Type selection.
|
||||
fn click_style_ui(ctx: &egui::Context, app: &mut VectorcraftApp, id: NodeId, range: Option<(usize, usize)>, is_menu: bool, label: &str) {
|
||||
let expected = range.map(|(start, end)| (id, start, end));
|
||||
let mut expected_target = json!({});
|
||||
if let Some((start, end)) = range {
|
||||
expected_target["id"] = json!(id.0);
|
||||
if end > start {
|
||||
expected_target["start"] = json!(start);
|
||||
expected_target["end"] = json!(end);
|
||||
}
|
||||
}
|
||||
let commands = app.run_count;
|
||||
let mut dispatched = false;
|
||||
let mut draw = |app: &mut VectorcraftApp, ui: &mut egui::Ui| {
|
||||
// On the release frame this is immediately before the production menu/row handles the click and builds its target.
|
||||
assert_eq!(text_editing(app), expected, "Type selection before {label}");
|
||||
assert_eq!(target(app, Kind::Char, json!({})), expected_target, "actual panel target before {label}");
|
||||
let before = app.run_count;
|
||||
if is_menu {
|
||||
menu(app, ui, Kind::Char);
|
||||
} else {
|
||||
show(app, ui, Kind::Char);
|
||||
}
|
||||
if app.run_count != before {
|
||||
assert!(!dispatched, "{label} dispatched more than once");
|
||||
assert_eq!(app.run_count, before.wrapping_add(1), "one command from {label}");
|
||||
dispatched = true;
|
||||
}
|
||||
};
|
||||
frame_events(ctx, app, vec![], &mut draw);
|
||||
let texts = frame_events(ctx, app, vec![], &mut draw);
|
||||
// widgets::menu_item prefixes an unchecked label with three spaces; the panel row does not.
|
||||
let painted = if is_menu { format!(" {label}") } else { label.to_string() };
|
||||
let pos = text_rect(&texts, &painted).center();
|
||||
click(ctx, app, pos, &mut draw);
|
||||
assert!(dispatched, "pointer click did not dispatch {label}; do not interpret this as parameter rejection");
|
||||
assert_eq!(app.run_count, commands.wrapping_add(1), "exactly one real panel command");
|
||||
assert_eq!(text_editing(app), expected, "Type selection after {label}");
|
||||
}
|
||||
|
||||
fn text_runs(app: &VectorcraftApp, id: NodeId) -> Vec<(String, f64, Option<String>)> {
|
||||
let st = app.session.doc().unwrap();
|
||||
let NodeKind::Text(text) = &st.doc.node(id).unwrap().kind else { panic!("expected text") };
|
||||
text.runs.iter().map(|r| (r.text.clone(), r.style.size, r.style.style_name.clone())).collect()
|
||||
}
|
||||
|
||||
fn capture_from_menu(range: Option<(usize, usize)>, redefine: bool) {
|
||||
capture_from_ui(range, redefine, false, false);
|
||||
}
|
||||
|
||||
fn capture_from_ui(range: Option<(usize, usize)>, redefine: bool, footer: bool, unicode: bool) {
|
||||
let (mut app, id, ctx) = capture_app();
|
||||
let (first, tail) = if unicode { ("é", "漢字") } else { ("AB", "cdef") };
|
||||
let len = first.len() + tail.len();
|
||||
if unicode {
|
||||
app.run("text.setText", json!({"id": id.0, "text": format!("{first}{tail}")})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": first.len(), "end": len, "size": 34})).unwrap();
|
||||
}
|
||||
let mut follower = None;
|
||||
let mut local_override = None;
|
||||
if redefine {
|
||||
app.run("charStyle.new", json!({"name": "Body", "attrs": {"size": 24}})).unwrap();
|
||||
// Select the definition through its real panel row; no test-only panel selection is installed.
|
||||
click_style_ui(&ctx, &mut app, id, None, false, "Body");
|
||||
let selected: Option<String> = pstate(&ctx, Kind::Char.key());
|
||||
assert_eq!(selected.as_deref(), Some("Body"));
|
||||
for (slot, text, y, size) in [(&mut follower, "Follower", 130, 24), (&mut local_override, "Override", 160, 48)] {
|
||||
let user = NodeId(app.run("text.create", json!({"x": 20, "y": y, "text": text, "size": 24})).unwrap()["id"].as_u64().unwrap());
|
||||
app.run("charStyle.apply", json!({"name": "Body", "id": user.0})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": user.0, "start": 0, "end": text.len(), "size": size})).unwrap();
|
||||
*slot = Some(user);
|
||||
}
|
||||
app.run("select.set", json!({"ids": [id.0]})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": 0, "end": len, "size": 18})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": first.len(), "end": len, "size": 34})).unwrap();
|
||||
}
|
||||
let link = redefine.then(|| "Body".to_string());
|
||||
assert_eq!(text_runs(&app, id), vec![(first.into(), 18.0, link.clone()), (tail.into(), 34.0, link)]);
|
||||
if let Some((start, end)) = range {
|
||||
select_type_range(&mut app, id, start, end);
|
||||
}
|
||||
assert!(!app.session.in_interaction());
|
||||
app.session.doc_mut().unwrap().mark_saved();
|
||||
let before = app.session.doc().unwrap().doc.clone();
|
||||
let selection = app.session.doc().unwrap().selection.clone();
|
||||
let undo = app.session.doc().unwrap().history.undo.len();
|
||||
assert!(!app.session.doc().unwrap().is_dirty());
|
||||
let label = if redefine { "Redefine Character Style" } else { "New Character Style…" };
|
||||
if footer {
|
||||
click_new_style_footer_range(&ctx, &mut app, id, range.expect("footer fixture has a range"));
|
||||
} else {
|
||||
click_style_ui(&ctx, &mut app, id, range, true, label);
|
||||
}
|
||||
let after = app.session.doc().unwrap().doc.clone();
|
||||
let name = if redefine { "Body" } else { "Character Style 1" };
|
||||
let definition = after.char_styles.iter().find(|s| s.name == name);
|
||||
let size = definition.and_then(|s| s.attrs.get("size")).and_then(Value::as_f64);
|
||||
let expected_size = if range.is_some_and(|(a, b)| b > a && a >= first.len()) { 34.0 } else { 18.0 };
|
||||
let count = before.char_styles.len() + usize::from(!redefine);
|
||||
let history = &app.session.doc().unwrap().history;
|
||||
assert_eq!(
|
||||
(after.char_styles.len(), size, history.undo.len(), history.redo.len()),
|
||||
(count, Some(expected_size), undo + 1, 0),
|
||||
"{label} dispatched with live range {range:?}; capture must use the selected start and make one style edit"
|
||||
);
|
||||
assert!(!definition.unwrap().attrs.contains_key("style_name"));
|
||||
for old in &before.char_styles {
|
||||
if old.name != name {
|
||||
assert_eq!(after.char_styles.iter().find(|s| s.name == old.name), Some(old));
|
||||
}
|
||||
}
|
||||
// New captures without applying. Redefine changes its unmodified follower, preserving overrides and unrelated text.
|
||||
before.walk(|node| {
|
||||
if matches!(&node.kind, NodeKind::Text(_)) && Some(node.id) != follower {
|
||||
assert_eq!(after.node(node.id), Some(node));
|
||||
}
|
||||
});
|
||||
if let Some(user) = follower {
|
||||
assert_eq!(text_runs(&app, user), vec![("Follower".into(), expected_size, Some("Body".into()))]);
|
||||
}
|
||||
if let Some(user) = local_override {
|
||||
assert_eq!(text_runs(&app, user), vec![("Override".into(), 48.0, Some("Body".into()))]);
|
||||
}
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
assert!(app.session.doc().unwrap().is_dirty());
|
||||
app.run("edit.undo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, before);
|
||||
assert!(!app.session.doc().unwrap().is_dirty());
|
||||
app.run("edit.redo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, after);
|
||||
assert!(app.session.doc().unwrap().is_dirty());
|
||||
}
|
||||
|
||||
// Start 3 is inside the second run; style_at chooses the preceding run at an exact boundary.
|
||||
#[test]
|
||||
fn selected_type_range_new_character_style_from_menu() {
|
||||
capture_from_menu(Some((3, 5)), false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn selected_type_range_redefine_character_style_from_menu() {
|
||||
capture_from_menu(Some((3, 5)), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_character_style_object_and_caret_controls() {
|
||||
// The current collapsed target omits start even at caret 3, so capture still uses object-start size 18.
|
||||
for range in [None, Some((3, 3))] {
|
||||
capture_from_menu(range, false);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn redefine_character_style_object_and_caret_controls() {
|
||||
for range in [None, Some((3, 3))] {
|
||||
capture_from_menu(range, true);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_range_apply_from_panel_control() {
|
||||
let (mut app, id, ctx) = capture_app();
|
||||
app.run("charStyle.new", json!({"name": "Body", "attrs": {"size": 26}})).unwrap();
|
||||
select_type_range(&mut app, id, 3, 5);
|
||||
let before = app.session.doc().unwrap().doc.clone();
|
||||
let undo = app.session.doc().unwrap().history.undo.len();
|
||||
click_style_ui(&ctx, &mut app, id, Some((3, 5)), false, "Body");
|
||||
let after = app.session.doc().unwrap().doc.clone();
|
||||
assert_eq!(
|
||||
text_runs(&app, id),
|
||||
vec![("AB".into(), 18.0, None), ("c".into(), 34.0, None), ("de".into(), 26.0, Some("Body".into())), ("f".into(), 34.0, None)]
|
||||
);
|
||||
assert_eq!(after.char_styles, before.char_styles, "Apply does not redefine Body");
|
||||
before.walk(|node| {
|
||||
if node.id != id && matches!(&node.kind, NodeKind::Text(_)) {
|
||||
assert_eq!(after.node(node.id), Some(node));
|
||||
}
|
||||
});
|
||||
assert_eq!((app.session.doc().unwrap().history.undo.len(), app.session.doc().unwrap().history.redo.len()), (undo + 1, 0));
|
||||
app.run("edit.undo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, before);
|
||||
app.run("edit.redo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, after);
|
||||
}
|
||||
|
||||
/// Feed real text/shortcut events through the canvas Type routing. No focus reset or typing
|
||||
/// settlement here: the capture dispatch itself must close the live typing interaction.
|
||||
fn capture_input(ctx: &egui::Context, app: &mut VectorcraftApp, events: Vec<egui::Event>) {
|
||||
frame_events(ctx, app, events, |app, ui| {
|
||||
crate::shortcuts::handle(app, ui.ctx());
|
||||
menu(app, ui, Kind::Char);
|
||||
});
|
||||
}
|
||||
|
||||
fn click_new_style_footer(ctx: &egui::Context, app: &mut VectorcraftApp, id: NodeId) {
|
||||
click_new_style_footer_range(ctx, app, id, (0, 5));
|
||||
}
|
||||
|
||||
fn click_new_style_footer_range(ctx: &egui::Context, app: &mut VectorcraftApp, id: NodeId, range: (usize, usize)) {
|
||||
let (start, end) = range;
|
||||
let pos = std::cell::Cell::new(egui::Pos2::ZERO);
|
||||
let commands = app.run_count;
|
||||
let mut dispatched = false;
|
||||
let mut draw = |app: &mut VectorcraftApp, ui: &mut egui::Ui| {
|
||||
assert_eq!(text_editing(app), Some((id, start, end)));
|
||||
assert_eq!(target(app, Kind::Char, json!({})), json!({"id": id.0, "start": start, "end": end}));
|
||||
ui.set_width(280.0);
|
||||
let right = ui.max_rect().right();
|
||||
let before = app.run_count;
|
||||
show(app, ui, Kind::Char);
|
||||
// The final row is the production bottom bar: New and Delete are its two 24-point
|
||||
// buttons, four points apart. Use its laid-out bottom/right, not screen coordinates.
|
||||
pos.set(egui::pos2(right - 40.0, ui.min_rect().bottom() - 12.0));
|
||||
if app.run_count != before {
|
||||
assert!(!dispatched, "footer New dispatched more than once");
|
||||
assert_eq!(app.run_count, before.wrapping_add(1));
|
||||
dispatched = true;
|
||||
}
|
||||
};
|
||||
frame_events(ctx, app, vec![], &mut draw);
|
||||
frame_events(ctx, app, vec![], &mut draw);
|
||||
click(ctx, app, pos.get(), &mut draw);
|
||||
assert!(dispatched, "pointer click did not dispatch footer New");
|
||||
assert_eq!(app.run_count, commands.wrapping_add(1));
|
||||
let selected: Option<String> = pstate(ctx, Kind::Char.key());
|
||||
assert_eq!(selected.as_deref(), Some("Character Style 1"), "production footer stores the new definition");
|
||||
assert_eq!(text_editing(app), Some((id, start, end)), "footer capture preserves the Type range");
|
||||
}
|
||||
|
||||
fn capture_during_live_typing(redefine: bool, footer: bool) {
|
||||
let (mut app, id, ctx) = capture_app();
|
||||
let mut follower = None;
|
||||
let mut local_override = None;
|
||||
if redefine {
|
||||
app.run("charStyle.new", json!({"name": "Body", "attrs": {"size": 24}})).unwrap();
|
||||
click_style_ui(&ctx, &mut app, id, None, false, "Body");
|
||||
for (slot, text, y, size) in [(&mut follower, "Follower", 130, 24), (&mut local_override, "Override", 160, 48)] {
|
||||
let user = NodeId(app.run("text.create", json!({"x": 20, "y": y, "text": text, "size": 24})).unwrap()["id"].as_u64().unwrap());
|
||||
app.run("charStyle.apply", json!({"name": "Body", "id": user.0})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": user.0, "start": 0, "end": text.len(), "size": size})).unwrap();
|
||||
*slot = Some(user);
|
||||
}
|
||||
app.run("select.set", json!({"ids": [id.0]})).unwrap();
|
||||
// This override is already the captured size, so Redefine does not alter the edited
|
||||
// runs and accidentally make TextTool::replace restart the typing interaction.
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": 0, "end": 6, "size": 18})).unwrap();
|
||||
}
|
||||
let link = redefine.then(|| "Body".to_string());
|
||||
app.session.doc_mut().unwrap().mark_saved();
|
||||
let before = app.session.doc().unwrap().doc.clone();
|
||||
let selection = app.session.doc().unwrap().selection.clone();
|
||||
let undo = app.session.doc().unwrap().history.undo.len();
|
||||
app.session.select_tool("type", Default::default()).unwrap();
|
||||
app.session.apply_actions(vec![vectorcraft_tools::Action::Notify("text.editNew".into())]).unwrap();
|
||||
assert_eq!(text_editing(&app), Some((id, 0, 6)));
|
||||
capture_input(&ctx, &mut app, vec![egui::Event::Text("Typed".into())]);
|
||||
assert_eq!(text_runs(&app, id), vec![("Typed".into(), 18.0, link.clone())]);
|
||||
assert_eq!(text_editing(&app), Some((id, 5, 5)));
|
||||
assert!(app.session.in_interaction());
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(true));
|
||||
assert_eq!(app.session.doc().unwrap().history.undo.len(), undo);
|
||||
let typed = app.session.doc().unwrap().doc.clone();
|
||||
|
||||
// Ctrl+A/Cmd+A is Select All's real command route, including key release; it must leave
|
||||
// the typing interaction live until the subsequent production menu dispatch.
|
||||
for pressed in [true, false] {
|
||||
capture_input(
|
||||
&ctx,
|
||||
&mut app,
|
||||
vec![egui::Event::Key { key: egui::Key::A, physical_key: None, pressed, repeat: false, modifiers: egui::Modifiers::COMMAND }],
|
||||
);
|
||||
}
|
||||
assert_eq!(text_editing(&app), Some((id, 0, 5)));
|
||||
assert!(app.session.in_interaction());
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(true));
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
let label = if redefine { "Redefine Character Style" } else { "New Character Style…" };
|
||||
if footer {
|
||||
click_new_style_footer(&ctx, &mut app, id);
|
||||
} else {
|
||||
click_style_ui(&ctx, &mut app, id, Some((0, 5)), true, label);
|
||||
}
|
||||
let captured = app.session.doc().unwrap().doc.clone();
|
||||
let capture_history = (app.session.doc().unwrap().history.undo.len(), app.session.doc().unwrap().history.redo.len());
|
||||
let capture_settled = !app.session.in_interaction() && app.session.tool_options()["typing"] == json!(false);
|
||||
let name = if redefine { "Body" } else { "Character Style 1" };
|
||||
let definition = captured.char_styles.iter().find(|s| s.name == name).unwrap();
|
||||
assert_eq!(definition.attrs.get("size").and_then(Value::as_f64), Some(18.0));
|
||||
assert_eq!(captured.char_styles.len(), typed.char_styles.len() + usize::from(!redefine));
|
||||
assert_eq!(text_runs(&app, id), vec![("Typed".into(), 18.0, link.clone())]);
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
typed.walk(|node| {
|
||||
if matches!(&node.kind, NodeKind::Text(_)) && Some(node.id) != follower {
|
||||
assert_eq!(captured.node(node.id), Some(node));
|
||||
}
|
||||
});
|
||||
if let Some(user) = follower {
|
||||
assert_eq!(text_runs(&app, user), vec![("Follower".into(), 18.0, Some("Body".into()))]);
|
||||
}
|
||||
if let Some(user) = local_override {
|
||||
assert_eq!(text_runs(&app, user), vec![("Override".into(), 48.0, Some("Body".into()))]);
|
||||
}
|
||||
|
||||
// Check persistence before the history assertions: RED must expose the lost definition,
|
||||
// not merely report that typing was still live after capture.
|
||||
capture_input(&ctx, &mut app, vec![egui::Event::Text("After".into())]);
|
||||
let after = app.session.doc().unwrap().doc.clone();
|
||||
assert_eq!(text_runs(&app, id), vec![("After".into(), 18.0, link)]);
|
||||
assert_eq!(after.char_styles, captured.char_styles, "further typing must preserve the captured definition");
|
||||
captured.walk(|node| {
|
||||
if node.id != id && matches!(&node.kind, NodeKind::Text(_)) {
|
||||
assert_eq!(after.node(node.id), Some(node), "further typing preserves followers and unrelated text");
|
||||
}
|
||||
});
|
||||
assert!(capture_settled, "capture ends the prior typing interaction without ending text editing");
|
||||
assert_eq!(capture_history, (undo + 2, 0), "typing and capture are separate history entries");
|
||||
assert_eq!(text_editing(&app), Some((id, 5, 5)));
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
assert!(app.session.in_interaction(), "further text starts its own typing interaction");
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(true));
|
||||
assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 2);
|
||||
|
||||
// Undo itself commits the new live typing interaction. Three separate snapshots prove
|
||||
// that typing, capture and further typing can each be undone/redone independently.
|
||||
for (step, expected) in [&captured, &typed, &before].into_iter().enumerate() {
|
||||
let result = app.run("edit.undo", json!({})).unwrap();
|
||||
if step != 1 {
|
||||
assert_eq!(result["undone"], json!("Typing"));
|
||||
}
|
||||
let st = app.session.doc().unwrap();
|
||||
assert_eq!(&st.doc, expected);
|
||||
assert_eq!(st.selection, selection);
|
||||
assert_eq!((st.history.undo.len(), st.history.redo.len()), (undo + 2 - step, step + 1));
|
||||
assert_eq!(st.is_dirty(), step != 2);
|
||||
assert!(!app.session.in_interaction());
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(false));
|
||||
}
|
||||
for (step, expected) in [&typed, &captured, &after].into_iter().enumerate() {
|
||||
let result = app.run("edit.redo", json!({})).unwrap();
|
||||
if step != 1 {
|
||||
assert_eq!(result["redone"], json!("Typing"));
|
||||
}
|
||||
let st = app.session.doc().unwrap();
|
||||
assert_eq!(&st.doc, expected);
|
||||
assert_eq!(st.selection, selection);
|
||||
assert_eq!((st.history.undo.len(), st.history.redo.len()), (undo + step + 1, 2 - step));
|
||||
assert!(st.is_dirty());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_character_style_survives_live_typing_and_undo_redo() {
|
||||
capture_during_live_typing(false, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn redefine_character_style_survives_live_typing_and_undo_redo() {
|
||||
capture_during_live_typing(true, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_character_style_from_footer_survives_live_typing_and_undo_redo() {
|
||||
capture_during_live_typing(false, true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_boundary_new_from_menu() {
|
||||
capture_from_menu(Some((2, 5)), false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_boundary_redefine_from_menu() {
|
||||
capture_from_menu(Some((2, 5)), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_boundary_new_from_footer() {
|
||||
capture_from_ui(Some((2, 5)), false, true, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_unicode_boundary_capture_controls() {
|
||||
// Byte 2 is the start of 漢 after é; 2..5 selects exactly that complete character.
|
||||
for (redefine, footer) in [(false, false), (true, false), (false, true)] {
|
||||
capture_from_ui(Some((2, 5)), redefine, footer, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
mod tests;
|
||||
|
||||
@@ -0,0 +1,479 @@
|
||||
use super::*;
|
||||
use vectorcraft_doc::{NodeId, NodeKind};
|
||||
|
||||
use super::super::tests_appearance::{click, frame_events, text_rect};
|
||||
|
||||
#[test]
|
||||
fn panels_draw_and_apply_headless() {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.session.execute("file.new", &json!({"width": 100, "height": 100})).unwrap();
|
||||
let id = app.session.execute("text.create", &json!({"x": 10, "y": 40, "text": "Hi"})).unwrap()["id"].clone();
|
||||
app.session.execute("select.set", &json!({"ids": [id]})).unwrap();
|
||||
app.session.execute("charStyle.new", &json!({"name": "Big", "attrs": {"size": 30.0}})).unwrap();
|
||||
for kind in [Kind::Char, Kind::Para] {
|
||||
let ctx = egui::Context::default();
|
||||
let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
|
||||
show(&mut app, ui, kind);
|
||||
menu(&mut app, ui, kind);
|
||||
});
|
||||
out.textures_delta.clear();
|
||||
}
|
||||
app.run("charStyle.apply", target(&app, Kind::Char, json!({"name": "Big"}))).unwrap();
|
||||
let (name, attrs) = current(&app, Kind::Char).unwrap();
|
||||
assert_eq!((name.as_deref(), attrs["size"].as_f64()), (Some("Big"), Some(30.0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn auto_leading_style_marks_only_real_overrides() {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.run("file.new", json!({"width": 100, "height": 100})).unwrap();
|
||||
let id = app.run("text.create", json!({"x": 10, "y": 40, "text": "Hi"})).unwrap()["id"].clone();
|
||||
app.run("select.set", json!({"ids": [id]})).unwrap();
|
||||
app.run("charStyle.new", json!({"name": "Automatic", "attrs": {"leading": null}})).unwrap();
|
||||
app.run("charStyle.apply", json!({"name": "Automatic"})).unwrap();
|
||||
for (leading, label) in [(json!("auto"), "Automatic"), (json!(30), "Automatic+")] {
|
||||
app.run("text.setStyle", json!({"leading": leading})).unwrap();
|
||||
let shown = crate::tests_labels::painted_text(&mut app, |app, ui| show(app, ui, Kind::Char));
|
||||
assert!(shown.lines().any(|line| line == label), "expected {label} in {shown}");
|
||||
}
|
||||
app.run("charStyle.apply", json!({"name": "Automatic", "clearOverrides": true})).unwrap();
|
||||
let shown = crate::tests_labels::painted_text(&mut app, |app, ui| show(app, ui, Kind::Char));
|
||||
assert!(shown.lines().any(|line| line == "Automatic"), "no override after clearing: {shown}");
|
||||
}
|
||||
|
||||
/// Styles made from new type hold its Auto alignment and its attributes at their defaults;
|
||||
/// the type they were made from shows no override until one of those attributes changes.
|
||||
#[test]
|
||||
fn styles_made_from_type_mark_only_real_overrides() {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.run("file.new", json!({"width": 100, "height": 100})).unwrap();
|
||||
let id = app.run("text.create", json!({"x": 10, "y": 40, "text": "Hi"})).unwrap()["id"].clone();
|
||||
app.run("select.set", json!({"ids": [id]})).unwrap();
|
||||
for kind in [Kind::Char, Kind::Para] {
|
||||
app.run(&format!("{}.new", kind.prefix()), json!({"name": "Plain"})).unwrap();
|
||||
app.run(&format!("{}.apply", kind.prefix()), json!({"name": "Plain"})).unwrap();
|
||||
}
|
||||
for (change, label) in [(None, "Plain"), (Some(json!({"kerning": 40, "composer": "singleLine"})), "Plain+")] {
|
||||
if let Some(p) = change {
|
||||
app.run("text.setFormat", p).unwrap();
|
||||
}
|
||||
for kind in [Kind::Char, Kind::Para] {
|
||||
let shown = crate::tests_labels::painted_text(&mut app, |app, ui| show(app, ui, kind));
|
||||
assert!(shown.lines().any(|line| line == label), "expected {label} in the {} styles: {shown}", kind.what());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn capture_app() -> (VectorcraftApp, NodeId, egui::Context) {
|
||||
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
|
||||
app.run("file.new", json!({"width": 300, "height": 200})).unwrap();
|
||||
app.run("charStyle.new", json!({"name": "Untouched", "attrs": {"size": 22}})).unwrap();
|
||||
let other = app.run("text.create", json!({"x": 20, "y": 100, "text": "Other", "size": 22})).unwrap()["id"].clone();
|
||||
app.run("charStyle.apply", json!({"name": "Untouched", "id": other})).unwrap();
|
||||
let id = NodeId(app.run("text.create", json!({"x": 20, "y": 50, "text": "ABcdef", "size": 18})).unwrap()["id"].as_u64().unwrap());
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": 2, "end": 6, "size": 34})).unwrap();
|
||||
let ctx = egui::Context::default();
|
||||
crate::theme::install_fonts(&ctx);
|
||||
assert_eq!(text_editing(&app), None);
|
||||
(app, id, ctx)
|
||||
}
|
||||
|
||||
fn select_type_range(app: &mut VectorcraftApp, id: NodeId, start: usize, end: usize) {
|
||||
// The same editing handshake and selection API as character::tests::scaled_range_fields_follow_the_type_tool_selection.
|
||||
app.session.select_tool("type", Default::default()).unwrap();
|
||||
app.session.apply_actions(vec![vectorcraft_tools::Action::Notify("text.editNew".into())]).unwrap();
|
||||
app.session.set_tool_option("select", &json!({"start": start, "end": end}));
|
||||
super::super::character::end_typing(app);
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(false));
|
||||
assert!(!app.session.in_interaction(), "settle typing before taking the history baseline");
|
||||
assert_eq!(text_editing(app), Some((id, start, end)));
|
||||
}
|
||||
|
||||
/// Click production panel/menu content with the existing hover/press/release helper.
|
||||
/// A live range guard and command counter distinguish a dispatch failure from a missed click or lost Type selection.
|
||||
fn click_style_ui(ctx: &egui::Context, app: &mut VectorcraftApp, id: NodeId, range: Option<(usize, usize)>, is_menu: bool, label: &str) {
|
||||
let expected = range.map(|(start, end)| (id, start, end));
|
||||
let mut expected_target = json!({});
|
||||
if let Some((start, end)) = range {
|
||||
expected_target["id"] = json!(id.0);
|
||||
if end > start {
|
||||
expected_target["start"] = json!(start);
|
||||
expected_target["end"] = json!(end);
|
||||
}
|
||||
}
|
||||
let commands = app.run_count;
|
||||
let mut dispatched = false;
|
||||
let mut draw = |app: &mut VectorcraftApp, ui: &mut egui::Ui| {
|
||||
// On the release frame this is immediately before the production menu/row handles the click and builds its target.
|
||||
assert_eq!(text_editing(app), expected, "Type selection before {label}");
|
||||
assert_eq!(target(app, Kind::Char, json!({})), expected_target, "actual panel target before {label}");
|
||||
let before = app.run_count;
|
||||
if is_menu {
|
||||
menu(app, ui, Kind::Char);
|
||||
} else {
|
||||
show(app, ui, Kind::Char);
|
||||
}
|
||||
if app.run_count != before {
|
||||
assert!(!dispatched, "{label} dispatched more than once");
|
||||
assert_eq!(app.run_count, before.wrapping_add(1), "one command from {label}");
|
||||
dispatched = true;
|
||||
}
|
||||
};
|
||||
frame_events(ctx, app, vec![], &mut draw);
|
||||
let texts = frame_events(ctx, app, vec![], &mut draw);
|
||||
// widgets::menu_item prefixes an unchecked label with three spaces; the panel row does not.
|
||||
let painted = if is_menu { format!(" {label}") } else { label.to_string() };
|
||||
let pos = text_rect(&texts, &painted).center();
|
||||
click(ctx, app, pos, &mut draw);
|
||||
assert!(dispatched, "pointer click did not dispatch {label}; do not interpret this as parameter rejection");
|
||||
assert_eq!(app.run_count, commands.wrapping_add(1), "exactly one real panel command");
|
||||
assert_eq!(text_editing(app), expected, "Type selection after {label}");
|
||||
}
|
||||
|
||||
fn text_runs(app: &VectorcraftApp, id: NodeId) -> Vec<(String, f64, Option<String>)> {
|
||||
let st = app.session.doc().unwrap();
|
||||
let NodeKind::Text(text) = &st.doc.node(id).unwrap().kind else { panic!("expected text") };
|
||||
text.runs.iter().map(|r| (r.text.clone(), r.style.size, r.style.style_name.clone())).collect()
|
||||
}
|
||||
|
||||
fn capture_from_menu(range: Option<(usize, usize)>, redefine: bool) {
|
||||
capture_from_ui(range, redefine, false, false);
|
||||
}
|
||||
|
||||
fn capture_from_ui(range: Option<(usize, usize)>, redefine: bool, footer: bool, unicode: bool) {
|
||||
let (mut app, id, ctx) = capture_app();
|
||||
let (first, tail) = if unicode { ("é", "漢字") } else { ("AB", "cdef") };
|
||||
let len = first.len() + tail.len();
|
||||
if unicode {
|
||||
app.run("text.setText", json!({"id": id.0, "text": format!("{first}{tail}")})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": first.len(), "end": len, "size": 34})).unwrap();
|
||||
}
|
||||
let mut follower = None;
|
||||
let mut local_override = None;
|
||||
if redefine {
|
||||
app.run("charStyle.new", json!({"name": "Body", "attrs": {"size": 24}})).unwrap();
|
||||
// Select the definition through its real panel row; no test-only panel selection is installed.
|
||||
click_style_ui(&ctx, &mut app, id, None, false, "Body");
|
||||
let selected: Option<String> = pstate(&ctx, Kind::Char.key());
|
||||
assert_eq!(selected.as_deref(), Some("Body"));
|
||||
for (slot, text, y, size) in [(&mut follower, "Follower", 130, 24), (&mut local_override, "Override", 160, 48)] {
|
||||
let user = NodeId(app.run("text.create", json!({"x": 20, "y": y, "text": text, "size": 24})).unwrap()["id"].as_u64().unwrap());
|
||||
app.run("charStyle.apply", json!({"name": "Body", "id": user.0})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": user.0, "start": 0, "end": text.len(), "size": size})).unwrap();
|
||||
*slot = Some(user);
|
||||
}
|
||||
app.run("select.set", json!({"ids": [id.0]})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": 0, "end": len, "size": 18})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": first.len(), "end": len, "size": 34})).unwrap();
|
||||
}
|
||||
let link = redefine.then(|| "Body".to_string());
|
||||
assert_eq!(text_runs(&app, id), vec![(first.into(), 18.0, link.clone()), (tail.into(), 34.0, link)]);
|
||||
if let Some((start, end)) = range {
|
||||
select_type_range(&mut app, id, start, end);
|
||||
}
|
||||
assert!(!app.session.in_interaction());
|
||||
app.session.doc_mut().unwrap().mark_saved();
|
||||
let before = app.session.doc().unwrap().doc.clone();
|
||||
let selection = app.session.doc().unwrap().selection.clone();
|
||||
let undo = app.session.doc().unwrap().history.undo.len();
|
||||
assert!(!app.session.doc().unwrap().is_dirty());
|
||||
let label = if redefine { "Redefine Character Style" } else { "New Character Style…" };
|
||||
if footer {
|
||||
click_new_style_footer_range(&ctx, &mut app, id, range.expect("footer fixture has a range"));
|
||||
} else {
|
||||
click_style_ui(&ctx, &mut app, id, range, true, label);
|
||||
}
|
||||
let after = app.session.doc().unwrap().doc.clone();
|
||||
let name = if redefine { "Body" } else { "Character Style 1" };
|
||||
let definition = after.char_styles.iter().find(|s| s.name == name);
|
||||
let size = definition.and_then(|s| s.attrs.get("size")).and_then(Value::as_f64);
|
||||
let expected_size = if range.is_some_and(|(a, b)| b > a && a >= first.len()) { 34.0 } else { 18.0 };
|
||||
let count = before.char_styles.len() + usize::from(!redefine);
|
||||
let history = &app.session.doc().unwrap().history;
|
||||
assert_eq!(
|
||||
(after.char_styles.len(), size, history.undo.len(), history.redo.len()),
|
||||
(count, Some(expected_size), undo + 1, 0),
|
||||
"{label} dispatched with live range {range:?}; capture must use the selected start and make one style edit"
|
||||
);
|
||||
assert!(!definition.unwrap().attrs.contains_key("style_name"));
|
||||
for old in &before.char_styles {
|
||||
if old.name != name {
|
||||
assert_eq!(after.char_styles.iter().find(|s| s.name == old.name), Some(old));
|
||||
}
|
||||
}
|
||||
// New captures without applying. Redefine changes its unmodified follower, preserving overrides and unrelated text.
|
||||
before.walk(|node| {
|
||||
if matches!(&node.kind, NodeKind::Text(_)) && Some(node.id) != follower {
|
||||
assert_eq!(after.node(node.id), Some(node));
|
||||
}
|
||||
});
|
||||
if let Some(user) = follower {
|
||||
assert_eq!(text_runs(&app, user), vec![("Follower".into(), expected_size, Some("Body".into()))]);
|
||||
}
|
||||
if let Some(user) = local_override {
|
||||
assert_eq!(text_runs(&app, user), vec![("Override".into(), 48.0, Some("Body".into()))]);
|
||||
}
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
assert!(app.session.doc().unwrap().is_dirty());
|
||||
app.run("edit.undo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, before);
|
||||
assert!(!app.session.doc().unwrap().is_dirty());
|
||||
app.run("edit.redo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, after);
|
||||
assert!(app.session.doc().unwrap().is_dirty());
|
||||
}
|
||||
|
||||
// Start 3 is inside the second run; style_at chooses the preceding run at an exact boundary.
|
||||
#[test]
|
||||
fn selected_type_range_new_character_style_from_menu() {
|
||||
capture_from_menu(Some((3, 5)), false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn selected_type_range_redefine_character_style_from_menu() {
|
||||
capture_from_menu(Some((3, 5)), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_character_style_object_and_caret_controls() {
|
||||
// The current collapsed target omits start even at caret 3, so capture still uses object-start size 18.
|
||||
for range in [None, Some((3, 3))] {
|
||||
capture_from_menu(range, false);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn redefine_character_style_object_and_caret_controls() {
|
||||
for range in [None, Some((3, 3))] {
|
||||
capture_from_menu(range, true);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_range_apply_from_panel_control() {
|
||||
let (mut app, id, ctx) = capture_app();
|
||||
app.run("charStyle.new", json!({"name": "Body", "attrs": {"size": 26}})).unwrap();
|
||||
select_type_range(&mut app, id, 3, 5);
|
||||
let before = app.session.doc().unwrap().doc.clone();
|
||||
let undo = app.session.doc().unwrap().history.undo.len();
|
||||
click_style_ui(&ctx, &mut app, id, Some((3, 5)), false, "Body");
|
||||
let after = app.session.doc().unwrap().doc.clone();
|
||||
assert_eq!(
|
||||
text_runs(&app, id),
|
||||
vec![("AB".into(), 18.0, None), ("c".into(), 34.0, None), ("de".into(), 26.0, Some("Body".into())), ("f".into(), 34.0, None)]
|
||||
);
|
||||
assert_eq!(after.char_styles, before.char_styles, "Apply does not redefine Body");
|
||||
before.walk(|node| {
|
||||
if node.id != id && matches!(&node.kind, NodeKind::Text(_)) {
|
||||
assert_eq!(after.node(node.id), Some(node));
|
||||
}
|
||||
});
|
||||
assert_eq!((app.session.doc().unwrap().history.undo.len(), app.session.doc().unwrap().history.redo.len()), (undo + 1, 0));
|
||||
app.run("edit.undo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, before);
|
||||
app.run("edit.redo", json!({})).unwrap();
|
||||
assert_eq!(app.session.doc().unwrap().doc, after);
|
||||
}
|
||||
|
||||
/// Feed real text/shortcut events through the canvas Type routing. No focus reset or typing
|
||||
/// settlement here: the capture dispatch itself must close the live typing interaction.
|
||||
fn capture_input(ctx: &egui::Context, app: &mut VectorcraftApp, events: Vec<egui::Event>) {
|
||||
frame_events(ctx, app, events, |app, ui| {
|
||||
crate::shortcuts::handle(app, ui.ctx());
|
||||
menu(app, ui, Kind::Char);
|
||||
});
|
||||
}
|
||||
|
||||
fn click_new_style_footer(ctx: &egui::Context, app: &mut VectorcraftApp, id: NodeId) {
|
||||
click_new_style_footer_range(ctx, app, id, (0, 5));
|
||||
}
|
||||
|
||||
fn click_new_style_footer_range(ctx: &egui::Context, app: &mut VectorcraftApp, id: NodeId, range: (usize, usize)) {
|
||||
let (start, end) = range;
|
||||
let pos = std::cell::Cell::new(egui::Pos2::ZERO);
|
||||
let commands = app.run_count;
|
||||
let mut dispatched = false;
|
||||
let mut draw = |app: &mut VectorcraftApp, ui: &mut egui::Ui| {
|
||||
assert_eq!(text_editing(app), Some((id, start, end)));
|
||||
assert_eq!(target(app, Kind::Char, json!({})), json!({"id": id.0, "start": start, "end": end}));
|
||||
ui.set_width(280.0);
|
||||
let right = ui.max_rect().right();
|
||||
let before = app.run_count;
|
||||
show(app, ui, Kind::Char);
|
||||
// The final row is the production bottom bar: New and Delete are its two 24-point
|
||||
// buttons, four points apart. Use its laid-out bottom/right, not screen coordinates.
|
||||
pos.set(egui::pos2(right - 40.0, ui.min_rect().bottom() - 12.0));
|
||||
if app.run_count != before {
|
||||
assert!(!dispatched, "footer New dispatched more than once");
|
||||
assert_eq!(app.run_count, before.wrapping_add(1));
|
||||
dispatched = true;
|
||||
}
|
||||
};
|
||||
frame_events(ctx, app, vec![], &mut draw);
|
||||
frame_events(ctx, app, vec![], &mut draw);
|
||||
click(ctx, app, pos.get(), &mut draw);
|
||||
assert!(dispatched, "pointer click did not dispatch footer New");
|
||||
assert_eq!(app.run_count, commands.wrapping_add(1));
|
||||
let selected: Option<String> = pstate(ctx, Kind::Char.key());
|
||||
assert_eq!(selected.as_deref(), Some("Character Style 1"), "production footer stores the new definition");
|
||||
assert_eq!(text_editing(app), Some((id, start, end)), "footer capture preserves the Type range");
|
||||
}
|
||||
|
||||
fn capture_during_live_typing(redefine: bool, footer: bool) {
|
||||
let (mut app, id, ctx) = capture_app();
|
||||
let mut follower = None;
|
||||
let mut local_override = None;
|
||||
if redefine {
|
||||
app.run("charStyle.new", json!({"name": "Body", "attrs": {"size": 24}})).unwrap();
|
||||
click_style_ui(&ctx, &mut app, id, None, false, "Body");
|
||||
for (slot, text, y, size) in [(&mut follower, "Follower", 130, 24), (&mut local_override, "Override", 160, 48)] {
|
||||
let user = NodeId(app.run("text.create", json!({"x": 20, "y": y, "text": text, "size": 24})).unwrap()["id"].as_u64().unwrap());
|
||||
app.run("charStyle.apply", json!({"name": "Body", "id": user.0})).unwrap();
|
||||
app.run("text.setRangeStyle", json!({"id": user.0, "start": 0, "end": text.len(), "size": size})).unwrap();
|
||||
*slot = Some(user);
|
||||
}
|
||||
app.run("select.set", json!({"ids": [id.0]})).unwrap();
|
||||
// This override is already the captured size, so Redefine does not alter the edited
|
||||
// runs and accidentally make TextTool::replace restart the typing interaction.
|
||||
app.run("text.setRangeStyle", json!({"id": id.0, "start": 0, "end": 6, "size": 18})).unwrap();
|
||||
}
|
||||
let link = redefine.then(|| "Body".to_string());
|
||||
app.session.doc_mut().unwrap().mark_saved();
|
||||
let before = app.session.doc().unwrap().doc.clone();
|
||||
let selection = app.session.doc().unwrap().selection.clone();
|
||||
let undo = app.session.doc().unwrap().history.undo.len();
|
||||
app.session.select_tool("type", Default::default()).unwrap();
|
||||
app.session.apply_actions(vec![vectorcraft_tools::Action::Notify("text.editNew".into())]).unwrap();
|
||||
assert_eq!(text_editing(&app), Some((id, 0, 6)));
|
||||
capture_input(&ctx, &mut app, vec![egui::Event::Text("Typed".into())]);
|
||||
assert_eq!(text_runs(&app, id), vec![("Typed".into(), 18.0, link.clone())]);
|
||||
assert_eq!(text_editing(&app), Some((id, 5, 5)));
|
||||
assert!(app.session.in_interaction());
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(true));
|
||||
assert_eq!(app.session.doc().unwrap().history.undo.len(), undo);
|
||||
let typed = app.session.doc().unwrap().doc.clone();
|
||||
|
||||
// Ctrl+A/Cmd+A is Select All's real command route, including key release; it must leave
|
||||
// the typing interaction live until the subsequent production menu dispatch.
|
||||
for pressed in [true, false] {
|
||||
capture_input(
|
||||
&ctx,
|
||||
&mut app,
|
||||
vec![egui::Event::Key { key: egui::Key::A, physical_key: None, pressed, repeat: false, modifiers: egui::Modifiers::COMMAND }],
|
||||
);
|
||||
}
|
||||
assert_eq!(text_editing(&app), Some((id, 0, 5)));
|
||||
assert!(app.session.in_interaction());
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(true));
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
let label = if redefine { "Redefine Character Style" } else { "New Character Style…" };
|
||||
if footer {
|
||||
click_new_style_footer(&ctx, &mut app, id);
|
||||
} else {
|
||||
click_style_ui(&ctx, &mut app, id, Some((0, 5)), true, label);
|
||||
}
|
||||
let captured = app.session.doc().unwrap().doc.clone();
|
||||
let capture_history = (app.session.doc().unwrap().history.undo.len(), app.session.doc().unwrap().history.redo.len());
|
||||
let capture_settled = !app.session.in_interaction() && app.session.tool_options()["typing"] == json!(false);
|
||||
let name = if redefine { "Body" } else { "Character Style 1" };
|
||||
let definition = captured.char_styles.iter().find(|s| s.name == name).unwrap();
|
||||
assert_eq!(definition.attrs.get("size").and_then(Value::as_f64), Some(18.0));
|
||||
assert_eq!(captured.char_styles.len(), typed.char_styles.len() + usize::from(!redefine));
|
||||
assert_eq!(text_runs(&app, id), vec![("Typed".into(), 18.0, link.clone())]);
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
typed.walk(|node| {
|
||||
if matches!(&node.kind, NodeKind::Text(_)) && Some(node.id) != follower {
|
||||
assert_eq!(captured.node(node.id), Some(node));
|
||||
}
|
||||
});
|
||||
if let Some(user) = follower {
|
||||
assert_eq!(text_runs(&app, user), vec![("Follower".into(), 18.0, Some("Body".into()))]);
|
||||
}
|
||||
if let Some(user) = local_override {
|
||||
assert_eq!(text_runs(&app, user), vec![("Override".into(), 48.0, Some("Body".into()))]);
|
||||
}
|
||||
|
||||
// Check persistence before the history assertions: RED must expose the lost definition,
|
||||
// not merely report that typing was still live after capture.
|
||||
capture_input(&ctx, &mut app, vec![egui::Event::Text("After".into())]);
|
||||
let after = app.session.doc().unwrap().doc.clone();
|
||||
assert_eq!(text_runs(&app, id), vec![("After".into(), 18.0, link)]);
|
||||
assert_eq!(after.char_styles, captured.char_styles, "further typing must preserve the captured definition");
|
||||
captured.walk(|node| {
|
||||
if node.id != id && matches!(&node.kind, NodeKind::Text(_)) {
|
||||
assert_eq!(after.node(node.id), Some(node), "further typing preserves followers and unrelated text");
|
||||
}
|
||||
});
|
||||
assert!(capture_settled, "capture ends the prior typing interaction without ending text editing");
|
||||
assert_eq!(capture_history, (undo + 2, 0), "typing and capture are separate history entries");
|
||||
assert_eq!(text_editing(&app), Some((id, 5, 5)));
|
||||
assert_eq!(app.session.doc().unwrap().selection, selection);
|
||||
assert!(app.session.in_interaction(), "further text starts its own typing interaction");
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(true));
|
||||
assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 2);
|
||||
|
||||
// Undo itself commits the new live typing interaction. Three separate snapshots prove
|
||||
// that typing, capture and further typing can each be undone/redone independently.
|
||||
for (step, expected) in [&captured, &typed, &before].into_iter().enumerate() {
|
||||
let result = app.run("edit.undo", json!({})).unwrap();
|
||||
if step != 1 {
|
||||
assert_eq!(result["undone"], json!("Typing"));
|
||||
}
|
||||
let st = app.session.doc().unwrap();
|
||||
assert_eq!(&st.doc, expected);
|
||||
assert_eq!(st.selection, selection);
|
||||
assert_eq!((st.history.undo.len(), st.history.redo.len()), (undo + 2 - step, step + 1));
|
||||
assert_eq!(st.is_dirty(), step != 2);
|
||||
assert!(!app.session.in_interaction());
|
||||
assert_eq!(app.session.tool_options()["typing"], json!(false));
|
||||
}
|
||||
for (step, expected) in [&typed, &captured, &after].into_iter().enumerate() {
|
||||
let result = app.run("edit.redo", json!({})).unwrap();
|
||||
if step != 1 {
|
||||
assert_eq!(result["redone"], json!("Typing"));
|
||||
}
|
||||
let st = app.session.doc().unwrap();
|
||||
assert_eq!(&st.doc, expected);
|
||||
assert_eq!(st.selection, selection);
|
||||
assert_eq!((st.history.undo.len(), st.history.redo.len()), (undo + step + 1, 2 - step));
|
||||
assert!(st.is_dirty());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_character_style_survives_live_typing_and_undo_redo() {
|
||||
capture_during_live_typing(false, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn redefine_character_style_survives_live_typing_and_undo_redo() {
|
||||
capture_during_live_typing(true, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_character_style_from_footer_survives_live_typing_and_undo_redo() {
|
||||
capture_during_live_typing(false, true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_boundary_new_from_menu() {
|
||||
capture_from_menu(Some((2, 5)), false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_boundary_redefine_from_menu() {
|
||||
capture_from_menu(Some((2, 5)), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_boundary_new_from_footer() {
|
||||
capture_from_ui(Some((2, 5)), false, true, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn character_style_unicode_boundary_capture_controls() {
|
||||
// Byte 2 is the start of 漢 after é; 2..5 selects exactly that complete character.
|
||||
for (redefine, footer) in [(false, false), (true, false), (false, true)] {
|
||||
capture_from_ui(Some((2, 5)), redefine, footer, true);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user