From da586bc048c7ce30774e8e05f3a2eee80b1b4ba1 Mon Sep 17 00:00:00 2001 From: Colin Faulkingham Date: Mon, 2 Nov 2026 00:09:23 +0000 Subject: [PATCH] Fix viewport Unisolate after isolating a component (#9894) (#10635) * claim: #9894 * Fix viewport recovery after component isolation --- crates/ui-egui/src/context_menu.rs | 8 +++--- crates/ui-egui/src/occurrence_ui_tests.rs | 32 +++++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/crates/ui-egui/src/context_menu.rs b/crates/ui-egui/src/context_menu.rs index 427284ab2..b1b10ee42 100644 --- a/crates/ui-egui/src/context_menu.rs +++ b/crates/ui-egui/src/context_menu.rs @@ -734,11 +734,11 @@ fn viewport_items(app: &SolveApp) -> Vec { v.push(act("ui.fit", "Fit", "fit")); v.push(act("ui.home", "Home View", "home")); v.push(Item::sep()); - let anything_hidden = !app.session.visibility.hidden_bodies.is_empty() - || !app.session.visibility.hidden_sketches.is_empty() - || !app.session.visibility.hidden_folders.is_empty(); + let can_unisolate = !app.session.visibility.hidden_bodies.is_empty() || !app.session.visibility.hidden_occurrences.is_empty(); + let anything_hidden = + can_unisolate || !app.session.visibility.hidden_sketches.is_empty() || !app.session.visibility.hidden_folders.is_empty(); v.push(act("ui.showAll", "Show All", "eye").on(anything_hidden)); - v.push(act("ui.showAll", "Unisolate", "eye").on(!app.session.visibility.hidden_bodies.is_empty())); + v.push(act("ui.showAll", "Unisolate", "eye").on(can_unisolate)); v.push(Item::sep()); v.push(cmd(app, "solid.extrude", "Extrude")); v.push(cmd(app, "solid.fillet", "Fillet")); diff --git a/crates/ui-egui/src/occurrence_ui_tests.rs b/crates/ui-egui/src/occurrence_ui_tests.rs index 638f95f40..593be1132 100644 --- a/crates/ui-egui/src/occurrence_ui_tests.rs +++ b/crates/ui-egui/src/occurrence_ui_tests.rs @@ -34,6 +34,38 @@ fn fixture() -> (Harness, u64, u64, u64) { (h, component, first, second) } +#[test] +fn viewport_restores_isolated_occurrences_and_undo_restores_isolation() { + for label in ["Show All", "Unisolate"] { + let (mut h, _, first, second) = fixture(); + h.app.session.selection.clear(); + let menu_item = + |h: &Harness, label: &str| context_menu::items(&h.app, &Target::Viewport).into_iter().find(|item| item.label == label).unwrap(); + assert!(!menu_item(&h, label).enabled, "nothing is hidden yet"); + let isolate = + context_menu::items(&h.app, &Target::Occurrence { path: vec![first] }).into_iter().find(|item| item.label == "Isolate").unwrap(); + context_menu::run_item(&mut h.app, &isolate, egui::Pos2::ZERO); + assert!(h.app.session.visibility.hidden_bodies.is_empty()); + assert_eq!(h.app.session.visibility.hidden_occurrences, vec![vec![second]]); + let other_body = h.app.session.occurrence_bodies(&[second], false).unwrap()[0].clone(); + assert!(!h.app.session.body_visible(&other_body)); + + let restore = menu_item(&h, label); + assert!(restore.enabled, "{label} must restore a hidden component instance"); + let undo = h.app.session.undo.len(); + context_menu::run_item(&mut h.app, &restore, egui::Pos2::ZERO); + assert!(h.app.session.visibility.hidden_occurrences.is_empty()); + assert!(h.app.session.body_visible(&other_body)); + assert_eq!(h.app.session.undo.len(), undo + 1, "restoring visibility is one undo step"); + assert!(!menu_item(&h, label).enabled, "all component instances are visible again"); + + h.app.run("edit.undo", json!({})).unwrap(); + assert_eq!(h.app.session.visibility.hidden_occurrences, vec![vec![second]]); + assert!(!h.app.session.body_visible(&other_body)); + assert!(menu_item(&h, label).enabled); + } +} + #[test] fn folder_visibility_shortcut_targets_only_the_clicked_placement() { let (mut h, component, first, second) = fixture();