Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge remote-tracking branch 'origin/main' into zydvc26s67-web-paragraph-styles-save-delete

zydvc26s67-webcfc9fb798761
diff --cc crates/ui-egui/src/dialogs.rs
index c513ba727,2ab7a3bad..616961aea
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@@ -3634,86 -4211,207 +4323,287 @@@ mod tests
}
}
+ fn test_app() -> crate::DesignApp {
+ let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.session.execute("file.new", &json!({"pages": 1})).unwrap();
+ app
+ }
+
+ #[test]
+ fn paragraph_style_options_dialog_saves_edits() {
+ let mut app = test_app();
+ let name = app.session.execute("style.paragraph.create", &json!({"name": "Body Copy"})).unwrap()["name"].as_str().unwrap().to_string();
+ app.ui.dialog = Some(Dialog::new("paragraphStyleOptions", json!({"name": name, "p.align": "center"})));
+ confirm(&mut app).expect("OK saves the style edit");
+ let st = app.session.active().unwrap();
+ assert_eq!(st.doc.styles.para(&name).unwrap().para.align, Some(designcraft_doc::Align::Center));
+ }
+
+ #[test]
+ fn delete_paragraph_style_dialog_removes_the_style_and_reassigns_text() {
+ let mut app = test_app();
+ let name = app.session.execute("style.paragraph.create", &json!({"name": "Caption"})).unwrap()["name"].as_str().unwrap().to_string();
+ let sid = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap()["story"].as_u64().unwrap();
+ app.session.execute("text.insert", &json!({"text": "Hello"})).unwrap();
+ app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 0})).unwrap();
+ app.session.execute("style.paragraph.apply", &json!({"name": name})).unwrap();
+ app.ui.dialog = Some(Dialog::new("deleteParagraphStyle", json!({"name": name, "replaceWith": designcraft_doc::BASIC_PARAGRAPH})));
+ confirm(&mut app).expect("OK deletes the style");
+ let st = app.session.active().unwrap();
+ assert!(st.doc.styles.para(&name).is_none(), "style removed");
+ let story = st.doc.stories.get(&designcraft_doc::StoryId(sid)).unwrap();
+ assert_eq!(story.paras[0].style, designcraft_doc::BASIC_PARAGRAPH, "text reassigned to the replacement style");
+ }
+
+ #[test]
+ fn delete_paragraph_style_dialog_defaults_replacement_to_basic_paragraph() {
+ let mut app = test_app();
+ let name = app.session.execute("style.paragraph.create", &json!({"name": "Caption"})).unwrap()["name"].as_str().unwrap().to_string();
+ // No `replaceWith` set — the dialog's default field.
+ app.ui.dialog = Some(Dialog::new("deleteParagraphStyle", json!({"name": name})));
+ confirm(&mut app).expect("OK deletes the style with the default replacement");
+ let st = app.session.active().unwrap();
+ assert!(st.doc.styles.para(&name).is_none());
+ }
+
+ #[test]
+ fn character_style_options_dialog_saves_edits() {
+ let mut app = test_app();
+ let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
+ app.ui.dialog = Some(Dialog::new("characterStyleOptions", json!({"name": name, "c.tracking": 20.0})));
+ confirm(&mut app).expect("OK saves the style edit");
+ let st = app.session.active().unwrap();
+ assert_eq!(st.doc.styles.char_style(&name).unwrap().chars.tracking, Some(20.0));
+ }
+
+ #[test]
+ fn delete_character_style_dialog_removes_the_style_and_reassigns_text() {
+ let mut app = test_app();
+ let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
+ let sid = app.session.execute("frame.create", &json!({"rect": [36, 36, 300, 200], "content": "text"})).unwrap()["story"].as_u64().unwrap();
+ app.session.execute("text.insert", &json!({"text": "Hello"})).unwrap();
+ app.session.execute("text.select", &json!({"story": sid, "anchor": 0, "focus": 5})).unwrap();
+ app.session.execute("style.character.apply", &json!({"name": name})).unwrap();
+ app.ui.dialog = Some(Dialog::new("deleteCharacterStyle", json!({"name": name, "replaceWith": designcraft_doc::NO_CHAR_STYLE})));
+ confirm(&mut app).expect("OK deletes the style");
+ let st = app.session.active().unwrap();
+ assert!(st.doc.styles.char_style(&name).is_none(), "style removed");
+ let story = st.doc.stories.get(&designcraft_doc::StoryId(sid)).unwrap();
+ assert_eq!(story.chars[0].format.style, designcraft_doc::NO_CHAR_STYLE, "text reassigned to the replacement style");
+ }
+
+ #[test]
+ fn delete_character_style_dialog_defaults_replacement_to_none() {
+ let mut app = test_app();
+ let name = app.session.execute("style.character.create", &json!({"name": "Key Term"})).unwrap()["name"].as_str().unwrap().to_string();
+ // No `replaceWith` set — the dialog's default field.
+ app.ui.dialog = Some(Dialog::new("deleteCharacterStyle", json!({"name": name})));
+ confirm(&mut app).expect("OK deletes the style with the default replacement");
+ let st = app.session.active().unwrap();
+ assert!(st.doc.styles.char_style(&name).is_none());
+ }
+
+ #[test]
+ fn pdf_export_defaults() {
+ let d = Dialog::new("pdfExport", json!({}));
+ let keys: Vec<&str> = d.fields.iter().map(|(k, _)| k.as_str()).collect();
+ // serde_json::Map keeps keys sorted.
+ let expected = [
+ "bleed",
+ "compressImages",
+ "flatten",
+ "marksBleed",
+ "marksCrop",
+ "marksOffset",
+ "marksPageInfo",
+ "marksWeight",
+ "preset",
+ "spreads",
+ "standard",
+ "tagged",
+ ];
+ assert_eq!(keys, expected);
+ assert_eq!(d.fields["preset"].as_str(), Some("Desktop Printing"));
+ assert_eq!(d.fields["standard"].as_str(), Some("none"));
+ assert_eq!(d.fields["compressImages"].as_bool(), Some(false));
+ assert_eq!(d.fields["flatten"].as_str(), Some(""));
+ assert_eq!(d.fields["spreads"].as_bool(), Some(false));
+ assert_eq!(d.fields["bleed"].as_bool(), Some(true));
+ assert_eq!(d.fields["marksCrop"].as_bool(), Some(false));
+ assert_eq!(d.fields["marksBleed"].as_bool(), Some(false));
+ assert_eq!(d.fields["marksPageInfo"].as_bool(), Some(false));
+ assert_eq!(d.fields["marksWeight"].as_str(), Some("0.25"));
+ assert_eq!(d.fields["marksOffset"].as_str(), Some("6"));
+ assert_eq!(d.fields["tagged"].as_bool(), Some(true));
+ }
+
+ #[test]
+ fn pdf_export_override_keeps_override() {
+ let d = Dialog::new("pdfExport", json!({"bleed": false}));
+ assert_eq!(d.fields["bleed"].as_bool(), Some(false));
+ assert_eq!(d.fields["preset"].as_str(), Some("Desktop Printing"));
+ assert_eq!(d.fields["tagged"].as_bool(), Some(true));
+ }
+
+ #[test]
+ fn pdf_export_preset_high_quality_print_keeps_flatten() {
+ let mut d = Dialog::new("pdfExport", json!({}));
+ d.fields.insert("flatten".into(), json!("medium"));
+ apply_pdf_preset(&mut d, "Desktop Printing");
+ assert_eq!(d.s("standard"), "none");
+ assert!(!d.b("compressImages"));
+ assert!(!d.b("marksCrop"));
+ assert!(!d.b("marksBleed"));
+ assert!(!d.b("marksPageInfo"));
+ assert_eq!(d.s("flatten"), "medium", "a leave-unchanged preset must not touch flatten");
+ }
+
+ #[test]
+ fn pdf_export_preset_press_quality_keeps_flatten() {
+ let mut d = Dialog::new("pdfExport", json!({}));
+ d.fields.insert("flatten".into(), json!("high"));
+ apply_pdf_preset(&mut d, "Commercial Printing");
+ assert_eq!(d.s("standard"), "none");
+ assert!(d.b("compressImages"));
+ assert!(d.b("marksCrop"));
+ assert!(d.b("marksBleed"));
+ assert!(!d.b("marksPageInfo"));
+ assert_eq!(d.s("flatten"), "high");
+ }
+
+ #[test]
+ fn pdf_export_preset_smallest_file_size_sets_flatten_low() {
+ let mut d = Dialog::new("pdfExport", json!({}));
+ apply_pdf_preset(&mut d, "Screen and Email");
+ assert_eq!(d.s("standard"), "none");
+ assert!(d.b("compressImages"));
+ assert!(!d.b("marksCrop"));
+ assert!(!d.b("marksBleed"));
+ assert!(!d.b("marksPageInfo"));
+ assert_eq!(d.s("flatten"), "low");
+ }
+
+ #[test]
+ fn pdf_export_preset_pdf_x4_keeps_flatten() {
+ let mut d = Dialog::new("pdfExport", json!({}));
+ d.fields.insert("flatten".into(), json!("medium"));
+ apply_pdf_preset(&mut d, "PDF/X-4");
+ assert_eq!(d.s("standard"), "x4");
+ assert!(!d.b("compressImages"));
+ assert!(d.b("marksCrop"));
+ assert!(d.b("marksBleed"));
+ assert!(!d.b("marksPageInfo"));
+ assert_eq!(d.s("flatten"), "medium");
+ }
+
+ #[test]
+ fn pdf_export_preset_pdf_a2b_keeps_flatten() {
+ let mut d = Dialog::new("pdfExport", json!({}));
+ d.fields.insert("flatten".into(), json!("low"));
+ apply_pdf_preset(&mut d, "PDF/A-2b");
+ assert_eq!(d.s("standard"), "a2b");
+ assert!(!d.b("compressImages"));
+ assert!(!d.b("marksCrop"));
+ assert!(!d.b("marksBleed"));
+ assert!(!d.b("marksPageInfo"));
+ assert_eq!(d.s("flatten"), "low");
+ }
+
+ #[test]
+ fn open_pdf_export_seeds_fields_from_settings() {
+ let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.ui.pdf_export.standard = "x4".into();
+ app.ui.pdf_export.tagged = false;
+ app.ui.pdf_export.marks_crop = true;
+ app.ui.pdf_export.flatten = String::new();
+ app.ui.flattener = "medium".into();
+ open_pdf_export(&mut app);
+ let d = app.ui.dialog.as_ref().unwrap();
+ assert_eq!(d.id, "pdfExport");
+ assert_eq!(d.s("standard"), "x4");
+ assert!(!d.b("tagged"));
+ assert!(d.b("marksCrop"));
+ assert_eq!(d.s("pages"), "all");
+ assert_eq!(d.s("flatten"), "medium", "empty flatten falls back to the global flattener");
+ assert_eq!(d.s("title"), "", "no document → empty title");
+
+ // A non-empty persisted flatten is used verbatim, not the global fallback.
+ app.ui.pdf_export.flatten = "low".into();
+ app.ui.flattener = "medium".into();
+ open_pdf_export(&mut app);
+ let d = app.ui.dialog.as_ref().unwrap();
+ assert_eq!(d.s("flatten"), "low");
+ }
+
+ #[test]
+ fn pdf_export_preset_custom_changes_nothing() {
+ let mut d = Dialog::new("pdfExport", json!({}));
+ d.fields.insert("standard".into(), json!("x4"));
+ d.fields.insert("compressImages".into(), json!(true));
+ d.fields.insert("marksCrop".into(), json!(true));
+ d.fields.insert("marksBleed".into(), json!(true));
+ d.fields.insert("marksPageInfo".into(), json!(true));
+ d.fields.insert("flatten".into(), json!("high"));
+ let before = d.fields.clone();
+ apply_pdf_preset(&mut d, "Custom");
+ assert_eq!(d.fields, before);
+ }
+
+ #[test]
+ fn confirm_pdf_export_writes_file_and_persists_settings() {
+ use std::sync::{Arc, Mutex};
+ let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.session.execute("file.new", &json!({})).unwrap();
+ let writes: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::new(Mutex::new(Vec::new()));
+ let sink = writes.clone();
+ app.services.write = Some(Box::new(move |path: &str, bytes: &[u8]| {
+ sink.lock().unwrap().push((path.to_string(), bytes.to_vec()));
+ Ok(())
+ }));
+ app.services.pick_save = Some(Box::new(|_name: &str| Some("/tmp/designcraft-test.pdf".to_string())));
+
+ app.ui.dialog = Some(Dialog::new("pdfExport", json!({})));
+ {
+ let d = app.ui.dialog.as_mut().unwrap();
+ d.fields.insert("standard".into(), json!("x4"));
+ d.fields.insert("bleed".into(), json!(false));
+ d.fields.insert("marksCrop".into(), json!(true));
+ d.fields.insert("tagged".into(), json!(false));
+ d.fields.insert("title".into(), json!("Report"));
+ }
+ confirm(&mut app).unwrap();
+
+ let got = writes.lock().unwrap();
+ assert_eq!(got.len(), 1, "confirming the dialog writes exactly one file");
+ assert_eq!(got[0].0, "/tmp/designcraft-test.pdf");
+ assert!(got[0].1.starts_with(b"%PDF"), "the written bytes are a PDF");
+ drop(got);
+
+ assert_eq!(app.ui.pdf_export.standard, "x4");
+ assert!(!app.ui.pdf_export.bleed);
+ assert!(app.ui.pdf_export.marks_crop);
+ assert!(!app.ui.pdf_export.tagged);
+ }
+
+ #[test]
+ fn confirm_pdf_export_cancelled_save_writes_nothing() {
+ use std::sync::{Arc, Mutex};
+ let mut app = crate::DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
+ app.session.execute("file.new", &json!({})).unwrap();
+ let writes: Arc<Mutex<Vec<(String, Vec<u8>)>>> = Arc::new(Mutex::new(Vec::new()));
+ let sink = writes.clone();
+ app.services.write = Some(Box::new(move |path: &str, bytes: &[u8]| {
+ sink.lock().unwrap().push((path.to_string(), bytes.to_vec()));
+ Ok(())
+ }));
+ app.services.pick_save = Some(Box::new(|_name: &str| None));
+
+ app.ui.dialog = Some(Dialog::new("pdfExport", json!({})));
+ let r = confirm(&mut app).unwrap();
+ assert_eq!(r, Value::Null);
+ assert!(writes.lock().unwrap().is_empty(), "cancelling the save picker must not write");
+ }
+
use designcraft_doc::{CharAttrs, CharacterStyle};
/// A document with character styles Base (bold) and Emphasis (italic) on the first two letters.