feat: handling quitting on the components not on top level

config/src/default_config.rs

@@ -21,7 +21,6 @@ pub static DEFAULT_CONFIG: &str = r##"
 "0" = "MoveToLineStart"
 "C-d" = "PageDown"
 "C-u" = "PageUp"
-"d" = { "w" = "DeleteWord", "d" = "DeleteLine", "b" = "DeleteBack", "j" = "DeleteCurrAndBelow", "k" = "DeleteCurrAndAbove", "l" = "DeleteCurrentChar", "h" = "DeletePreviousChar" }
 "S-D" = "DeleteUntilEOL"
 "x" = "DeleteCurrentChar"
 "o" = "InsertLineBelow"
@@ -31,12 +30,20 @@ pub static DEFAULT_CONFIG: &str = r##"
 #"/" = { EnterMode = "Search" }
 "i" = { EnterMode = "Insert" }
 "S-I" = ["MoveToLineStart", { EnterMode = "Insert" }]
-
 "S-A" = "InsertAtEOL"
 "S-B" = "MoveAfterWhitespaceReverse"
 "S-W" = "MoveAfterWhitespace"
 "S-X" = "DeletePreviousNonWrapping"
 
+[editor_keys.normal.d]
+"w" = "DeleteWord"
+"d" = "DeleteLine"
+"b" = "DeleteBack"
+"j" = "DeleteCurrAndBelow"
+"k" = "DeleteCurrAndAbove"
+"l" = "DeleteCurrentChar"
+"h" = "DeletePreviousChar"
+
 [editor_keys.insert]
 "Tab" = "InsertTab"
 "Enter" = "InsertLine"

tui/src/components/api_explorer/api_explorer.rs

@@ -135,6 +135,10 @@ impl<'ae> ApiExplorer<'ae> {
 
     #[tracing::instrument(skip_all, err)]
     fn handle_sidebar_key_event(&mut self, key_event: KeyEvent) -> anyhow::Result<Option<Command>> {
+        if let (KeyCode::Char('c'), KeyModifiers::CONTROL) = (key_event.code, key_event.modifiers) {
+            return Ok(Some(Command::Quit));
+        };
+
         match key_event.code {
             KeyCode::Enter => {
                 if let Some(ref req) = self.hovered_request {
@@ -188,6 +192,9 @@ impl<'ae> ApiExplorer<'ae> {
     }
 
     fn handle_req_uri_key_event(&mut self, key_event: KeyEvent) -> anyhow::Result<Option<Command>> {
+        if let (KeyCode::Char('c'), KeyModifiers::CONTROL) = (key_event.code, key_event.modifiers) {
+            return Ok(Some(Command::Quit));
+        };
         match key_event.code {
             KeyCode::Char('i') => self.selected_pane = Some(PaneFocus::Preview),
             KeyCode::Enter => {
@@ -292,6 +299,10 @@ impl<'ae> ApiExplorer<'ae> {
     }
 
     fn handle_preview_key_event(&mut self, key_event: KeyEvent) -> anyhow::Result<Option<Command>> {
+        if let (KeyCode::Char('c'), KeyModifiers::CONTROL) = (key_event.code, key_event.modifiers) {
+            return Ok(Some(Command::Quit));
+        };
+
         match key_event.code {
             KeyCode::Enter => self.selected_pane = Some(PaneFocus::Preview),
             KeyCode::Tab => self.preview_tab = ResViewerTabs::next(&self.preview_tab),

tui/src/components/api_explorer/req_editor.rs

@@ -10,6 +10,7 @@ use ratatui::{
     Frame,
 };
 use reqtui::{
+    command::Command,
     schema::types::Request,
     syntax::highlighter::HIGHLIGHTER,
     text_object::{cursor::Cursor, TextObject, Write},
@@ -460,8 +461,8 @@ impl<'re> ReqEditor<'re> {
     fn move_down(&mut self) {
         let len_lines = self.body.len_lines();
         if self.cursor.row().lt(&len_lines.saturating_sub(1)) {
-            self.maybe_scroll_view();
             self.cursor.move_down(1);
+            self.maybe_scroll_view();
         }
         let current_line_len = self.body.line_len(self.cursor.row());
         self.cursor.maybe_snap_to_col(current_line_len);
@@ -573,6 +574,12 @@ impl Eventful for ReqEditor<'_> {
             return Ok(None);
         }
 
+        if let (KeyCode::Char('c'), KeyModifiers::CONTROL, EditorMode::Normal) =
+            (key_event.code, key_event.modifiers, &self.editor_mode)
+        {
+            return Ok(Some(Command::Quit));
+        };
+
         match self.editor_mode {
             EditorMode::Normal => match self.config.editor_keys.normal.get(&key_str) {
                 Some(KeyAction::Simple(action)) => self.handle_action(action),

tui/src/components/dashboard/dashboard.rs

@@ -550,6 +550,10 @@ impl Component for Dashboard<'_> {
 
 impl Eventful for Dashboard<'_> {
     fn handle_key_event(&mut self, key_event: KeyEvent) -> anyhow::Result<Option<Command>> {
+        if let (KeyCode::Char('c'), KeyModifiers::CONTROL) = (key_event.code, key_event.modifiers) {
+            return Ok(Some(Command::Quit));
+        };
+
         match self.pane_focus {
             PaneFocus::List => self.handle_list_key_event(key_event),
             PaneFocus::Form => self.handle_form_key_event(key_event),

tui/src/screen_manager.rs

@@ -8,7 +8,6 @@ use crate::{
 use reqtui::{command::Command, schema::Schema};
 
 use anyhow::Context;
-use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 use ratatui::{layout::Rect, Frame};
 use tokio::sync::mpsc::UnboundedSender;
 
@@ -126,20 +125,11 @@ impl Component for ScreenManager<'_> {
 
 impl Eventful for ScreenManager<'_> {
     fn handle_event(&mut self, event: Option<Event>) -> anyhow::Result<Option<Command>> {
-        if let Some(Event::Key(KeyEvent {
-            code: KeyCode::Char('c'),
-            modifiers: KeyModifiers::CONTROL,
-            ..
-        })) = event
-        {
-            return Ok(Some(Command::Quit));
-        };
-
         match self.curr_screen {
             Screens::Editor => self
                 .api_explorer
                 .as_mut()
-                .context("should never be able to switch to editor screen without having a schema")?
+                .expect("should never be able to switch to editor screen without having a schema")
                 .handle_event(event),
             Screens::Dashboard => self.dashboard.handle_event(event),
             Screens::TerminalTooSmall => Ok(None),
@@ -150,10 +140,9 @@ impl Eventful for ScreenManager<'_> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use reqtui::schema::types::*;
-
+    use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
     use ratatui::{backend::TestBackend, Terminal};
-    use reqtui::schema;
+    use reqtui::schema::{self, types::*};
     use std::{
         fs::{create_dir, File},
         io::Write,