DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Merge contributor branch codex/pdf-layer-explicit-visibility (PR #1671) into the paired integration branch
skylar taylor-barrickfaed705607e8
diff --cc crates/engine/src/cmd/pdflayers.rsindex c2543c3f2,c4fe0a31f..4ca67f7c3--- a/crates/engine/src/cmd/pdflayers.rs+++ b/crates/engine/src/cmd/pdflayers.rs@@@ -374,12 -426,96 +426,100 @@@ pub(crate) mod testsassert!(right[0] > 200 && right[1] > 200 && right[2] > 200, "the red layer is hidden: {right:?}");assert!(px(&s, 125)[2] > 200, "blue still shows");assert_eq!(s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"], false);- // PDF export carries the choice (the graphic goes out as an image).let r = s.execute("file.exportPdf", &json!({})).unwrap();- assert!(r["warnings"].as_array().unwrap().iter().any(|w| w.as_str().unwrap().contains("layer")), "{r}");+ assert!(r["warnings"].as_array().unwrap().is_empty(), "{r}");+ let bytes = super::super::file::base64_decode(r["base64"].as_str().unwrap());+ let image = designcraft_render::render_pdf_page(&bytes, 0, 792).unwrap();+ let width = usize::from(image.width());+ assert!(image.data()[150 * width + 125].a > 200);+ assert_eq!(image.data()[150 * width + 175].a, 0);}+ #[test]+ fn placed_pdf_all_on_is_distinct_from_defaults_and_survives_exports() {+ let pdf = designcraft_render::pdf_hide_layers(&two_layer_pdf(), &["Red".into()]).unwrap();+ let mut s = Session::new();+ s.execute("file.new", &json!({})).unwrap();+ let id = s+ .execute("file.place", &json!({"base64": super::super::file::base64_encode(&pdf), "name":"off.pdf", "x":100,"y":100,"width":100}))+ .unwrap()["id"]+ .clone();+ let visible = |s: &mut Session| s.execute("object.pdfLayers", &json!({"id": id})).unwrap()[1]["visible"].as_bool().unwrap();+ let pixel = |s: &Session| {+ let mut rr = designcraft_render::Renderer::new();+ rr.threads = 0;+ rr.render_page(&s.doc().unwrap().doc, &s.cache, 0, 1.0, false, &Default::default()).unwrap().pixel(175, 150)+ };+ assert!(!visible(&mut s));+ assert!(pixel(&s)[1] > 200, "red hidden by default");+ s.execute("object.layerOptions", &json!({"ids":[id], "hidden":[], "useDefaults":false})).unwrap();+ assert!(visible(&mut s));+ assert!(pixel(&s)[0] > 200 && pixel(&s)[1] < 40, "all-on renders red");+ s.execute("edit.undo", &json!({})).unwrap();+ assert!(!visible(&mut s));+ s.execute("edit.redo", &json!({})).unwrap();+ assert!(visible(&mut s));+ let bytes = designcraft_format::save(&s.doc().unwrap().doc).unwrap();+ let roundtrip = designcraft_format::load(&bytes).unwrap();+ let item = roundtrip.item(designcraft_doc::ItemId(id.as_u64().unwrap())).unwrap();+ assert!(item.pdf_layer_override && item.pdf_hidden_layers.is_empty());+ let exported = s.execute("file.exportPdf", &json!({})).unwrap();+ let bytes = super::super::file::base64_decode(exported["base64"].as_str().unwrap());+ let raster = designcraft_render::render_pdf_page(&bytes, 0, 842).unwrap();+ let px = raster.data().get(150 * usize::from(raster.width()) + 175).unwrap();+ assert!(px.r > 200 && px.g < 40, "PDF export retains red: {px:?}");+ let idml = s.execute("file.exportIdml", &json!({})).unwrap();+ let bytes = super::super::file::base64_decode(idml["base64"].as_str().unwrap());+ let imported = designcraft_idml::import_idml(&bytes).unwrap();+ let pdf_asset = imported.assets.values().find(|a| designcraft_render::is_pdf(&a.data)).unwrap();+ assert!(designcraft_render::pdf_layers(&pdf_asset.data).iter().all(|(_, on)| *on));+ assert!(s.execute("file.exportIdml", &json!({"embedImages":false})).is_err());+ assert_eq!(s.doc().unwrap().doc.assets.values().find(|a| a.name == "off.pdf").unwrap().data.as_slice(), pdf);+ s.execute("object.layerOptions", &json!({"ids":[id],"hidden":[]})).unwrap();+ assert!(!visible(&mut s), "legacy empty list still resets defaults");+ s.execute("object.layerOptions", &json!({"ids":[id],"hidden":[],"useDefaults":false})).unwrap();+ s.execute("object.layerOptions", &json!({"ids":[id],"useDefaults":true})).unwrap();+ assert!(!visible(&mut s), "explicit reset restores defaults");+ }+ #[test]+ fn layerless_pdf_rejects_overrides_without_breaking_idml_export() {+ let mut s = Session::new();+ s.execute("file.new", &json!({})).unwrap();+ let pdf = s.execute("file.exportPdf", &json!({})).unwrap()["base64"].clone();+ let id = s.execute("file.place", &json!({"base64":pdf,"name":"plain.pdf","x":0,"y":0,"width":100})).unwrap()["id"].clone();+ let layered = s+ .execute(+ "file.place",+ &json!({"base64":super::super::file::base64_encode(&two_layer_pdf()),"name":"layered.pdf","x":120,"y":0,"width":100}),+ )+ .unwrap()["id"]+ .clone();+ let before = serde_json::to_value(&*s.doc().unwrap().doc).unwrap();+ assert!(s.execute("object.layerOptions", &json!({"ids":[layered,id],"hidden":[],"useDefaults":false})).is_err());+ assert_eq!(serde_json::to_value(&*s.doc().unwrap().doc).unwrap(), before);+ assert!(s.execute("file.exportIdml", &json!({})).is_ok());+ s.execute("object.layerOptions", &json!({"ids":[id],"hidden":[],"useDefaults":true})).unwrap();+ assert!(!s.doc().unwrap().doc.item(designcraft_doc::ItemId(id.as_u64().unwrap())).unwrap().has_pdf_layer_override());+ }++ #[test]+ fn pdf_layer_options_ignore_non_pdf_targets_in_mixed_selection() {+ let mut s = Session::new();+ s.execute("file.new", &json!({})).unwrap();+ let placed = s+ .execute(+ "file.place",+ &json!({"base64": super::super::file::base64_encode(&two_layer_pdf()), "name":"art.pdf", "x":100,"y":100,"width":100}),+ )+ .unwrap();+ let other = s.execute("frame.create", &json!({"rect":[0,0,20,20]})).unwrap();+ for ids in [json!([other["id"], placed["id"]]), json!([placed["id"], other["id"]])] {+ s.execute("selection.set", &json!({"ids":ids})).unwrap();+ assert_eq!(s.execute("object.pdfLayers", &json!({})).unwrap().as_array().unwrap().len(), 2);+ }+ assert!(s.execute("object.pdfLayers", &json!({"id":other["id"]})).is_err(), "explicit non-PDF id remains an error");+ s.execute("object.layerOptions", &json!({"ids":[placed["id"],other["id"]],"hidden":[],"useDefaults":false})).unwrap();+ assert!(!s.doc().unwrap().doc.item(designcraft_doc::ItemId(other["id"].as_u64().unwrap())).unwrap().has_pdf_layer_override());+ assert!(s.execute("object.layerOptions", &json!({"ids":[placed["id"]],"hidden":["Red"],"useDefaults":true})).is_err());+ assert!(s.execute("object.layerOptions", &json!({"ids":[placed["id"]],"useDefaults":"false"})).is_err());+ }}