Remove legacy traverse module in core

core/src/state/notebook.rs

@@ -9,7 +9,7 @@ use {
         types::DirectoryId,
         Error, Event, Glues, NotebookTransition, Result,
     },
-    consume::{directory, note, tabs, traverse},
+    consume::{directory, note, tabs},
 };
 
 pub use inner_state::{

core/src/state/notebook/consume.rs

@@ -1,4 +1,3 @@
 pub mod directory;
 pub mod note;
 pub mod tabs;
-pub mod traverse;

core/src/state/notebook/inner_state/directory_selected.rs

@@ -1,6 +1,6 @@
 use crate::{
     db::Db,
-    state::notebook::{directory, note, tabs, traverse, InnerState, NotebookState},
+    state::notebook::{directory, note, tabs, InnerState, NotebookState},
     Error, Event, KeyEvent, NotebookEvent, NotebookTransition, Result,
 };
 
@@ -51,8 +51,8 @@ pub async fn consume(
 
             directory::close(state, parent)
         }
-        Key(KeyEvent::J | KeyEvent::Down) => traverse::select_next(state),
-        Key(KeyEvent::K | KeyEvent::Up) => traverse::select_prev(state),
+        Key(KeyEvent::J | KeyEvent::Down) => Ok(NotebookTransition::SelectNext(1)),
+        Key(KeyEvent::K | KeyEvent::Up) => Ok(NotebookTransition::SelectPrev(1)),
         Key(KeyEvent::M) => {
             let directory = state.get_selected_directory()?.clone();
 

core/src/state/notebook/inner_state/note_selected.rs

@@ -1,6 +1,6 @@
 use crate::{
     db::Db,
-    state::notebook::{directory, note, tabs, traverse, InnerState, NotebookState},
+    state::notebook::{directory, note, tabs, InnerState, NotebookState},
     Error, Event, KeyEvent, NotebookEvent, NotebookTransition, Result,
 };
 
@@ -35,8 +35,8 @@ pub async fn consume(
 
             directory::close(state, directory)
         }
-        Key(KeyEvent::J | KeyEvent::Down) => traverse::select_next(state),
-        Key(KeyEvent::K | KeyEvent::Up) => traverse::select_prev(state),
+        Key(KeyEvent::J | KeyEvent::Down) => Ok(NotebookTransition::SelectNext(1)),
+        Key(KeyEvent::K | KeyEvent::Up) => Ok(NotebookTransition::SelectPrev(1)),
         Key(KeyEvent::M) => {
             let note = state.get_selected_note()?.clone();
 

core/src/transition.rs

@@ -65,8 +65,6 @@ pub enum NotebookTransition {
     BrowseNoteTree,
     FocusEditor,
 
-    SelectNote(Note),
-    SelectDirectory(Directory),
     UpdateNoteContent(NoteId),
 
     Alert(String),

tui/src/context/notebook.rs

@@ -255,49 +255,13 @@ impl NotebookContext {
     }
 
     fn consume_on_note_tree_browsing(&mut self, code: KeyCode) -> Action {
-        macro_rules! item {
-            () => {
-                self.tree_state
-                    .selected()
-                    .and_then(|idx| self.tree_items.get(idx))
-                    .log_expect("[NotebookContext::consume] selected must not be empty")
-            };
-        }
-
         match code {
-            KeyCode::Char('j') | KeyCode::Down => {
-                self.tree_state.select_next();
-
-                match self
-                    .tree_state
-                    .selected()
-                    .and_then(|i| self.tree_items.get(i))
-                {
-                    Some(TreeItem::Directory { value, .. }) => {
-                        Action::Dispatch(NotebookEvent::SelectDirectory(value.clone()).into())
-                    }
-                    Some(TreeItem::Note { value, .. }) => {
-                        Action::Dispatch(NotebookEvent::SelectNote(value.clone()).into())
-                    }
-                    None => {
-                        self.tree_state.select_last();
-                        Action::None
-                    }
-                }
-            }
-            KeyCode::Char('k') | KeyCode::Up => {
-                self.tree_state.select_previous();
-
-                match item!() {
-                    TreeItem::Directory { value, .. } => {
-                        Action::Dispatch(NotebookEvent::SelectDirectory(value.clone()).into())
-                    }
-                    TreeItem::Note { value, .. } => {
-                        Action::Dispatch(NotebookEvent::SelectNote(value.clone()).into())
-                    }
-                }
-            }
-            KeyCode::Char('m') => match item!() {
+            KeyCode::Char('m') => match self
+                .tree_state
+                .selected()
+                .and_then(|idx| self.tree_items.get(idx))
+                .log_expect("[NotebookContext::consume] selected must not be empty")
+            {
                 TreeItem::Directory { .. } => {
                     self.directory_actions_state.select_first();