diff --git a/Cargo.lock b/Cargo.lock index aee07de..71a49da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -111,7 +111,6 @@ dependencies = [ "cargo_metadata", "clap", "console", - "crossterm", "ratatui", "tui-input", ] @@ -179,7 +178,7 @@ version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn", @@ -270,12 +269,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -291,6 +284,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -401,19 +403,20 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.26.3" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" +checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3" dependencies = [ "bitflags 2.5.0", "cassowary", "compact_str", "crossterm", - "itertools", + "itertools 0.13.0", "lru", "paste", "stability", "strum", + "strum_macros", "unicode-segmentation", "unicode-truncate", "unicode-width", @@ -555,11 +558,11 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", @@ -625,15 +628,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226" dependencies = [ - "itertools", + "itertools 0.12.1", "unicode-width", ] [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "utf8parse" diff --git a/Cargo.toml b/Cargo.toml index 60f4c1c..121270c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,5 @@ categories = ["development-tools::cargo-plugins", "command-line-utilities"] cargo_metadata = "0.18.1" clap = { version = "4.5.4", features = ["derive"] } console = "0.15.8" -crossterm = "0.27.0" -ratatui = "0.26.3" +ratatui = "0.27.0" tui-input = "0.8.0" diff --git a/src/macros.rs b/src/macros.rs index 18c0532..aa6faee 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -1,28 +1,28 @@ #[macro_export] macro_rules! key_code { ( $code:path ) => { - crossterm::event::KeyEvent { code: $code, .. } + ratatui::crossterm::event::KeyEvent { code: $code, .. } }; } #[macro_export] macro_rules! key_code_char { ( $c:ident ) => { - crossterm::event::KeyEvent { - code: crossterm::event::KeyCode::Char($c), + ratatui::crossterm::event::KeyEvent { + code: ratatui::crossterm::event::KeyCode::Char($c), .. } }; ( $c:expr ) => { - crossterm::event::KeyEvent { - code: crossterm::event::KeyCode::Char($c), + ratatui::crossterm::event::KeyEvent { + code: ratatui::crossterm::event::KeyCode::Char($c), .. } }; ( $c:expr, Ctrl ) => { - crossterm::event::KeyEvent { - code: crossterm::event::KeyCode::Char($c), - modifiers: crossterm::event::KeyModifiers::CONTROL, + ratatui::crossterm::event::KeyEvent { + code: ratatui::crossterm::event::KeyCode::Char($c), + modifiers: ratatui::crossterm::event::KeyModifiers::CONTROL, .. } }; diff --git a/src/main.rs b/src/main.rs index c46650e..d051bf9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,11 +9,14 @@ use std::{ }; use clap::{Args, Parser, ValueEnum}; -use crossterm::{ - execute, - terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, +use ratatui::{ + backend::CrosstermBackend, + crossterm::{ + execute, + terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, + }, + Terminal, TerminalOptions, Viewport, }; -use ratatui::{backend::CrosstermBackend, Terminal, TerminalOptions, Viewport}; use tui::{Ret, Tui}; #[derive(Debug, Parser)] diff --git a/src/tui.rs b/src/tui.rs index 13a7a9d..03c7462 100644 --- a/src/tui.rs +++ b/src/tui.rs @@ -1,7 +1,7 @@ use console::truncate_str; -use crossterm::event::{self, Event, KeyCode}; use ratatui::{ backend::Backend, + crossterm::event::{self, Event, KeyCode}, layout::{Constraint, Layout, Rect}, style::{Color, Style, Stylize}, text::{Line, Text},