Merge pull request #9 from orhun/chore/bump-tui-deps

Bump dependencies

Author: realfresh

Cargo.lock

@@ -13,22 +13,21 @@ keywords = ["git", "gitignore", "cli"]
 categories = ["development-tools", "command-line-utilities"]
 
 [dependencies]
-anyhow = "1.0.74"
-clap = { version = "4.3.23", features = ["derive"] }
+anyhow = "1.0.89"
+clap = { version = "4.5.20", features = ["derive"] }
 copypasta = "0.8.2"
-crossterm = "0.27.0"
 dirs = "5.0.1"
-human-panic = "1.1.5"
-indoc = "2.0.3"
-native-tls = { version = "0.2.11", features = [] }
-once_cell = "1.18.0"
-ratatui = { version = "0.22.0", features = ["default"] }
-serde = { version = "1.0.183", features = ["default", "derive"] }
-serde_json = "1.0.105"
-tui-input = "0.8.0"
-ureq = { version = "2.7.1", features = ["gzip", "native-tls"], default-features = false }
-url = "2.4.0"
-yansi = "1.0.0-rc.1"
+human-panic = "1.2.3"
+indoc = "2.0.5"
+native-tls = { version = "0.2.12", features = [] }
+once_cell = "1.20.2"
+ratatui = "0.28.1"
+serde = { version = "1.0.210", features = ["default", "derive"] }
+serde_json = "1.0.128"
+tui-input = "0.10.1"
+ureq = { version = "2.10.1", features = ["gzip", "native-tls"], default-features = false }
+url = "2.5.2"
+yansi = "1.0.1"
 
 [profile.release]
 lto = true
@@ -66,4 +65,4 @@ pre-build = [
 pre-build = [
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "apt-get update && apt-get --assume-yes install pkg-config libssl-dev:$CROSS_DEB_ARCH"
-]
+]

Cargo.toml

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use crossterm::event::{self, Event as CrosstermEvent, KeyEvent, MouseEvent};
+use ratatui::crossterm::event::{self, Event as CrosstermEvent, KeyEvent, MouseEvent};
 use std::sync::mpsc;
 use std::thread;
 use std::time::{Duration, Instant};

src/commands/search/framework/event.rs

@@ -2,12 +2,12 @@ use crate::commands::search::framework::event::EventHandler;
 use crate::commands::search::state::UIState;
 use crate::commands::search::views::render;
 use anyhow::Result;
-use crossterm::event::{
+use ratatui::backend::Backend;
+use ratatui::crossterm::event::{
     DisableMouseCapture, EnableMouseCapture, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags,
     PushKeyboardEnhancementFlags,
 };
-use crossterm::terminal::{self, EnterAlternateScreen, LeaveAlternateScreen};
-use ratatui::backend::Backend;
+use ratatui::crossterm::terminal::{self, EnterAlternateScreen, LeaveAlternateScreen};
 use ratatui::Terminal;
 use std::io;
 use std::panic;
@@ -38,7 +38,7 @@ impl<B: Backend> Tui<B> {
 
         if cfg!(target_family = "unix") {
             // Keyboard event types are only reported on Windows by default, enable on Unix too
-            crossterm::execute!(
+            ratatui::crossterm::execute!(
                 io::stderr(),
                 EnterAlternateScreen,
                 EnableMouseCapture,
@@ -47,7 +47,7 @@ impl<B: Backend> Tui<B> {
         } else {
             // Don't add the keyboard enhancement flags on Windows, as it produces error:
             // - Keyboard progressive enhancement not implemented for the legacy Windows API.
-            crossterm::execute!(io::stderr(), EnterAlternateScreen, EnableMouseCapture)?;
+            ratatui::crossterm::execute!(io::stderr(), EnterAlternateScreen, EnableMouseCapture)?;
         }
 
         // Define a custom panic hook to reset the terminal properties.
@@ -84,14 +84,14 @@ impl<B: Backend> Tui<B> {
     fn reset() -> Result<()> {
         terminal::disable_raw_mode()?;
         if cfg!(target_family = "unix") {
-            crossterm::execute!(
+            ratatui::crossterm::execute!(
                 io::stdout(),
                 LeaveAlternateScreen,
                 DisableMouseCapture,
                 PopKeyboardEnhancementFlags
             )?;
         } else {
-            crossterm::execute!(io::stdout(), LeaveAlternateScreen, DisableMouseCapture)?;
+            ratatui::crossterm::execute!(io::stdout(), LeaveAlternateScreen, DisableMouseCapture)?;
         }
         Ok(())
     }

src/commands/search/framework/tui.rs

@@ -3,10 +3,10 @@ use crate::commands::search::state::view_preview::{UIStatePreview, UIStatePrevie
 use crate::commands::search::state::{UIState, UIStateView};
 use crate::template::list::TemplateList;
 use anyhow::Result;
-use crossterm::event::{
+use ratatui::backend::CrosstermBackend;
+use ratatui::crossterm::event::{
     Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers, MouseButton, MouseEvent, MouseEventKind,
 };
-use ratatui::backend::CrosstermBackend;
 use std::io::Stderr;
 use std::time::{Duration, Instant};
 use tui_input::backend::crossterm::EventHandler;

src/commands/search/handlers.rs

@@ -55,7 +55,7 @@ impl UIStatePreview {
         };
 
         let scroll_pos = 0;
-        let scroll_state = ScrollbarState::default().content_length(content_lines);
+        let scroll_state = ScrollbarState::default().content_length(content_lines.into());
 
         Ok(Self {
             state,
@@ -78,13 +78,13 @@ impl UIStatePreview {
     /// Scrolls to the bottom of the preview content
     pub fn scroll_to_bottom(&mut self) {
         self.scroll_pos = self.content_lines.saturating_sub(1);
-        self.scroll_state = self.scroll_state.position(self.scroll_pos);
+        self.scroll_state = self.scroll_state.position(self.scroll_pos.into());
     }
 
     /// Scrolls to the preview content up one increment
     pub fn scroll_up(&mut self) {
         self.scroll_pos = self.scroll_pos.saturating_sub(1);
-        self.scroll_state = self.scroll_state.position(self.scroll_pos);
+        self.scroll_state = self.scroll_state.position(self.scroll_pos.into());
     }
 
     /// Scrolls to the preview content down one increment
@@ -93,7 +93,7 @@ impl UIStatePreview {
             .scroll_pos
             .saturating_add(1)
             .clamp(0, self.content_lines.saturating_sub(1));
-        self.scroll_state = self.scroll_state.position(self.scroll_pos);
+        self.scroll_state = self.scroll_state.position(self.scroll_pos.into());
     }
 
     /// Copies the preview content to the clipboard

src/commands/search/state/view_preview.rs

@@ -1,17 +1,12 @@
 use crate::commands::search::state::UIState;
 use indoc::formatdoc;
-use ratatui::backend::Backend;
 use ratatui::layout::{Constraint, Direction, Layout, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::widgets::{Block, Padding, Paragraph};
 use ratatui::{text, Frame};
 
 /// Renders the home UI footer (help section)
-pub fn render_home_footer<B: Backend>(
-    _app: &mut UIState,
-    f: &mut Frame<'_, B>,
-    chunk: Rect,
-) -> anyhow::Result<()> {
+pub fn render_home_footer(_app: &mut UIState, f: &mut Frame, chunk: Rect) -> anyhow::Result<()> {
     let chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([

src/commands/search/views/home/footer.rs

@@ -1,5 +1,4 @@
 use crate::commands::search::state::UIState;
-use ratatui::backend::Backend;
 use ratatui::layout::{Constraint, Direction, Layout, Rect};
 use ratatui::style::{Color, Style, Stylize};
 use ratatui::symbols::DOT;
@@ -27,11 +26,7 @@ fn create_tabs<'a>(tab_titles: Vec<String>, list_tab: usize) -> anyhow::Result<T
 }
 
 /// Renders the home view header (collection tabs)
-pub fn render_home_header<B: Backend>(
-    app: &mut UIState,
-    f: &mut Frame<'_, B>,
-    chunk: Rect,
-) -> anyhow::Result<()> {
+pub fn render_home_header(app: &mut UIState, f: &mut Frame, chunk: Rect) -> anyhow::Result<()> {
     let chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([

src/commands/search/views/home/header.rs

@@ -2,7 +2,6 @@ use crate::commands::search::state::collection::UICollectionSelection;
 use crate::commands::search::state::UIState;
 use crate::commands::search::views::util;
 use crate::template::item::Template;
-use ratatui::backend::Backend;
 use ratatui::layout::Rect;
 use ratatui::style::{Color, Modifier, Style, Stylize};
 use ratatui::widgets::{Block, BorderType, Borders, List, ListItem, ListState, Padding};
@@ -47,11 +46,7 @@ fn create_list<'a>(
 }
 
 /// Renders the main collection templates list
-pub fn render_home_main_list<B: Backend>(
-    app: &mut UIState,
-    f: &mut Frame<'_, B>,
-    chunk: Rect,
-) -> anyhow::Result<()> {
+pub fn render_home_main_list(app: &mut UIState, f: &mut Frame, chunk: Rect) -> anyhow::Result<()> {
     let list = app.collection();
     let state = &mut list.state.lock().unwrap();
     let widget = create_list(&list.values, state, &app.selected.lock().unwrap())?;

src/commands/search/views/home/main_list.rs

@@ -1,8 +1,7 @@
 use crate::commands::search::state::collection::UICollectionSelection;
 use crate::commands::search::state::UIState;
 use crate::commands::search::views::util;
-use ratatui::backend::Backend;
-use ratatui::layout::{Constraint, Layout, Rect};
+use ratatui::layout::{Constraint, Layout, Position, Rect};
 use ratatui::style::{Color, Style, Stylize};
 use ratatui::widgets::block::Title;
 use ratatui::widgets::{Block, BorderType, Borders, List, ListItem, Padding, Paragraph};
@@ -59,11 +58,7 @@ fn create_selected<'a>(
 }
 
 /// Render the right sidebar of the home view (filter input & selected templates)
-pub fn render_home_main_side<B: Backend>(
-    app: &mut UIState,
-    f: &mut Frame<'_, B>,
-    chunk: Rect,
-) -> anyhow::Result<()> {
+pub fn render_home_main_side(app: &mut UIState, f: &mut Frame, chunk: Rect) -> anyhow::Result<()> {
     let chunks = Layout::default()
         .constraints(vec![Constraint::Length(3), Constraint::Min(0)])
         .split(chunk);
@@ -82,12 +77,12 @@ pub fn render_home_main_side<B: Backend>(
     f.render_widget(selected_widget, bottom);
 
     if is_filtering {
-        f.set_cursor(
+        f.set_cursor_position(Position::new(
             // Put cursor past the end of the input text
             top.x + app.collection_filter.visual_cursor() as u16 + 2,
             // Move one line down, from the border to the input line
             top.y + 1,
-        )
+        ))
     }
 
     Ok(())

src/commands/search/views/home/main_side.rs

@@ -9,12 +9,11 @@ use crate::commands::search::views::home::header::render_home_header;
 use crate::commands::search::views::home::main_list::render_home_main_list;
 use crate::commands::search::views::home::main_side::render_home_main_side;
 use anyhow::{bail, Result};
-use ratatui::backend::Backend;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::Frame;
 
 /// Renders the main home UI
-pub fn render_home<B: Backend>(app: &mut UIState, f: &mut Frame<'_, B>) -> Result<()> {
+pub fn render_home(app: &mut UIState, f: &mut Frame) -> Result<()> {
     match &mut app.view {
         UIStateView::Home => {
             // let app = Mutex::new(app);
@@ -27,7 +26,7 @@ pub fn render_home<B: Backend>(app: &mut UIState, f: &mut Frame<'_, B>) -> Resul
                 ])
                 .vertical_margin(0)
                 .horizontal_margin(1)
-                .split(f.size());
+                .split(f.area());
 
             let main = Layout::default()
                 .direction(Direction::Horizontal)

src/commands/search/views/home/mod.rs

@@ -3,11 +3,10 @@ mod preview;
 mod util;
 
 use crate::commands::search::state::{UIState, UIStateView};
-use ratatui::backend::Backend;
 use ratatui::Frame;
 
 /// Renders the user interface
-pub fn render<B: Backend>(app: &mut UIState, f: &mut Frame<'_, B>) -> anyhow::Result<()> {
+pub fn render(app: &mut UIState, f: &mut Frame) -> anyhow::Result<()> {
     match &app.view {
         UIStateView::Home => home::render_home(app, f)?,
         UIStateView::Preview { .. } => preview::render_preview(app, f)?,

src/commands/search/views/mod.rs

@@ -1,12 +1,11 @@
 use indoc::formatdoc;
-use ratatui::backend::Backend;
 use ratatui::layout::{Constraint, Direction, Layout, Rect};
 use ratatui::style::{Style, Stylize};
 use ratatui::widgets::{Block, Padding, Paragraph};
 use ratatui::{text, Frame};
 
 /// Renders the preview footer (help section)
-pub fn render_preview_footer<B: Backend>(f: &mut Frame<'_, B>, chunk: Rect) -> anyhow::Result<()> {
+pub fn render_preview_footer(f: &mut Frame, chunk: Rect) -> anyhow::Result<()> {
     let chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints([

src/commands/search/views/preview/footer.rs

@@ -5,7 +5,6 @@ use crate::commands::search::state::{UIState, UIStateView};
 use crate::commands::search::views::preview::footer::render_preview_footer;
 use crate::commands::search::views::util::rect_center;
 use anyhow::{bail, Result};
-use ratatui::backend::Backend;
 use ratatui::layout::{Constraint, Layout};
 use ratatui::style::{Style, Stylize};
 use ratatui::text::{Line, Text};
@@ -15,10 +14,10 @@ use ratatui::widgets::{
 use ratatui::{text, Frame};
 
 /// Renders the preview view
-pub fn render_preview<B: Backend>(app: &mut UIState, f: &mut Frame<'_, B>) -> Result<()> {
+pub fn render_preview(app: &mut UIState, f: &mut Frame) -> Result<()> {
     match &mut app.view {
         UIStateView::Preview(ref mut p) => {
-            let size = f.size();
+            let size = f.area();
             let title = text::Span::from(p.title.as_str()).bold().white();
 
             let layout = Layout::default()
@@ -59,7 +58,7 @@ pub fn render_preview<B: Backend>(app: &mut UIState, f: &mut Frame<'_, B>) -> Re
                 .begin_symbol(Some(""))
                 .end_symbol(Some(""))
                 .thumb_style(Style::new().on_light_yellow())
-                .track_symbol("-") // ─
+                .track_symbol(Some("-")) // ─
                 .thumb_symbol("░"); //
 
             f.render_widget(content, layout[1]);