Add explicit scenario group reorder App interaction and guarded preview

crates/oa-desktop/src/app.rs

@@ -26,6 +26,7 @@ mod review_navigation_tests;
 mod scenario_details_tests;
 mod scenario_diagram;
 mod scenario_multiselect;
+pub(crate) mod scenario_reorder;
 mod scenario_spacing;
 #[cfg(test)]
 mod source_indentation_tests;
@@ -441,6 +442,7 @@ pub enum Message {
     BehaviorDiagram(Choice),
     StateDiagram(crate::behavior::state_edit::Event),
     ScenarioCanvas(crate::behavior::scenario::CanvasEvent),
+    ScenarioReorder(Box<scenario_reorder::Event>),
     TopologyCanvas(crate::behavior::topology::CanvasEvent),
     PlaceSelected,
     HideSelected,
@@ -527,6 +529,7 @@ pub struct App {
     pub guide: crate::guide::State,
     pub traceability: crate::views::traceability::State,
     pub behavior: crate::behavior::State,
+    pub(crate) scenario_reorder: scenario_reorder::State,
     pub data_state: crate::data_view::State,
     pub inspector_tab: crate::navigation::InspectorTab,
     pub layer: Layer,
@@ -649,6 +652,7 @@ impl App {
             guide: crate::guide::State::default(),
             traceability: Default::default(),
             behavior: Default::default(),
+            scenario_reorder: Default::default(),
             data_state: Default::default(),
             inspector_tab: Default::default(),
             layer,
@@ -1352,6 +1356,11 @@ impl App {
         ])
     }
     pub fn update(&mut self, message: Message) -> Task<Message> {
+        // Captured reorder packets must be admitted before shared navigation,
+        // camera or source boundaries can disturb a newer operation.
+        if let Message::ScenarioReorder(event) = message {
+            return self.scenario_reorder_event(*event);
+        }
         if let Message::ScenarioCanvas(behavior::scenario::CanvasEvent::Selection(event)) = message
         {
             return self.scenario_selection_event(*event);
@@ -1664,6 +1673,7 @@ impl App {
         if preview_read_only && self.process_preview_primary().is_none() && self.draft.is_none() {
             self.refresh_draft();
         }
+        self.scenario_reorder_reconcile();
         task
     }
     fn behavior_control(&mut self, intent: behavior::canvas_workspace::Intent) -> Task<Message> {
@@ -2214,6 +2224,7 @@ impl App {
             }
             Message::CheckpointLoaded(result) => return self.checkpoint_loaded(result),
             Message::Hosted(event) => return self.hosted_event(event),
+            Message::ScenarioReorder(event) => return self.scenario_reorder_event(*event),
             Message::ScenarioCanvas(event) => {
                 use crate::behavior::scenario::{self, CanvasEvent};
                 let context = event.context();
@@ -2758,7 +2769,10 @@ impl App {
                     || (menu.request.process.is_some()
                         && matches!(*action, Message::TopologyCanvas(_)))
                     || (menu.request.scenario.is_some()
-                        && matches!(*action, Message::ScenarioCanvas(_)))
+                        && matches!(
+                            *action,
+                            Message::ScenarioCanvas(_) | Message::ScenarioReorder(_)
+                        ))
                 {
                     return self.update(*action);
                 }
@@ -2801,6 +2815,10 @@ impl App {
                 return self.update(Message::Add(child));
             }
             Message::Escape => {
+                if self.scenario_reorder.session.is_some() {
+                    self.scenario_reorder_cancel();
+                    return Task::none();
+                }
                 let restore_source_focus = self.source_navigation_available()
                     && (self.source_navigation.open || self.text_workspace.drawer().is_some());
                 let dismiss_find_only = restore_source_focus && self.source_navigation.open;