mouse select support

Author: deepu105

src/app/jwt_decoder.rs

@@ -11,7 +11,7 @@ use serde_derive::{Deserialize, Serialize};
 use serde_json::{to_string_pretty, Value};
 
 use super::{
-  models::{ScrollableTxt, TabRoute, TabsState},
+  models::{BlockState, ScrollableTxt},
   utils::{
     decoding_key_from_jwks_secret, get_secret_from_file_or_input, JWTError, JWTResult, SecretType,
   },
@@ -25,7 +25,7 @@ pub struct Decoder {
   pub payload: ScrollableTxt,
   pub secret: TextInput,
   pub signature_verified: bool,
-  pub blocks: TabsState,
+  pub blocks: BlockState,
   pub utc_dates: bool,
   pub ignore_exp: bool,
   /// do not manipulate directly, use `set_decoded` instead
@@ -38,34 +38,22 @@ impl Decoder {
       encoded: TextInput::new(token.unwrap_or_default()),
       secret: TextInput::new(secret),
       ignore_exp: true,
-      blocks: TabsState::new(vec![
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Decoder,
-            active_block: ActiveBlock::DecoderToken,
-          },
+      blocks: BlockState::new(vec![
+        Route {
+          id: RouteId::Decoder,
+          active_block: ActiveBlock::DecoderToken,
         },
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Decoder,
-            active_block: ActiveBlock::DecoderSecret,
-          },
+        Route {
+          id: RouteId::Decoder,
+          active_block: ActiveBlock::DecoderSecret,
         },
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Decoder,
-            active_block: ActiveBlock::DecoderHeader,
-          },
+        Route {
+          id: RouteId::Decoder,
+          active_block: ActiveBlock::DecoderHeader,
         },
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Decoder,
-            active_block: ActiveBlock::DecoderPayload,
-          },
+        Route {
+          id: RouteId::Decoder,
+          active_block: ActiveBlock::DecoderPayload,
         },
       ]),
       ..Decoder::default()

src/app/jwt_encoder.rs

@@ -2,7 +2,7 @@ use jsonwebtoken::{errors::Error, Algorithm, EncodingKey, Header};
 
 use super::{
   jwt_decoder::Payload,
-  models::{ScrollableTxt, TabRoute, TabsState},
+  models::{BlockState, ScrollableTxt},
   utils::{get_secret_from_file_or_input, JWTError, JWTResult, SecretType},
   ActiveBlock, App, Route, RouteId, TextAreaInput, TextInput,
 };
@@ -14,7 +14,7 @@ pub struct Encoder<'a> {
   pub payload: TextAreaInput<'a>,
   pub secret: TextInput,
   pub signature_verified: bool,
-  pub blocks: TabsState,
+  pub blocks: BlockState,
 }
 
 impl Encoder<'_> {
@@ -29,34 +29,22 @@ impl Encoder<'_> {
     Self {
       header,
       secret: TextInput::new(secret),
-      blocks: TabsState::new(vec![
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Encoder,
-            active_block: ActiveBlock::EncoderHeader,
-          },
+      blocks: BlockState::new(vec![
+        Route {
+          id: RouteId::Encoder,
+          active_block: ActiveBlock::EncoderHeader,
         },
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Encoder,
-            active_block: ActiveBlock::EncoderPayload,
-          },
+        Route {
+          id: RouteId::Encoder,
+          active_block: ActiveBlock::EncoderPayload,
         },
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Encoder,
-            active_block: ActiveBlock::EncoderSecret,
-          },
+        Route {
+          id: RouteId::Encoder,
+          active_block: ActiveBlock::EncoderSecret,
         },
-        TabRoute {
-          title: "".into(),
-          route: Route {
-            id: RouteId::Encoder,
-            active_block: ActiveBlock::EncoderToken,
-          },
+        Route {
+          id: RouteId::Encoder,
+          active_block: ActiveBlock::EncoderToken,
         },
       ]),
       ..Encoder::default()

src/app/mod.rs

@@ -4,6 +4,8 @@ pub(crate) mod key_binding;
 pub(crate) mod models;
 pub(crate) mod utils;
 
+use std::collections::HashMap;
+
 use ratatui::layout::Rect;
 use tui_input::Input;
 use tui_textarea::TextArea;
@@ -16,7 +18,7 @@ use self::{
   utils::JWTError,
 };
 
-#[derive(Clone, Copy, Eq, PartialEq, Debug)]
+#[derive(Clone, Copy, Eq, PartialEq, Debug, Hash)]
 pub enum ActiveBlock {
   Help,
   DecoderToken,
@@ -29,14 +31,14 @@ pub enum ActiveBlock {
   EncoderSecret,
 }
 
-#[derive(Clone, Eq, PartialEq, Debug)]
+#[derive(Clone, Copy, Eq, Hash, PartialEq, Debug)]
 pub enum RouteId {
   Help,
   Decoder,
   Encoder,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
 pub struct Route {
   pub id: RouteId,
   pub active_block: ActiveBlock,
@@ -110,6 +112,7 @@ pub struct App {
   pub confirm: bool,
   pub light_theme: bool,
   pub help_docs: StatefulTable<Vec<String>>,
+  pub block_map: HashMap<Route, Rect>,
   pub data: Data,
 }
 
@@ -143,6 +146,7 @@ impl Default for App {
       confirm: false,
       light_theme: false,
       help_docs: StatefulTable::with_items(key_binding::get_help_docs()),
+      block_map: HashMap::new(),
       data: Data::default(),
     }
   }
@@ -161,6 +165,14 @@ impl App {
     }
   }
 
+  pub fn update_block_map(&mut self, block: Route, area: Rect) {
+    self
+      .block_map
+      .entry(block)
+      .and_modify(|w| *w = area)
+      .or_insert(area);
+  }
+
   pub fn refresh(&mut self) {
     self.data.error = String::new();
     self.data = Data::default();
@@ -197,17 +209,17 @@ impl App {
 
   pub fn cycle_main_routes(&mut self) {
     self.main_tabs.next();
-    let route = self.main_tabs.get_active_route().clone();
-    self.push_navigation_route(route);
+    let route = self.main_tabs.get_active_route();
+    self.push_navigation_route(*route);
   }
 
   pub fn route_decoder(&mut self) {
-    let route = self.main_tabs.set_index(0).route.clone();
+    let route = self.main_tabs.set_index(0).route;
     self.push_navigation_route(route);
   }
 
   pub fn route_encoder(&mut self) {
-    let route = self.main_tabs.set_index(1).route.clone();
+    let route = self.main_tabs.set_index(1).route;
     self.push_navigation_route(route);
   }
 

src/app/models.rs

@@ -103,7 +103,45 @@ impl TabsState {
   pub fn get_active_route(&self) -> &Route {
     &self.items[self.index].route
   }
+  pub fn next(&mut self) {
+    self.index = (self.index + 1) % self.items.len();
+  }
+  #[allow(dead_code)]
+  pub fn previous(&mut self) {
+    if self.index > 0 {
+      self.index -= 1;
+    } else {
+      self.index = self.items.len() - 1;
+    }
+  }
+}
 
+#[derive(Default)]
+pub struct BlockState {
+  pub items: Vec<Route>,
+  pub index: usize,
+}
+
+impl BlockState {
+  pub fn new(items: Vec<Route>) -> BlockState {
+    BlockState { items, index: 0 }
+  }
+  pub fn set_item(&mut self, block: Route) -> &Route {
+    // find active block index
+    let index = self
+      .items
+      .iter()
+      .position(|it| *it == block)
+      .unwrap_or_default();
+    self.index = index;
+    &self.items[self.index]
+  }
+  pub fn get_active_item(&self) -> &Route {
+    &self.items[self.index]
+  }
+  pub fn get_active_block(&self) -> &ActiveBlock {
+    &self.items[self.index].active_block
+  }
   pub fn next(&mut self) {
     self.index = (self.index + 1) % self.items.len();
   }

src/event/events.rs

@@ -67,7 +67,8 @@ impl Events {
           .unwrap_or_else(|| Duration::from_secs(0));
         // poll for tick rate duration, if no event, sent tick event.
         if event::poll(timeout).unwrap() {
-          match event::read().unwrap() {
+          let e = event::read().unwrap();
+          match e {
             CEvent::Key(key_event) => handle_key_event(&event_tx, key_event),
             CEvent::Mouse(mouse_event) => {
               event_tx.send(Event::MouseInput(mouse_event)).unwrap();

src/handlers/mod.rs

@@ -1,4 +1,5 @@
-use crossterm::event::{Event, KeyEvent, MouseEvent, MouseEventKind};
+use crossterm::event::{Event, KeyEvent, MouseButton, MouseEvent, MouseEventKind};
+use ratatui::layout::Rect;
 use tui_input::{backend::crossterm::EventHandler, Input};
 use tui_textarea::TextArea;
 
@@ -78,6 +79,7 @@ pub fn handle_mouse_events(mouse: MouseEvent, app: &mut App) {
     // mouse scrolling is inverted
     MouseEventKind::ScrollDown => handle_block_scroll(app, true, true, false),
     MouseEventKind::ScrollUp => handle_block_scroll(app, false, true, false),
+    MouseEventKind::Down(MouseButton::Left) => handle_mouse_btn_press(app, mouse),
     _ => { /* do nothing */ }
   }
 }
@@ -185,12 +187,11 @@ fn handle_route_events(key: Key, app: &mut App) {
         _ if key == DEFAULT_KEYBINDING.toggle_ignore_exp.key => {
           app.data.decoder.ignore_exp = !app.data.decoder.ignore_exp;
         }
-        // as these are tabs with index the order here matters, at least for readability
-        _ => {}
+        _ => { /* Do nothing */ }
       };
     }
     RouteId::Encoder => {
-      //   todo!()
+      //   nothing to handle
     }
     _ => { /* Do nothing */ }
   }
@@ -201,11 +202,11 @@ fn handle_left_key_events(app: &mut App) {
   match app.get_current_route().id {
     RouteId::Decoder => {
       app.data.decoder.blocks.previous();
-      app.push_navigation_route(app.data.decoder.blocks.get_active_route().clone());
+      app.push_navigation_route(*app.data.decoder.blocks.get_active_item());
     }
     RouteId::Encoder => {
       app.data.encoder.blocks.previous();
-      app.push_navigation_route(app.data.encoder.blocks.get_active_route().clone());
+      app.push_navigation_route(*app.data.encoder.blocks.get_active_item());
     }
     RouteId::Help => { /* Do nothing */ }
   }
@@ -216,16 +217,46 @@ fn handle_right_key_events(app: &mut App) {
   match app.get_current_route().id {
     RouteId::Decoder => {
       app.data.decoder.blocks.next();
-      app.push_navigation_route(app.data.decoder.blocks.get_active_route().clone());
+      app.push_navigation_route(*app.data.decoder.blocks.get_active_item());
     }
     RouteId::Encoder => {
       app.data.encoder.blocks.next();
-      app.push_navigation_route(app.data.encoder.blocks.get_active_route().clone());
+      app.push_navigation_route(*app.data.encoder.blocks.get_active_item());
     }
     RouteId::Help => { /* Do nothing */ }
   }
 }
 
+fn handle_mouse_btn_press(app: &mut App, mouse_event: MouseEvent) {
+  if let Some(data) = app
+    .block_map
+    .iter()
+    .filter(|i| {
+      i.0.id == app.get_current_route().id
+        && i
+          .1
+          .intersects(Rect::new(mouse_event.column, mouse_event.row, 1, 1))
+    })
+    .collect::<Vec<_>>()
+    .first()
+  {
+    let selected_route = *data.0;
+
+    // route specific events
+    match app.get_current_route().id {
+      RouteId::Decoder => {
+        app.data.decoder.blocks.set_item(selected_route);
+        app.push_navigation_route(*app.data.decoder.blocks.get_active_item());
+      }
+      RouteId::Encoder => {
+        app.data.encoder.blocks.set_item(selected_route);
+        app.push_navigation_route(*app.data.encoder.blocks.get_active_item());
+      }
+      RouteId::Help => { /* Do nothing */ }
+    }
+  };
+}
+
 fn handle_block_scroll(app: &mut App, up: bool, is_mouse: bool, page: bool) {
   match app.get_current_route().active_block {
     ActiveBlock::Help => app.help_docs.handle_scroll(up, page),
@@ -330,7 +361,7 @@ mod tests {
 
     app.data.encoder.header.input_mode = InputMode::Editing;
 
-    let route = app.main_tabs.set_index(1).route.clone();
+    let route = app.main_tabs.set_index(1).route;
     app.push_navigation_route(route);
 
     assert_eq!(app.data.encoder.header.input_mode, InputMode::Editing);