improve interactive mode controls

Author: ozankasikci

src/commands/interactive/command.rs

@@ -167,9 +167,9 @@ where
             KeyCode::Esc | KeyCode::Char('q') => Ok(LoopControl::Exit(None)),
             KeyCode::Tab | KeyCode::BackTab => {
                 if key.code == KeyCode::Tab {
-                    self.focus = self.focus.next();
+                    self.focus_forward();
                 } else {
-                    self.focus = self.focus.prev();
+                    self.focus_backward();
                 }
                 Ok(LoopControl::Continue)
             }
@@ -202,6 +202,52 @@ where
         }
     }
 
+    fn focus_forward(&mut self) {
+        self.focus = match self.focus {
+            Focus::Worktrees => {
+                if self.selected.is_some() {
+                    Focus::Actions
+                } else if super::GLOBAL_ACTIONS.is_empty() {
+                    Focus::Worktrees
+                } else {
+                    Focus::GlobalActions
+                }
+            }
+            Focus::Actions => Focus::Worktrees,
+            Focus::GlobalActions => {
+                if self.selected.is_some() {
+                    Focus::Actions
+                } else {
+                    Focus::Worktrees
+                }
+            }
+        };
+    }
+
+    fn focus_backward(&mut self) {
+        self.focus = match self.focus {
+            Focus::Worktrees => {
+                if self.selected.is_some() {
+                    Focus::Actions
+                } else if super::GLOBAL_ACTIONS.is_empty() {
+                    Focus::Worktrees
+                } else {
+                    Focus::GlobalActions
+                }
+            }
+            Focus::Actions => {
+                if self.selected.is_some() {
+                    Focus::Worktrees
+                } else if super::GLOBAL_ACTIONS.is_empty() {
+                    Focus::Actions
+                } else {
+                    Focus::GlobalActions
+                }
+            }
+            Focus::GlobalActions => Focus::Worktrees,
+        };
+    }
+
     fn handle_enter(&mut self) -> Result<LoopControl> {
         match self.focus {
             Focus::Worktrees => {

src/commands/interactive/mod.rs

@@ -36,24 +36,6 @@ pub(crate) enum Focus {
     GlobalActions,
 }
 
-impl Focus {
-    pub(crate) fn next(self) -> Self {
-        match self {
-            Focus::Worktrees => Focus::Actions,
-            Focus::Actions => Focus::GlobalActions,
-            Focus::GlobalActions => Focus::Worktrees,
-        }
-    }
-
-    pub(crate) fn prev(self) -> Self {
-        match self {
-            Focus::Worktrees => Focus::GlobalActions,
-            Focus::Actions => Focus::Worktrees,
-            Focus::GlobalActions => Focus::Actions,
-        }
-    }
-}
-
 pub(crate) const GLOBAL_ACTIONS: [&str; 2] = ["Create worktree", "Cd to root dir"];
 
 #[derive(Clone, Debug, PartialEq, Eq)]

src/commands/interactive/tests.rs

@@ -203,8 +203,8 @@ fn create_action_adds_new_worktree() -> Result<()> {
     let backend = TestBackend::new(60, 18);
     let terminal = Terminal::new(backend)?;
     let events = StubEvents::new(vec![
-        key(KeyCode::Tab),
-        key(KeyCode::Tab),
+        key(KeyCode::Up),
+        key(KeyCode::Up),
         key(KeyCode::Enter),
         char_key('n'),
         char_key('e'),
@@ -248,8 +248,8 @@ fn cancelling_create_leaves_state_unchanged() -> Result<()> {
     let backend = TestBackend::new(60, 18);
     let terminal = Terminal::new(backend)?;
     let events = StubEvents::new(vec![
-        key(KeyCode::Tab),
-        key(KeyCode::Tab),
+        key(KeyCode::Up),
+        key(KeyCode::Up),
         key(KeyCode::Enter),
         key(KeyCode::Esc),
         key(KeyCode::Esc),
@@ -277,9 +277,7 @@ fn cd_to_root_global_action_exits() -> Result<()> {
     let backend = TestBackend::new(40, 12);
     let terminal = Terminal::new(backend)?;
     let events = StubEvents::new(vec![
-        key(KeyCode::Tab),
-        key(KeyCode::Tab),
-        key(KeyCode::Right),
+        key(KeyCode::Up),
         key(KeyCode::Enter),
     ]);
 
@@ -328,7 +326,6 @@ fn up_from_top_after_tabbing_picks_last_global_action() -> Result<()> {
     let backend = TestBackend::new(40, 12);
     let terminal = Terminal::new(backend)?;
     let events = StubEvents::new(vec![
-        key(KeyCode::Tab),
         key(KeyCode::Tab),
         key(KeyCode::Tab),
         key(KeyCode::Up),

src/commands/interactive/view.rs

@@ -147,7 +147,7 @@ impl Snapshot {
 
         let actions = Paragraph::new(Line::from(spans)).block(
             Block::default()
-                .title("Worktree Actions")
+                .title("Worktree Actions (Tab key)")
                 .borders(Borders::ALL),
         );
         frame.render_widget(actions, detail_chunks[1]);