Fix native Text navigation layout and focus regressions

crates/oa-desktop/src/app.rs

@@ -424,6 +424,7 @@ pub enum Message {
     SourceSymbolsReady(crate::source_navigation::Completion),
     SourceForSelection,
     SourceNavigation(crate::source_navigation::Event),
+    SourceFindClose(crate::source_navigation::SymbolContext, Id),
     Save(bool),
     SavePath(Option<PathBuf>),
     Saved(Result<Option<FileSnapshot>, SaveFailure>),
@@ -497,6 +498,7 @@ pub struct App {
     pub source_jump: Option<text_editor::Cursor>,
     source_select_line: bool,
     pub source_navigation: crate::source_navigation::State,
+    source_find_instance: Id,
     pub source_symbols: crate::source_navigation::SymbolState,
     pub model_issues: Vec<validation::Issue>,
     pub migration: Option<persistence::MigrationReport>,
@@ -603,6 +605,7 @@ impl App {
             source_jump: None,
             source_select_line: false,
             source_navigation: crate::source_navigation::State::default(),
+            source_find_instance: Id::new_v4(),
             source_symbols: crate::source_navigation::SymbolState::default(),
             model_issues,
             migration: None,
@@ -1058,7 +1061,7 @@ impl App {
                 self.behavior.creation.has_pending()
                     || self.behavior.source_active()
                     || (self.page == Page::Text
-                        && self.source_symbols.open
+                        && (self.source_symbols.open || self.source_navigation.open)
                         && self.architecture.is_none()),
             )
             .map(|()| Message::Escape),
@@ -1106,6 +1109,23 @@ impl App {
         ])
     }
     pub fn update(&mut self, message: Message) -> Task<Message> {
+        let message = match message {
+            Message::SourceFindClose(context, instance) => {
+                if context != self.source_symbol_context()
+                    || instance != self.source_find_instance
+                    || !self.source_navigation.open
+                    || !self.source_navigation_available()
+                {
+                    return Task::none();
+                }
+                // Only the checked envelope may enter the legacy Close handler.
+                Message::SourceNavigation(crate::source_navigation::Event::Close)
+            }
+            Message::SourceNavigation(crate::source_navigation::Event::Close) => {
+                return Task::none();
+            }
+            message => message,
+        };
         if let Message::SourceSymbols(context, _) = &message
             && (context.session != self.source_workspace.session()
                 || context.path != self.source_workspace.active)
@@ -1838,6 +1858,8 @@ impl App {
                 return self.update(Message::Add(child));
             }
             Message::Escape => {
+                let restore_source_focus = self.source_navigation_available()
+                    && (self.source_navigation.open || self.source_symbols.open);
                 if self.behavior.source_back() {
                     self.status =
                         "Returned to the unchanged parent form; no source was created.".into();
@@ -1857,6 +1879,9 @@ impl App {
                 self.source_symbols.open = false;
                 self.source_symbols.results = None;
                 self.source_symbols.notice = None;
+                if restore_source_focus {
+                    self.restore_source_editor_focus();
+                }
                 self.canvas_epoch = self.canvas_epoch.wrapping_add(1);
                 self.selected_bend = None;
             }
@@ -2971,6 +2996,7 @@ impl App {
             }
             Message::SourceRelated(location) => self.jump_to_source(location),
             Message::SourceViewport(ticket) => return self.source_viewport(ticket),
+            Message::SourceFindClose(..) => return Task::none(), // update checks and unwraps it
             Message::SourceSymbols(_, event) => return self.source_symbol_event(event),
             Message::SourceSymbolsReady(completion) => {
                 return self.source_symbols_ready(completion);
@@ -3019,6 +3045,7 @@ impl App {
                             return Task::none();
                         }
                         self.page = Page::Text;
+                        self.source_find_instance = Id::new_v4();
                         self.source_navigation.open = true;
                         self.source_navigation.refresh(&self.source_editor.text());
                         return iced::widget::operation::focus(if go_to_line {
@@ -3027,7 +3054,13 @@ impl App {
                             "source-find"
                         });
                     }
-                    Event::Close => self.source_navigation.open = false,
+                    Event::Close => {
+                        let was_open = self.source_navigation.open;
+                        self.source_navigation.open = false;
+                        if was_open {
+                            self.restore_source_editor_focus();
+                        }
+                    }
                     Event::Query(query) => {
                         self.source_navigation.query = query;
                         self.source_navigation.refresh(&self.source_editor.text());