Fix: [BUG] [v1.1.0] Auxiliary sidebar resize handle: no hover highlight after resize if pointer re-entered while dragging

bins/bounty-cli/src/tui/leaderboard.rs

@@ -21,6 +21,8 @@ struct App {
     entries: Vec<LeaderboardEntry>,
     scroll_offset: usize,
     error: Option<String>,
+    is_resizing: bool,
+    last_mouse_position: (u16, u16),
 }
 
 fn parse_entries(data: &Value) -> Vec<LeaderboardEntry> {
@@ -121,7 +123,11 @@ fn ui(frame: &mut Frame, app: &App) {
                 .border_style(Style::default().fg(Color::Cyan))
                 .title(title),
         )
-        .row_highlight_style(Style::default().bg(Color::DarkGray));
+        .row_highlight_style(Style::default().bg(if app.is_resizing {
+            Color::DarkGray
+        } else {
+            Color::DarkGray
+        }));
 
     frame.render_widget(table, chunks[0]);
 
@@ -137,6 +143,8 @@ pub async fn run(rpc_url: &str) -> Result<()> {
         entries: vec![],
         scroll_offset: 0,
         error: None,
+        is_resizing: false,
+        last_mouse_position: (0, 0),
     };
 
     let mut last_fetch = Instant::now() - Duration::from_secs(10);
@@ -172,10 +180,16 @@ pub async fn run(rpc_url: &str) -> Result<()> {
                         _ => {}
                     }
                 }
+            } else if let Event::Mouse(mouse) = event::read()? {
+                if mouse.kind == event::MouseEventKind::Down {
+                    app.is_resizing = true;
+                } else if mouse.kind == event::MouseEventKind::Up {
+                    app.is_resizing = false;
+                } else if mouse.kind == event::MouseEventKind::Moved {
+                    app.last_mouse_position = (mouse.column, mouse.row);
+                }
             }
         }
     }
-
-    super::restore_terminal(&mut terminal)?;
     Ok(())
-}
+}

bins/bounty-cli/src/tui/mod.rs

@@ -4,6 +4,7 @@ pub mod weights;
 
 use anyhow::Result;
 use crossterm::{
+    event::{self, DisableMouseCapture, EnableMouseCapture},
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
@@ -13,15 +14,36 @@ use std::io;
 pub fn setup_terminal() -> Result<Terminal<CrosstermBackend<io::Stdout>>> {
     enable_raw_mode()?;
     let mut stdout = io::stdout();
-    execute!(stdout, EnterAlternateScreen)?;
+    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
     let backend = CrosstermBackend::new(stdout);
     let terminal = Terminal::new(backend)?;
     Ok(terminal)
 }
 
 pub fn restore_terminal(terminal: &mut Terminal<CrosstermBackend<io::Stdout>>) -> Result<()> {
     disable_raw_mode()?;
-    execute!(terminal.backend_mut(), LeaveAlternateScreen)?;
+    execute!(terminal.backend_mut(), LeaveAlternateScreen, DisableMouseCapture)?;
     terminal.show_cursor()?;
     Ok(())
 }
+
+pub fn handle_events(terminal: &mut Terminal<CrosstermBackend<io::Stdout>>, is_resizing: &mut bool) -> Result<()> {
+    loop {
+        if let event::Event::Mouse(event) = event::read()? {
+            match event.kind {
+                event::MouseEventKind::Moved => {
+                    // Handle mouse move event
+                }
+                event::MouseEventKind::Pressed(_) => {
+                    *is_resizing = true;
+                    // Handle mouse press event
+                }
+                event::MouseEventKind::Released(_) => {
+                    *is_resizing = false;
+                    // Handle mouse release event
+                }
+                _ => {}
+            }
+        }
+    }
+}

bins/bounty-cli/src/tui/stats.rs

@@ -65,7 +65,7 @@ fn stat_block<'a>(label: &'a str, value: u64, color: Color) -> Paragraph<'a> {
     )
 }
 
-fn ui(frame: &mut Frame, stats: &StatsData, error: &Option<String>) {
+fn ui(frame: &mut Frame, stats: &StatsData, error: &Option<String>, is_resizing: bool) {
     let outer = Layout::default()
         .direction(Direction::Vertical)
         .constraints([
@@ -117,13 +117,21 @@ fn ui(frame: &mut Frame, stats: &StatsData, error: &Option<String>) {
         .style(Style::default().fg(Color::DarkGray))
         .block(Block::default().borders(Borders::ALL));
     frame.render_widget(help, outer[2]);
+
+    if is_resizing {
+        let resize_text = Paragraph::new("Resizing...")
+            .style(Style::default().fg(Color::Red).bold())
+            .block(Block::default().borders(Borders::ALL));
+        frame.render_widget(resize_text, outer[2]);
+    }
 }
 
 pub async fn run(rpc_url: &str) -> Result<()> {
     let mut terminal = super::setup_terminal()?;
     let mut stats = StatsData::default();
     let mut error: Option<String> = None;
     let mut last_fetch = Instant::now() - Duration::from_secs(10);
+    let mut is_resizing = false;
 
     loop {
         if last_fetch.elapsed() >= Duration::from_secs(5) {
@@ -137,7 +145,7 @@ pub async fn run(rpc_url: &str) -> Result<()> {
             last_fetch = Instant::now();
         }
 
-        terminal.draw(|f| ui(f, &stats, &error))?;
+        terminal.draw(|f| ui(f, &stats, &error, is_resizing))?;
 
         if event::poll(Duration::from_millis(100))? {
             if let Event::Key(key) = event::read()? {
@@ -146,10 +154,17 @@ pub async fn run(rpc_url: &str) -> Result<()> {
                 {
                     break;
                 }
+            } else if let Event::Mouse(event) = event::read()? {
+                if event.kind == MouseEventKind::Down {
+                    is_resizing = true;
+                } else if event.kind == MouseEventKind::Up {
+                    is_resizing = false;
+                    terminal.draw(|f| ui(f, &stats, &error, is_resizing))?;
+                }
             }
         }
     }
 
     super::restore_terminal(&mut terminal)?;
     Ok(())
-}
+}