diff --git a/crates/midra-layout/src/exchange_metadata.rs b/crates/midra-layout/src/exchange_metadata.rs index 9abd444..fd3d43e 100644 --- a/crates/midra-layout/src/exchange_metadata.rs +++ b/crates/midra-layout/src/exchange_metadata.rs @@ -17,6 +17,8 @@ pub fn snapshot(project: &Project, ids: &[usize]) -> Result { let mut p = project.clone(); p.layers.retain(|l| ids.contains(&l.id)); p.editor.selected_layer_ids.retain(|id| ids.contains(id)); + p.folders + .retain(|f| p.layers.iter().any(|l| &l.folder == f)); p.references.clear(); p.workspace.previews.clear(); p.workspace diff --git a/crates/midra-layout/src/folders.rs b/crates/midra-layout/src/folders.rs index 6a45123..2e1a01a 100644 --- a/crates/midra-layout/src/folders.rs +++ b/crates/midra-layout/src/folders.rs @@ -10,6 +10,11 @@ impl Layout { folders.push(info.folder.clone()); } } + for name in &self.folders { + if !folders.contains(name) { + folders.push(name.clone()); + } + } folders } @@ -44,19 +49,74 @@ impl Layout { Ok(()) } - pub fn rename_folder(&mut self, folder: &str, name: &str) -> Result<(), String> { - if folder.is_empty() - || name.trim().is_empty() - || (folder != name.trim() && self.info.iter().any(|info| info.folder == name.trim())) + /// Explicit folders remain available even when their last layer is moved out. + pub fn create_folder(&mut self, name: &str) -> Result<(), String> { + self.create_folder_with_layers(name, &[]) + } + + pub fn create_folder_with_layers(&mut self, name: &str, ids: &[usize]) -> Result<(), String> { + let name = name.trim(); + if name.is_empty() + || name.chars().count() > 128 + || self.folders.len() >= 256 + || self.folders().iter().any(|f| f == name) + || ids.iter().any(|id| !self.info.iter().any(|l| l.id == *id)) { - return Err("Use a nonempty, unique folder name.".into()); + return Err("Use a unique folder name of 1–128 characters and existing layers (maximum 256 created folders).".into()); } - let ids = self - .folder_members(folder) - .iter() - .map(|&i| self.info[i].id) - .collect::>(); - self.assign_folder(&ids, name) + self.finish_drag(); + let before = self.snapshot(); + self.folders.push(name.into()); + for info in &mut self.info { + if ids.contains(&info.id) { + info.folder = name.into(); + } + } + self.remember(before); + Ok(()) + } + + pub fn rename_folder(&mut self, folder: &str, name: &str) -> Result<(), String> { + let name = name.trim(); + if folder.is_empty() + || name.is_empty() + || name.chars().count() > 128 + || !self.folders().iter().any(|f| f == folder) + || (folder != name && self.folders().iter().any(|f| f == name)) + { + return Err("Use an existing folder and a unique name of 1–128 characters.".into()); + } + self.finish_drag(); + let before = self.snapshot(); + for f in &mut self.folders { + if f == folder { + *f = name.into(); + } + } + for info in &mut self.info { + if info.folder == folder { + info.folder = name.into(); + } + } + self.remember(before); + Ok(()) + } + + /// Remove a folder without deleting any of its layers. + pub fn ungroup_folder(&mut self, folder: &str) -> Result<(), String> { + if folder.is_empty() || !self.folders().iter().any(|f| f == folder) { + return Err("Folder no longer exists.".into()); + } + self.finish_drag(); + let before = self.snapshot(); + self.folders.retain(|f| f != folder); + for info in &mut self.info { + if info.folder == folder { + info.folder.clear(); + } + } + self.remember(before); + Ok(()) } pub fn select_folder(&mut self, folder: &str, toggle: bool) { diff --git a/crates/midra-layout/src/gui.rs b/crates/midra-layout/src/gui.rs index fe05733..ea82106 100644 --- a/crates/midra-layout/src/gui.rs +++ b/crates/midra-layout/src/gui.rs @@ -4184,7 +4184,7 @@ fn toolbar_icon(ui: &mut egui::Ui, rect: Rect, label: &str, icon: ToolbarIcon) - } } response.on_hover_text(match icon { - ToolbarIcon::AddFolder => "Create a folder from the selected layers", + ToolbarIcon::AddFolder => "Create an empty folder", ToolbarIcon::AddImage => "Add reference image", ToolbarIcon::ManageLayers => "Manage layers and folders", ToolbarIcon::Select => "Select (V) — select, move and resize layers; drag empty space to select. Grid and Pivot toggles still apply.", diff --git a/crates/midra-layout/src/layers_ui.rs b/crates/midra-layout/src/layers_ui.rs index 8a6431d..468f1cc 100644 --- a/crates/midra-layout/src/layers_ui.rs +++ b/crates/midra-layout/src/layers_ui.rs @@ -64,6 +64,7 @@ pub(super) struct LayerUi { assign: Option<(Vec, String)>, pub context_layer: Option, delete_requested: Option, + folder_remove: Option, pub(super) rename: Option<(usize, String)>, pub(super) rename_focus: bool, drafts: Vec<(usize, String, String)>, @@ -94,19 +95,28 @@ impl Editor { self.layer_ui.rename_focus = true; ui.close_menu(); } + let ids = if self.layout.selection_mask()[i] { + self.layout + .selected_indices() + .into_iter() + .map(|i| self.layout.layer_info(i).id) + .collect() + } else { + vec![id] + }; ui.menu_button("Move to folder", |ui| { if ui.button("No folder").clicked() { - self.layer_ui.assign = Some((vec![id], String::new())); + self.layer_ui.assign = Some((ids.clone(), String::new())); ui.close_menu(); } for folder in self.layout.folders() { if ui.button(&folder).clicked() { - self.layer_ui.assign = Some((vec![id], folder)); + self.layer_ui.assign = Some((ids.clone(), folder)); ui.close_menu(); } } if ui.button("New folder…").clicked() { - self.layer_ui.folder_rename = Some((None, "New folder".into(), vec![id])); + self.layer_ui.folder_rename = Some((None, "New folder".into(), ids.clone())); self.layer_ui.rename_focus = true; ui.close_menu(); } @@ -418,32 +428,25 @@ impl Editor { } } } + for folder in self.layout.folders() { + if seen.insert(folder.clone()) { + rows.push(TreeRow::Folder(folder)); + } + } rows } pub(super) fn layer_tree_header(&mut self, ui: &mut egui::Ui, ink: &Ink, width: f32) { - let ids = self - .layout - .selected_indices() - .iter() - .map(|&i| self.layout.layer_info(i).id) - .collect::>(); - let response = toolbar_icon( + if toolbar_icon( ui, Rect::from_min_size(ink.point(width - 92.0, -5.0), Vec2::new(28.0, 24.0)), "Create folder", ToolbarIcon::AddFolder, - ); - if response - .on_hover_text("Create a folder from the selected layers.") - .clicked() + ) + .clicked() { - if ids.is_empty() { - self.error = "Select layers to put in a new folder.".into(); - } else { - self.layer_ui.folder_rename = Some((None, "New folder".into(), ids)); - self.layer_ui.rename_focus = true; - } + self.layer_ui.folder_rename = Some((None, "New folder".into(), Vec::new())); + self.layer_ui.rename_focus = true; } let root = ui.interact( Rect::from_min_size(ink.point(0.0, -5.0), Vec2::new(60.0, 24.0)), @@ -487,8 +490,8 @@ impl Editor { let members = self.layout.folder_members(folder); let mask = self.layout.selection_mask(); let selected = members.iter().any(|&i| mask[i]); - let hidden = members.iter().all(|&i| !self.layout.visible(i)); - let locked = members.iter().all(|&i| self.layout.locked(i)); + let hidden = !members.is_empty() && members.iter().all(|&i| !self.layout.visible(i)); + let locked = !members.is_empty() && members.iter().all(|&i| self.layout.locked(i)); let color = if selected { palette.amber } else { @@ -572,7 +575,9 @@ impl Editor { self.layout.select_folder(folder, click_shift_modifier(ui)); self.sync(); } - row.dnd_set_drag_payload(FolderDrag(folder.into())); + if !members.is_empty() { + row.dnd_set_drag_payload(FolderDrag(folder.into())); + } if row.dnd_hover_payload::().is_some() || row.dnd_hover_payload::().is_some() { @@ -589,7 +594,9 @@ impl Editor { self.layer_ui.assign = Some((vec![payload.0], folder.into())); self.layer_ui.collapsed.remove(folder); } - if let Some(payload) = row.dnd_release_payload::() { + if let Some(payload) = row.dnd_release_payload::() + && !members.is_empty() + { let above = row .ctx .input(|i| i.pointer.interact_pos()) @@ -652,7 +659,13 @@ impl Editor { ), ] { if ui - .add_enabled(target.is_some(), egui::Button::new(label)) + .add_enabled( + !members.is_empty() + && target.is_some_and(|i| { + !self.layout.folder_members(&folders[i]).is_empty() + }), + egui::Button::new(label), + ) .clicked() { let target_members = self.layout.folder_members(&folders[target.unwrap()]); @@ -667,17 +680,15 @@ impl Editor { } } if ui - .button("Ungroup folder") + .button(if members.is_empty() { + "Delete empty folder" + } else { + "Ungroup folder" + }) .on_hover_text("Keep all layers and move them to the root.") .clicked() { - self.layer_ui.assign = Some(( - members - .iter() - .map(|&i| self.layout.layer_info(i).id) - .collect(), - String::new(), - )); + self.layer_ui.folder_remove = Some(folder.into()); ui.close_menu(); } }); @@ -704,7 +715,10 @@ impl Editor { } fn folder_commands(&mut self, ctx: &egui::Context) { - let result = if let Some((folder, id, above)) = self.layer_ui.folder_move.take() { + let result = if let Some(folder) = self.layer_ui.folder_remove.take() { + self.layer_ui.collapsed.remove(&folder); + Some(self.layout.ungroup_folder(&folder)) + } else if let Some((folder, id, above)) = self.layer_ui.folder_move.take() { Some(self.layout.move_folder(&folder, id, above)) } else if let Some((ids, folder)) = self.layer_ui.assign.take() { Some(self.layout.assign_folder(&ids, &folder)) @@ -731,7 +745,7 @@ impl Editor { egui::Window::new(if old.is_some() { "Rename folder" } else { - "New folder from layers" + "New folder" }) .collapsible(false) .resizable(false) @@ -771,7 +785,7 @@ impl Editor { let result = if let Some(old) = &old { self.layout.rename_folder(old, &name) } else { - self.layout.assign_folder(&ids, &name) + self.layout.create_folder_with_layers(&name, &ids) }; match result { Ok(()) => { @@ -804,6 +818,121 @@ impl Editor { #[cfg(test)] mod tests { use super::*; + #[test] + fn empty_folder_dialog_preserves_selection_and_restores_its_tree_row() { + let ctx = egui::Context::default(); + let mut app = Editor::default(); + app.layout.set_selection([true, true]); + let before = app.layout.layers().to_vec(); + app.layer_ui.folder_rename = Some((None, "Empty".into(), vec![])); + super::super::tests::click_text(&mut app, &ctx, "Create folder"); + assert_eq!(app.layout.layers(), &before); + assert_eq!(app.layout.selected_indices(), [0, 1]); + assert!(app.layout.folder_members("Empty").is_empty()); + assert!( + app.layer_tree_rows() + .iter() + .any(|r| matches!(r, TreeRow::Folder(f) if f == "Empty")) + ); + app.layer_ui.collapsed.insert("Empty".into()); + let saved = app.project(); + app.install_project(&ctx, saved.clone()).unwrap(); + super::super::tests::frame(&mut app, &ctx, vec![]); + assert_eq!(app.project(), saved); + assert!( + ctx.read_response(egui::Id::new(("folder", "Empty"))) + .is_some() + ); + app.layer_ui.folder_remove = Some("Empty".into()); + super::super::tests::frame(&mut app, &ctx, vec![]); + assert!(app.layout.folders().is_empty()); + app.layout.undo(); + assert_eq!(app.layout.folders(), ["Empty"]); + } + + #[test] + fn both_context_menus_move_the_selection_or_only_an_unselected_target() { + fn menu_frame( + app: &mut Editor, + ctx: &egui::Context, + viewport: bool, + id: usize, + events: Vec, + ) -> egui::FullOutput { + ctx.run( + egui::RawInput { + screen_rect: Some(Rect::from_min_size(Pos2::ZERO, Vec2::new(1000.0, 900.0))), + events, + ..Default::default() + }, + |ctx| { + egui::CentralPanel::default().show(ctx, |ui| { + if viewport { + app.layer_ui.context_layer = Some(id); + app.layer_context_menu(ui); + } else { + app.layer_actions_menu(ui, id); + } + }); + }, + ) + } + fn click(app: &mut Editor, ctx: &egui::Context, viewport: bool, id: usize, label: &str) { + menu_frame(app, ctx, viewport, id, vec![]); + let output = menu_frame(app, ctx, viewport, id, vec![]); + let point = output + .shapes + .iter() + .find_map(|s| match &s.shape { + egui::Shape::Text(t) if t.galley.text() == label => { + Some(t.pos + t.galley.size() * 0.5) + } + _ => None, + }) + .unwrap_or_else(|| panic!("Missing {label}")); + menu_frame( + app, + ctx, + viewport, + id, + vec![ + egui::Event::PointerMoved(point), + super::super::tests::mouse(point, true), + ], + ); + menu_frame( + app, + ctx, + viewport, + id, + vec![super::super::tests::mouse(point, false)], + ); + } + for viewport in [false, true] { + for selected_target in [false, true] { + let ctx = egui::Context::default(); + let mut app = Editor::default(); + app.layout.add_layer().unwrap(); + app.layout.set_selection([true, true, false]); + app.layout.create_folder("Destination").unwrap(); + let id = app + .layout + .layer_info(if selected_target { 0 } else { 2 }) + .id; + click(&mut app, &ctx, viewport, id, "Move to folder"); + click(&mut app, &ctx, viewport, id, "Destination"); + let (ids, folder) = app.layer_ui.assign.take().unwrap(); + app.layout.assign_folder(&ids, &folder).unwrap(); + assert_eq!( + app.layout.folder_members("Destination"), + if selected_target { vec![0, 1] } else { vec![2] } + ); + app.layout.undo(); + assert!(app.layout.folder_members("Destination").is_empty()); + } + } + } + #[test] fn dragging_top_row_below_bottom_row_sends_it_to_the_back() { use super::super::tests::{frame, mouse}; diff --git a/crates/midra-layout/src/lib.rs b/crates/midra-layout/src/lib.rs index 80af1b9..4ef164b 100644 --- a/crates/midra-layout/src/lib.rs +++ b/crates/midra-layout/src/lib.rs @@ -473,6 +473,7 @@ pub(crate) fn validate_pivot(pivot: [f64; 2]) -> Result<(), String> { /// Multi-layer document with one undo record per complete gesture/edit. #[derive(Clone)] pub struct Layout { + folders: Vec, info: Vec, next_id: usize, layers: Vec, @@ -535,6 +536,7 @@ impl Resize { } #[derive(Clone, PartialEq)] struct Snapshot { + folders: Vec, info: Vec, selected: Vec, locked: Vec, @@ -545,6 +547,7 @@ struct Snapshot { impl Default for Layout { fn default() -> Self { Self { + folders: Vec::new(), info: vec![ LayerInfo { pivot: [0.5; 2], @@ -593,6 +596,7 @@ impl Default for Layout { impl Layout { fn snapshot(&self) -> Snapshot { Snapshot { + folders: self.folders.clone(), info: self.info.clone(), selected: self.selected.clone(), locked: self.locked.clone(), @@ -602,6 +606,7 @@ impl Layout { } } fn restore(&mut self, s: Snapshot) { + self.folders = s.folders.clone(); self.gesture_error = None; // Selection remains independent of history for surviving IDs. let mut selected = s.selected; diff --git a/crates/midra-layout/src/project.rs b/crates/midra-layout/src/project.rs index b3c8062..8d45d1a 100644 --- a/crates/midra-layout/src/project.rs +++ b/crates/midra-layout/src/project.rs @@ -155,6 +155,7 @@ impl Preview { #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(deny_unknown_fields)] pub struct Project { + pub folders: Vec, pub workspace: Workspace, pub format: String, pub version: u32, @@ -168,9 +169,10 @@ pub struct Project { impl Project { pub fn from_layout(layout: &Layout) -> Self { Self { + folders: layout.folders.clone(), workspace: Workspace::default(), format: FORMAT.into(), - version: 11, + version: 12, next_layer_id: layout.next_id, output_resolution: layout.formats.output.into(), inputs: (0..layout.formats.sources.len()) @@ -219,9 +221,9 @@ impl Project { } /// Build a fresh document only after validating the entire file. No history is restored. pub fn layout(&self) -> Result { - if self.format != FORMAT || self.version != 11 { + if self.format != FORMAT || self.version != 12 { return Err( - "Unsupported project format/version; expected beffroi.midra-layout version 11." + "Unsupported project format/version; expected beffroi.midra-layout version 12." .into(), ); } @@ -250,6 +252,24 @@ impl Project { }; count ]; + if self.folders.len() > 256 + || self + .folders + .iter() + .any(|f| f.trim().is_empty() || f != f.trim() || f.chars().count() > 128) + || self + .folders + .iter() + .collect::>() + .len() + != self.folders.len() + { + return Err( + "Invalid explicit folder names; use up to 256 unique names of 1–128 characters." + .into(), + ); + } + layout.folders = self.folders.clone(); layout.info.clear(); layout.next_id = self.next_layer_id; layout.selected = vec![false; count]; @@ -347,7 +367,8 @@ impl Project { for folder in &w.collapsed_folders { if folder.is_empty() || !folders.insert(folder) - || !self.layers.iter().any(|l| &l.folder == folder) + || (!self.folders.contains(folder) + && !self.layers.iter().any(|l| &l.folder == folder)) { return Err("Collapsed folders must be unique existing folders.".into()); } @@ -392,8 +413,8 @@ impl Project { } let header: Header = serde_json::from_str(text).map_err(|e| format!("Invalid project JSON: {e}"))?; - if !(1..=11).contains(&header.version) { - return Err("Unsupported project version; expected versions 1–11.".into()); + if !(1..=12).contains(&header.version) { + return Err("Unsupported project version; expected versions 1–12.".into()); } let mut migrated: serde_json::Value = if header.version == 1 || header.version == 2 { let mut value: serde_json::Value = @@ -546,6 +567,14 @@ impl Project { ); object.insert("version".into(), 11.into()); } + if header.version <= 11 { + let object = migrated.as_object_mut().ok_or("Invalid project")?; + if object.contains_key("folders") { + return Err("Unexpected folders in old project".into()); + } + object.insert("folders".into(), serde_json::json!([])); + object.insert("version".into(), 12.into()); + } let p: Self = serde_json::from_value(migrated).map_err(|e| format!("Invalid project JSON: {e}"))?; p.layout()?; diff --git a/crates/midra-layout/src/project_ui.rs b/crates/midra-layout/src/project_ui.rs index 2123080..0cc79f4 100644 --- a/crates/midra-layout/src/project_ui.rs +++ b/crates/midra-layout/src/project_ui.rs @@ -91,7 +91,9 @@ impl Editor { .layer_ui .collapsed .iter() - .filter(|folder| p.layers.iter().any(|l| &l.folder == *folder)) + .filter(|folder| { + p.folders.contains(folder) || p.layers.iter().any(|l| &l.folder == *folder) + }) .cloned() .collect(); self.capture.save_workspace(&self.layout, &mut p.workspace); diff --git a/crates/midra-layout/tests/folders.rs b/crates/midra-layout/tests/folders.rs index deed95d..00c48af 100644 --- a/crates/midra-layout/tests/folders.rs +++ b/crates/midra-layout/tests/folders.rs @@ -93,3 +93,69 @@ fn moving_folders_and_layer_membership_preserves_complete_layer_records() { before.to_json().unwrap() ); } + +#[test] +fn explicit_empty_folders_survive_history_save_rename_and_membership_changes() { + let mut layout = Layout::default(); + let before = Project::from_layout(&layout); + layout.create_folder("Memory A").unwrap(); + assert!(layout.folder_members("Memory A").is_empty()); + assert_eq!(Project::from_layout(&layout).layers, before.layers); + layout.undo(); + assert!(layout.folders().is_empty()); + layout.redo(); + let mut p = Project::from_layout(&layout); + p.workspace.collapsed_folders.push("Memory A".into()); + let mut loaded = Project::from_json(&p.to_json().unwrap()) + .unwrap() + .layout() + .unwrap(); + assert_eq!(loaded.folders(), ["Memory A"]); + loaded.rename_folder("Memory A", "Memory B").unwrap(); + loaded.assign_folder(&[1, 2], "Memory B").unwrap(); + loaded.assign_folder(&[1, 2], "").unwrap(); + assert_eq!(loaded.folders(), ["Memory B"]); + assert!(loaded.create_folder("Memory B").is_err()); + assert!(loaded.create_folder(" ").is_err()); + loaded.ungroup_folder("Memory B").unwrap(); + assert!(loaded.folders().is_empty()); + loaded.undo(); + assert_eq!(loaded.folders(), ["Memory B"]); + loaded + .create_folder_with_layers("Together", &[1, 2]) + .unwrap(); + assert_eq!(loaded.folder_members("Together"), [0, 1]); + loaded.undo(); + assert!(!loaded.folders().contains(&"Together".into())); + assert!(loaded.folder_members("").len() == 2); +} + +#[test] +fn version_12_explicit_folder_validation_and_v11_migration() { + let old = include_str!("../../../docs/interfaces/midra-layout-v11.example.json"); + let p = Project::from_json(old).unwrap(); + assert_eq!(p.version, 12); + assert!(p.folders.is_empty()); + let example = include_str!("../../../docs/interfaces/midra-layout-v12.example.json"); + assert_eq!( + Project::from_json(example) + .unwrap() + .layout() + .unwrap() + .folders(), + ["Memory A"] + ); + for names in [ + vec!["".into()], + vec!["Same".into(), "Same".into()], + vec![" padded ".into()], + vec!["x".repeat(129)], + ] { + let mut invalid = p.clone(); + invalid.folders = names; + assert!(invalid.to_json().is_err()); + } + let mut old: serde_json::Value = serde_json::from_str(old).unwrap(); + old["folders"] = serde_json::json!([]); + assert!(Project::from_json(&old.to_string()).is_err()); +} diff --git a/crates/midra-layout/tests/project.rs b/crates/midra-layout/tests/project.rs index 8b69436..bad0a0e 100644 --- a/crates/midra-layout/tests/project.rs +++ b/crates/midra-layout/tests/project.rs @@ -230,7 +230,7 @@ fn persistent_midra_links_roundtrip_migrate_and_undo() { include_str!("../../../docs/interfaces/midra-layout-v5.example.json"), ] { let p = Project::from_json(text).unwrap(); - assert_eq!(p.version, 11); + assert_eq!(p.version, 12); assert!(p.layers.iter().all(|l| l.midra_link.is_none())); } let mut value = serde_json::to_value(&project).unwrap(); @@ -307,7 +307,7 @@ fn position_point_schema_migrates_corners_and_rejects_mislabeled_files() { .unwrap(); old["editor"]["position_corner"] = name.into(); let loaded = Project::from_json(&old.to_string()).unwrap(); - assert_eq!(loaded.version, 11); + assert_eq!(loaded.version, 12); assert_eq!(loaded.editor.position_point, expected); old["editor"]["position_corner"] = "center".into(); assert!(Project::from_json(&old.to_string()).is_err()); @@ -316,7 +316,7 @@ fn position_point_schema_migrates_corners_and_rejects_mislabeled_files() { assert!(Project::from_json(&old.to_string()).is_err()); } let value: serde_json::Value = serde_json::from_str(¤t.to_json().unwrap()).unwrap(); - for version in [0, 12] { + for version in [0, 13] { let mut invalid = value.clone(); invalid["version"] = version.into(); assert!( @@ -357,7 +357,7 @@ fn backdrop_title_roundtrips_and_older_projects_gain_the_default() { } let old = include_str!("../../../docs/interfaces/midra-layout-v6.example.json"); let migrated = Project::from_json(old).unwrap(); - assert_eq!(migrated.version, 11); + assert_eq!(migrated.version, 12); assert_eq!(migrated.editor.backdrop_title, DEFAULT_BACKDROP_TITLE); let mut invalid: serde_json::Value = serde_json::from_str(old).unwrap(); invalid["editor"]["backdrop_title"] = "Unexpected".into(); @@ -428,7 +428,7 @@ fn saved_pivots_roundtrip_and_old_projects_default_to_center() { assert_eq!(loaded.layer_info(0).pivot, custom); assert_eq!(loaded.layer_info(1).pivot, [0.5; 2]); let example = include_str!("../../../docs/interfaces/midra-layout-v9.example.json"); - assert_eq!(Project::from_json(example).unwrap().version, 11); + assert_eq!(Project::from_json(example).unwrap().version, 12); let old = include_str!("../../../docs/interfaces/midra-layout-v8.example.json"); let migrated = Project::from_json(old).unwrap(); assert!(migrated.layers.iter().all(|l| l.pivot == [0.5; 2])); @@ -460,7 +460,7 @@ fn reference_collection_migrates_single_images_and_rejects_mislabeled_or_oversiz let reference = serde_json::json!({"name":"guide.png","image_base64":STANDARD.encode(b"image bytes"),"visible":false,"opacity":0.4,"preserve_ratio":true,"native_size":false,"offset":[0.0,0.0]}); old["reference"] = reference.clone(); let migrated = Project::from_json(&old.to_string()).unwrap(); - assert_eq!(migrated.version, 11); + assert_eq!(migrated.version, 12); assert_eq!(migrated.references.len(), 1); assert!(!migrated.references[0].visible); assert_eq!(migrated.references[0].opacity, 0.4); @@ -480,7 +480,7 @@ fn reference_collection_migrates_single_images_and_rejects_mislabeled_or_oversiz gallery.references = vec![migrated.references[0].clone(); 33]; assert!(gallery.to_json().unwrap_err().contains("32 reference")); let example = include_str!("../../../docs/interfaces/midra-layout-v10.example.json"); - assert_eq!(Project::from_json(example).unwrap().version, 11); + assert_eq!(Project::from_json(example).unwrap().version, 12); } #[test] diff --git a/docs/interfaces/midra-extra-parameters.md b/docs/interfaces/midra-extra-parameters.md index da94444..326a664 100644 --- a/docs/interfaces/midra-extra-parameters.md +++ b/docs/interfaces/midra-extra-parameters.md @@ -26,7 +26,7 @@ external editor moves/resizes a shape without updating the embedded snapshot. | DWG | Not enabled | DXF comments do not provide a reliable binary-DWG carrier. XRECORD/XData are potential future paths, but the current Craft conversion bridge has no verified application-payload round trip. No bytes are appended to the binary file. | | Figma FIG | Not enabled | Figma has plugin data, but the installed FigCraft 0.5.1 native exporter explicitly warns `plugin data was left out`. Its model field is not evidence of native preservation. | | Illustrator AI | Not enabled | PDF-compatible AI can have document metadata, but the current VectorCraft SVG↔AI conversion path has no verified application-payload preservation. No unverified PDF/AI trailer changes are made. | -| Midra project JSON | Already complete | Project v11 remains the authoritative full-fidelity save. This task does not change its schema. | +| Midra project JSON | Already complete | Project v12 remains the authoritative full-fidelity save. This task does not change its schema. | Unsupported codecs disable the option with an explanation. Programmatic attempts to request the extension on those codecs fail explicitly, never silently discard @@ -35,7 +35,7 @@ it. Vendor availability and the `no_proprietary` build flag still apply. ## Payload contract (extension version 1) `BASE64` is standard padded RFC 4648 base64 of UTF-8, pretty-printed -[project JSON](midra-layout.md), currently version 11. It is inert data, not an +[project JSON](midra-layout.md), currently version 12. It is inert data, not an executable instruction, URL or file path. Project format/version and validation remain authoritative. Future incompatible carrier/payload meanings require a new extension version and explicit migration or rejection. @@ -44,7 +44,7 @@ The snapshot includes only exported layer IDs, in document stack order, with full-precision bounds, names, folders, visibility, locks, pivots, Midra links, source/input crop and advanced crop. Only referenced input slots are included; source IDs are remapped consecutively, preserving shared source relationships. -Selection and collapsed folders are filtered to retained layers. Output resolution, +Selection, explicit folders and collapsed folders are filtered to retained layers; unrelated empty folders are omitted. Output resolution, positioning, camera, guide and workspace settings remain available. Pixel-rounded artwork and full-precision stored coordinates are intentionally distinct. diff --git a/docs/interfaces/midra-layout-exchange.md b/docs/interfaces/midra-layout-exchange.md index 1115b8b..e02eadf 100644 --- a/docs/interfaces/midra-layout-exchange.md +++ b/docs/interfaces/midra-layout-exchange.md @@ -3,7 +3,7 @@ The Export menu writes **SVG v2**, **draw.io v1**, **geometry JSON v1**, **geometry CSV v1**, **DXF/DWG**, **HTML/CSS v1**, **PPTX**, **Figma FIG** and **Illustrator AI** (the latter via a local VectorCraft CLI). Project -JSON is version 11 and is the full-fidelity save format. These exchanges +JSON is version 12 and is the full-fidelity save format. These exchanges preserve layer **visible-box geometry**, not sources, crop settings, zoom, pivots, Midra links, locks, visibility, camera or selection. Pictures illustrate current cropping; importing a picture does not reconstruct its crop or source settings. @@ -381,7 +381,7 @@ and Autodesk's [DXF group-code reference](https://help.autodesk.com/cloudhelp/20 Multiple references are flattened into the same single background image in artwork-capable exports; no format version changes. Reimport reconstructs that background as a geometry/artwork item, not the editable reference collection. -Use project JSON v11 to preserve independent images and visibility. +Use project JSON v12 to preserve independent images and visibility. ### QCAD interoperability check diff --git a/docs/interfaces/midra-layout-persistence-audit.md b/docs/interfaces/midra-layout-persistence-audit.md index c4bbdef..e9600b6 100644 --- a/docs/interfaces/midra-layout-persistence-audit.md +++ b/docs/interfaces/midra-layout-persistence-audit.md @@ -2,7 +2,7 @@ Audited against the editor, project loader, application settings, capture controls, layer tree, format properties, import/export controls and device transfer state. -Implemented with [project version 11](midra-layout.md). This is an ownership audit: +Implemented with [project version 12](midra-layout.md). This is an ownership audit: not every control should become document data. | Parameters | Owner and decision | @@ -11,7 +11,7 @@ not every control should become document data. | Layer position, dimensions, stacking order | Project: full-precision bounds and array order; display/export rounding never changes the saved values. | | Input format, native dimensions, custom input crop, shared input slot | Project: `inputs` and layer `source_id`, already saved. | | Layer format, dynamic crop, zoom and offset | Project: final bounds and advanced crop, already saved. Zoom/offset/aspect are derived from these authoritative values. | -| Names, stable IDs, next ID, folder membership, visibility, lock, pivot | Project, already saved. Folder visibility/locking acts on members, so there is no separate state to save. Empty folders are not document objects. | +| Names, stable IDs, next ID, folder membership, visibility, lock, pivot | Project, already saved. Folder visibility/locking acts on members, so there is no separate state to save. Explicit folder names are saved separately in project v12 and may have no members. | | Device screen/layer mapping | Project, already saved per layer. Physical source routing is separate and is not silently changed by a geometry send. | | Reference images, order, visibility, opacity, fit/native sizing, offset | Project, already embedded. Focused reference row is temporary. | | Selected layers, viewport zoom/pan, positioning origins | Project, already saved. Selection is validated against visible/unlocked IDs. | @@ -33,11 +33,11 @@ not every control should become document data. The [application settings contract](midra-layout-settings.md) is unchanged (v8). The [recovery envelope](midra-layout-recovery.md) is unchanged (v1); its nested -project migrates to v11. Geometry export representations are unchanged and omit +project migrates to v12. Geometry export representations are unchanged and omit capture images/settings; optional fixed-reference backgrounds retain their existing behavior. -Regression coverage includes current-schema round trips, versions 1–10 migration, +Regression coverage includes current-schema round trips, versions 1–11 migration, invalid assignments/settings and unknown/missing fields, embedded-still decoding, atomic failure on malformed images, cleared stale previews, restore-without-fetch, manual resumption eligibility and saved resize setup. The guide and example JSON diff --git a/docs/interfaces/midra-layout-recovery.md b/docs/interfaces/midra-layout-recovery.md index 948ba1f..6821cd7 100644 --- a/docs/interfaces/midra-layout-recovery.md +++ b/docs/interfaces/midra-layout-recovery.md @@ -7,7 +7,7 @@ not a named project export. Headless/default editors never access this path. | Field | Meaning | | --- | --- | | `version` | Integer `1`; other versions rejected | -| `project` | Complete [project v11](midra-layout.md), including embedded reference bytes; its units, precision and validation apply without display rounding | +| `project` | Complete [project v12](midra-layout.md), including embedded reference bytes; its units, precision and validation apply without display rounding | | `project_path` | Last opened/successfully saved named JSON path, or null; geometry exports do not change it | | `manual_saved_at` | Unix UTC seconds of the last successful explicit project save, or null when unknown; recovery and measurement-point autosaves do not update it | @@ -34,7 +34,7 @@ last successful writer wins. Recovery retains applied values only: no undo history, pending text/format/import drafts, transient tools, or credentials. A normal exit cancels unfinished canvas gestures before the final checkpoint. The schema does not replace named project -JSON: Save continues to emit a bare project v11 document. Opening/New replaces the +JSON: Save continues to emit a bare project v12 document. Opening/New replaces the single recovery slot; New warns with the manual-save age and Save/Discard/Cancel. A failed or cancelled manual save never completes Save-and-create-new. @@ -43,6 +43,6 @@ A failed or cancelled manual save never completes Save-and-create-new. Future breaking envelope changes require a version bump and explicit migration or rejection. Recovery is not an interchange format; use Save for portable files. -Recovery envelope version 1 is unchanged. Nested project versions 1–10 migrate +Recovery envelope version 1 is unchanged. Nested project versions 1–11 migrate through the normal project loader before typed decoding, including the former single `reference` field. All reference images and visibility settings are saved. diff --git a/docs/interfaces/midra-layout-v12.example.json b/docs/interfaces/midra-layout-v12.example.json new file mode 100644 index 0000000..5704273 --- /dev/null +++ b/docs/interfaces/midra-layout-v12.example.json @@ -0,0 +1,132 @@ +{ + "format": "beffroi.midra-layout", + "version": 12, + "output_resolution": { + "width": 1920, + "height": 1080 + }, + "inputs": [ + { + "id": 1, + "source_format": "sixteen_nine", + "native_resolution": { + "width": 1920, + "height": 1080 + }, + "input_crop": { + "left": 0.0, + "right": 0.0, + "top": 0.0, + "bottom": 0.0 + } + }, + { + "id": 2, + "source_format": "sixteen_nine", + "native_resolution": { + "width": 1920, + "height": 1080 + }, + "input_crop": { + "left": 0.0, + "right": 0.0, + "top": 0.0, + "bottom": 0.0 + } + } + ], + "layers": [ + { + "id": 2, + "source_id": 1, + "bounds": { + "x": 120.0, + "y": 180.0, + "width": 640.0, + "height": 360.0 + }, + "advanced_crop": { + "left": 0.0, + "right": 0.0, + "top": 0.0, + "bottom": 0.0 + }, + "visible": true, + "locked": false, + "name": "Slides", + "folder": "", + "midra_link": null, + "pivot": [ + 0.5, + 0.5 + ] + }, + { + "id": 1, + "source_id": 2, + "bounds": { + "x": 1160.0, + "y": 180.0, + "width": 640.0, + "height": 360.0 + }, + "advanced_crop": { + "left": 0.0, + "right": 0.0, + "top": 0.0, + "bottom": 0.0 + }, + "visible": true, + "locked": false, + "name": "Presenter", + "folder": "", + "midra_link": null, + "pivot": [ + 0.5, + 0.5 + ] + } + ], + "editor": { + "backdrop_title": "Example Conference Name", + "selected_layer_ids": [ + 1 + ], + "position_point": "top_left", + "keep_aspect_ratio": true, + "viewport_zoom": 1.0, + "viewport_pan": [ + 0.0, + 0.0 + ], + "show_source_pattern": false, + "show_toolbar_icon_names": false, + "outline_layers": false, + "position_layer_point": null + }, + "next_layer_id": 3, + "references": [], + "workspace": { + "snapping": { + "enabled": false, + "pixels": true, + "screen_edges": true, + "layer_edges": true, + "grid": false, + "show_grid": true, + "grid_divisions": [ + 8, + 6 + ] + }, + "resize_mode": "individual", + "grid_spacing": null, + "collapsed_folders": [], + "capture_interval_seconds": 10, + "show_empty_inputs": false, + "previews": [] + }, + "folders": [ + "Memory A" + ] +} diff --git a/docs/interfaces/midra-layout.md b/docs/interfaces/midra-layout.md index 1382514..af262ff 100644 --- a/docs/interfaces/midra-layout.md +++ b/docs/interfaces/midra-layout.md @@ -5,7 +5,7 @@ These are offline editor formats, not Analog Way REST payloads. Implementation: [`project.rs`](../../crates/midra-layout/tests/project.rs). Update this contract, examples and tests in the same change as any save/export schema change. -## Project JSON, version 11 +## Project JSON, version 12 Suggested filename: `layout.midra.json`. Encoding: UTF-8, pretty-printed JSON, with a trailing newline. A project preserves applied document values at their @@ -18,10 +18,10 @@ and `next_layer_id: 3`; other values are preserved. The [version 1 example](midra-layout-v1.example.json) remains a migration fixture. Version 4 adds `editor.outline_layers: false`, and reference `native_size: false` and `offset: [0, 0]` when migrating versions 1–3. Old fitting behavior is preserved. -Version 5 adds required `midra_link` to every layer. Versions 1–4 migrate with null links; links cannot be supplied under an older version. Version 6 renames `editor.position_corner` to `editor.position_point` and adds `center`. Versions 1–5 retain their original corner; center and the new field are rejected in those older schemas. Version 7 adds `editor.backdrop_title`; versions 1–6 gain `"Example Conference Name"` and cannot supply this field under the old schema. Version 8 adds required `editor.position_layer_point`: null keeps matched points; a point enables independent measurement. Versions 1–7 migrate to null and cannot supply this field. Version 9 adds required `layers[].pivot`; versions 1–8 migrate to `[0.5, 0.5]` and cannot supply this field. Version 10 replaces `reference` with the required ordered `references` array. Versions 1–9 migrate null to `[]` and a single image to a one-element array, preserving all image settings. Version 11 adds required `workspace` settings and embedded layer previews. Versions 1–10 gain the documented workspace defaults, with no captures or collapsed folders; supplying `workspace` in an older schema is rejected. Saving always writes version 11; older applications reject it. +Version 5 adds required `midra_link` to every layer. Versions 1–4 migrate with null links; links cannot be supplied under an older version. Version 6 renames `editor.position_corner` to `editor.position_point` and adds `center`. Versions 1–5 retain their original corner; center and the new field are rejected in those older schemas. Version 7 adds `editor.backdrop_title`; versions 1–6 gain `"Example Conference Name"` and cannot supply this field under the old schema. Version 8 adds required `editor.position_layer_point`: null keeps matched points; a point enables independent measurement. Versions 1–7 migrate to null and cannot supply this field. Version 9 adds required `layers[].pivot`; versions 1–8 migrate to `[0.5, 0.5]` and cannot supply this field. Version 10 replaces `reference` with the required ordered `references` array. Versions 1–9 migrate null to `[]` and a single image to a one-element array, preserving all image settings. Version 11 adds required `workspace` settings and embedded layer previews. Versions 1–10 gain the documented workspace defaults, with no captures or collapsed folders; supplying `workspace` in an older schema is rejected. Version 12 adds required `folders`, the explicit folder names that survive without members. Versions 1–11 gain `folders: []`, preserving their existing implicit layer grouping; supplying this field under an older version is rejected. Saving always writes version 12; older applications reject it. Incompatible files are never partially applied. -[Complete example](midra-layout-v11.example.json) is a valid default project, +[Complete example](midra-layout-v12.example.json) is a valid project with an empty `Memory A` folder, without a reference image. New projects label the lower layer `02 / Slides` and the upper layer `01 / Presenter`; existing projects retain their saved IDs/names. It is loaded by the regression tests. @@ -29,7 +29,8 @@ It is loaded by the regression tests. | Root field | Representation / meaning | | --- | --- | | `format` | Exactly `"beffroi.midra-layout"` | -| `version` | Integer `11` | +| `version` | Integer `12` | +| `folders` | Required array of 0–256 unique explicit folder names, each trimmed and 1–128 characters. Explicit folders remain even with no members; layer folder labels also form implicit groups. | | `next_layer_id` | Positive integer strictly greater than every layer ID; not rewound by undo | | `output_resolution` | `{ "width": integer, "height": integer }`, screen pixels | | `inputs` | 1–1024 input objects, consecutive IDs starting at 1 | @@ -141,7 +142,7 @@ files require explicit replacement confirmation for Save/exports. Measurement-po clicks and the independent-point toggle are an exception: they reread the current project and atomically update only `editor.position_point` and `editor.position_layer_point`, preserving its other stored values (including external edits). -Older schemas migrate to v11 on this write. No project path is stored in settings; +Older schemas migrate to v12 on this write. No project path is stored in settings; new documents require a first Save. Geometry exports never change the active project path. Missing/invalid/unwritable projects are left untouched and an error is shown; active in-memory choices remain available for a manual Save. A failed no-overwrite write @@ -177,7 +178,7 @@ IDs, source references, crops and Midra links. A layer row drop changes membersh stacking together in one history step. Folder eye/lock actions update each member's `visible`/`locked` flags atomically; Undo restores mixed prior states. Folder selection respects each member's visibility/lock. Collapse state is saved in `workspace.collapsed_folders`, but omitted -from geometry exports; an empty group disappears when its last member leaves. +from plain geometry exports. Explicitly created folders remain when their last member leaves; legacy implicit groups disappear when empty. Empty folder rows can be renamed or deleted, and accept dropped layers. Creating/removing/renaming folders is undoable. Folder stacking movement requires members; empty folders are listed after the layer-backed groups. Geometry exports continue to omit folders. ## Legacy SVG geometry exchange, version 1 @@ -221,7 +222,7 @@ and `viewBox="0 0 W H"` equal to the output screen. The root carries ## Compatibility changes -Project version 11 and the versioned geometry exchanges are strict contracts. A breaking project field/meaning change must bump +Project version 12 and the versioned geometry exchanges are strict contracts. A breaking project field/meaning change must bump `version` and either implement a tested migration or clearly reject older/newer files. Changing rectangle/marker semantics requires a corresponding documented exchange-interface revision and importer tests. Update this document and its example @@ -239,7 +240,7 @@ retarget existing links; choosing a destination there explicitly replaces that layer's saved link. Direct send/load actions use each layer's saved screen, independently of the screen currently displayed in the configuration window. -Automatic session recovery wraps this project representation in a separate [recovery file](midra-layout-recovery.md); named project JSON is version 11. +Automatic session recovery wraps this project representation in a separate [recovery file](midra-layout-recovery.md); named project JSON is version 12. ## Folder-scoped Midra transfers @@ -273,7 +274,7 @@ migration rules are unchanged. These IDs do not select or route physical inputs. | `snapping` | Required booleans `enabled` (false), `pixels` (true), `screen_edges` (true), `layer_edges` (true), `grid` (false), `show_grid` (true), and `grid_divisions` (two integers 1–64, default `[8,6]`). These override application defaults for the opened project. | | `resize_mode` | `individual` (default), `same`, `mirror`, or `opposite` | | `grid_spacing` | null (default), 10 or 100, in output pixels | -| `collapsed_folders` | Unique existing nonempty folder names; default `[]`. Deleted/renamed stale entries are omitted when saving. | +| `collapsed_folders` | Unique existing nonempty folder names (including empty explicit folders); default `[]`. Deleted/renamed stale entries are omitted when saving. | | `capture_interval_seconds` | Integer 5–300, default 10 | | `show_empty_inputs` | Boolean, default false | | `previews` | Array with at most one entry per existing layer; default `[]` | diff --git a/docs/midra-layout/changelog.md b/docs/midra-layout/changelog.md index 6affd81..c60e9a3 100644 --- a/docs/midra-layout/changelog.md +++ b/docs/midra-layout/changelog.md @@ -4,6 +4,13 @@ ## Unreleased +- Make the folder icon create an empty folder without moving selected layers; use + one tooltip. Both layer-list and viewport Move to folder menus move all selected + layers when invoked on a selected layer. Empty folders support rename/delete, + undo and save/load in project v12, with v1–v11 migration. Added folder lifecycle + and context-menu selection regression tests. + + - Add opt-in extra Midra parameters to SVG, draw.io, geometry JSON/CSV, ASCII DXF, HTML and PPTX, using metadata/custom fields or comments. Geometry remains editable; explicit Restore parameters from export recovers the original snapshot diff --git a/docs/midra-layout/guide/editing.md b/docs/midra-layout/guide/editing.md index 0b87f3a..0b2b858 100644 --- a/docs/midra-layout/guide/editing.md +++ b/docs/midra-layout/guide/editing.md @@ -10,16 +10,18 @@ unlocked layers. Shift-click adds/removes its contents from the selection. Double-click a folder or layer name to rename it. Folder eye and lock icons apply to every member; Undo restores each member's previous state, including mixed states. -Select layers and choose the **Create folder** icon to group them. Drag a layer onto a folder +Use the **Create folder** icon to create an empty folder, regardless of selection. Drag a layer onto a folder name to move it inside, or onto **LAYERS** to return it to the root. Dropping on another layer also changes stacking order and adopts that layer's folder. Drag folder names above/below another folder to reorder all their layers as one block. Right-click offers rename, selection, visibility, locking, moving up/down, and **Ungroup folder** (keeps the layers). A layer's right-click **Move to folder** -menu also offers existing folders, the root, and a new folder. +menu also offers existing folders, the root, and a new folder. Right-click a selected layer in either the list or viewport to move all selected layers together; right-click an unselected layer to move only that layer. -Folders are local, single-level groups stored with their layers. Empty folders -are removed automatically; collapse state lasts for this session. The existing +Folders are local, single-level groups. Explicitly created folders survive empty, +can be renamed or deleted, and are saved with their collapse state. Legacy groups +created only by layer labels still disappear when empty. Empty folders appear +after the layer-backed groups; stacking movement applies to folders with layers. The existing **Manage layers and folders** remains available for bulk name/folder editing. Grouping does not affect device links or source assignments. All document edits support Undo. @@ -148,6 +150,6 @@ Stable IDs survive removal and are independent of Midra layer numbers. Group movement, alignment and Same-handles resizing work across the selection; Mirror/Opposite resizing still require exactly two layers. -Project JSON is version 11, with tested migration from older supported versions. +Project JSON is version 12, with tested migration from older supported versions. Every format’s **Selected layers…** action exports just the current selection, including a single layer. All/visible export remains available. diff --git a/docs/midra-layout/plan.md b/docs/midra-layout/plan.md index 1e4018c..4ea988c 100644 --- a/docs/midra-layout/plan.md +++ b/docs/midra-layout/plan.md @@ -44,7 +44,7 @@ device readback and physical-screen acceptance. PPTX, FIG and AI through VectorCraft. Shared geometry, scope and review, optional artwork where supported, page/frame selection and licensing build flag. Two-layer Full HD and UHD templates exist for all ten formats. -- [x] Project JSON v11, tested legacy/recovery migration, saved layer links, +- [x] Project JSON v12, tested legacy/recovery migration, saved layer links, central application preferences, full Settings, themes and recent-theme list. - [x] Separate Midra connection and mapping/transfer controls, saved address, optional startup connection, online status, explicit direct linked send/load