From f5bbc5b3e53f3279811cfdcff05a096e61b01e83 Mon Sep 17 00:00:00 2001 From: ricott1 Date: Mon, 21 Oct 2024 18:35:42 +0200 Subject: [PATCH 1/4] Bump ratatui version --- Cargo.toml | 4 ++-- bench/Cargo.toml | 2 +- bench/benches/insert.rs | 5 +++++ examples/editor.rs | 2 +- examples/minimal.rs | 2 +- examples/password.rs | 2 +- examples/popup_placeholder.rs | 2 +- examples/single_line.rs | 2 +- examples/split.rs | 2 +- examples/termion.rs | 2 +- examples/termwiz.rs | 2 +- examples/tuirs_editor.rs | 2 +- examples/tuirs_minimal.rs | 2 +- examples/tuirs_termion.rs | 2 +- examples/variable.rs | 2 +- examples/vim.rs | 2 +- src/textarea.rs | 6 +++--- 17 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 95cb4c7..8ce55cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,13 +38,13 @@ arbitrary = ["dep:arbitrary"] arbitrary = { version = "1", features = ["derive"], optional = true } crossterm = { package = "crossterm", version = "0.28", optional = true } crossterm-025 = { package = "crossterm", version = "0.25", optional = true } -ratatui = { version = "0.28", default-features = false, optional = true } +ratatui = { version="0.29.0", default-features = false, optional = true } regex = { version = "1", optional = true } termion = { version = "4.0", optional = true } termion-15 = { package = "termion", version = "1.5", optional = true } termwiz = { version = "0.22.0", optional = true } tui = { version = "0.19", default-features = false, optional = true } -unicode-width = "0.1.11" +unicode-width = "0.2.0" serde = { version = "1", optional = true , features = ["derive"] } [[example]] diff --git a/bench/Cargo.toml b/bench/Cargo.toml index 533080e..427f458 100644 --- a/bench/Cargo.toml +++ b/bench/Cargo.toml @@ -10,7 +10,7 @@ bench = false [dependencies] tui-textarea = { path = "..", features = ["no-backend", "search"] } -ratatui = { version = ">=0.28.0", default-features = false } +ratatui = { version = "0.29.0", default-features = false } [dev-dependencies] criterion = "0.5" diff --git a/bench/benches/insert.rs b/bench/benches/insert.rs index 994c036..3a8aed0 100644 --- a/bench/benches/insert.rs +++ b/bench/benches/insert.rs @@ -15,6 +15,7 @@ fn append_lorem(repeat: usize) -> usize { key: Key::Char(c), ctrl: false, alt: false, + shift: false }); term.draw_textarea(&textarea); } @@ -23,6 +24,7 @@ fn append_lorem(repeat: usize) -> usize { key: Key::Enter, ctrl: false, alt: false, + shift: false }); term.draw_textarea(&textarea); } @@ -45,6 +47,7 @@ fn random_lorem(repeat: usize) -> usize { key: Key::Enter, ctrl: false, alt: false, + shift: false }); term.draw_textarea(&textarea); @@ -53,6 +56,7 @@ fn random_lorem(repeat: usize) -> usize { key: Key::Char(c), ctrl: false, alt: false, + shift: false }); term.draw_textarea(&textarea); } @@ -74,6 +78,7 @@ fn append_long_lorem(repeat: usize) -> usize { key: Key::Char(c), ctrl: false, alt: false, + shift: false }); term.draw_textarea(&textarea); } diff --git a/examples/editor.rs b/examples/editor.rs index 846eb2b..2c0a5a2 100644 --- a/examples/editor.rs +++ b/examples/editor.rs @@ -6,7 +6,7 @@ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Direction, Layout}; use ratatui::style::{Color, Modifier, Style}; use ratatui::text::{Line, Span}; -use ratatui::widgets::{Block, Borders, Paragraph}; +use ratatui::widgets::{block::Block, Borders, Paragraph}; use ratatui::Terminal; use std::borrow::Cow; use std::env; diff --git a/examples/minimal.rs b/examples/minimal.rs index dfbe92e..f689a21 100644 --- a/examples/minimal.rs +++ b/examples/minimal.rs @@ -3,7 +3,7 @@ use crossterm::terminal::{ disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen, }; use ratatui::backend::CrosstermBackend; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/password.rs b/examples/password.rs index 1d182b8..2e6428d 100644 --- a/examples/password.rs +++ b/examples/password.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Layout}; use ratatui::style::{Color, Style}; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/popup_placeholder.rs b/examples/popup_placeholder.rs index 136de5c..06245f3 100644 --- a/examples/popup_placeholder.rs +++ b/examples/popup_placeholder.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::Rect; use ratatui::style::{Color, Style}; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/single_line.rs b/examples/single_line.rs index d5f36ef..99fed57 100644 --- a/examples/single_line.rs +++ b/examples/single_line.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Layout}; use ratatui::style::{Color, Style}; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/split.rs b/examples/split.rs index 78ebb23..40d7fcd 100644 --- a/examples/split.rs +++ b/examples/split.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Direction, Layout}; use ratatui::style::{Color, Modifier, Style}; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/termion.rs b/examples/termion.rs index cc8296b..19c9404 100644 --- a/examples/termion.rs +++ b/examples/termion.rs @@ -1,5 +1,5 @@ use ratatui::backend::TermionBackend; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::error::Error; use std::io; diff --git a/examples/termwiz.rs b/examples/termwiz.rs index 79355d3..50ed20d 100644 --- a/examples/termwiz.rs +++ b/examples/termwiz.rs @@ -1,5 +1,5 @@ use ratatui::backend::TermwizBackend; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::error::Error; use std::time::Duration; diff --git a/examples/tuirs_editor.rs b/examples/tuirs_editor.rs index 2dfc881..8b88130 100644 --- a/examples/tuirs_editor.rs +++ b/examples/tuirs_editor.rs @@ -16,7 +16,7 @@ use tui::backend::CrosstermBackend; use tui::layout::{Constraint, Direction, Layout}; use tui::style::{Color, Modifier, Style}; use tui::text::{Span, Spans}; -use tui::widgets::{Block, Borders, Paragraph}; +use tui::widgets::{block::Block, Borders, Paragraph}; use tui::Terminal; use tui_textarea::{CursorMove, Input, Key, TextArea}; diff --git a/examples/tuirs_minimal.rs b/examples/tuirs_minimal.rs index 5e5cc27..26e3829 100644 --- a/examples/tuirs_minimal.rs +++ b/examples/tuirs_minimal.rs @@ -7,7 +7,7 @@ use crossterm::terminal::{ }; use std::io; use tui::backend::CrosstermBackend; -use tui::widgets::{Block, Borders}; +use tui::widgets::{block::Block, Borders}; use tui::Terminal; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/tuirs_termion.rs b/examples/tuirs_termion.rs index e398e3d..2f9edbf 100644 --- a/examples/tuirs_termion.rs +++ b/examples/tuirs_termion.rs @@ -11,7 +11,7 @@ use termion::input::{MouseTerminal, TermRead}; use termion::raw::IntoRawMode; use termion::screen::AlternateScreen; use tui::backend::TermionBackend; -use tui::widgets::{Block, Borders}; +use tui::widgets::{block::Block, Borders}; use tui::Terminal; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/variable.rs b/examples/variable.rs index 42fb93a..5ebbd24 100644 --- a/examples/variable.rs +++ b/examples/variable.rs @@ -4,7 +4,7 @@ use crossterm::terminal::{ }; use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Direction, Layout}; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::cmp; use std::io; diff --git a/examples/vim.rs b/examples/vim.rs index 42da7ed..f56a141 100644 --- a/examples/vim.rs +++ b/examples/vim.rs @@ -4,7 +4,7 @@ use crossterm::terminal::{ }; use ratatui::backend::CrosstermBackend; use ratatui::style::{Color, Modifier, Style}; -use ratatui::widgets::{Block, Borders}; +use ratatui::widgets::{block::Block, Borders}; use ratatui::Terminal; use std::env; use std::fmt; diff --git a/src/textarea.rs b/src/textarea.rs index 32618a9..365c503 100644 --- a/src/textarea.rs +++ b/src/textarea.rs @@ -4,7 +4,7 @@ use crate::history::{Edit, EditKind, History}; use crate::input::{Input, Key}; use crate::ratatui::layout::Alignment; use crate::ratatui::style::{Color, Modifier, Style}; -use crate::ratatui::widgets::{Block, Widget}; +use crate::ratatui::widgets::{block::Block, Widget}; use crate::scroll::Scrolling; #[cfg(feature = "search")] use crate::search::Search; @@ -1676,7 +1676,7 @@ impl<'a> TextArea<'a> { /// Set the block of textarea. By default, no block is set. /// ``` /// use tui_textarea::TextArea; - /// use ratatui::widgets::{Block, Borders}; + /// use ratatui::widgets::{block::Block, Borders}; /// /// let mut textarea = TextArea::default(); /// let block = Block::default().borders(Borders::ALL).title("Block Title"); @@ -1690,7 +1690,7 @@ impl<'a> TextArea<'a> { /// Remove the block of textarea which was set by [`TextArea::set_block`]. /// ``` /// use tui_textarea::TextArea; - /// use ratatui::widgets::{Block, Borders}; + /// use ratatui::widgets::{block::Block, Borders}; /// /// let mut textarea = TextArea::default(); /// let block = Block::default().borders(Borders::ALL).title("Block Title"); From 6062baebf2fd2b659d5e768e4eb1b3b2bb209a16 Mon Sep 17 00:00:00 2001 From: Alessandro Ricottone Date: Tue, 22 Oct 2024 09:58:18 +0200 Subject: [PATCH 2/4] Lint Cargo.toml Co-authored-by: Josh McKinney --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8ce55cf..4568e03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ arbitrary = ["dep:arbitrary"] arbitrary = { version = "1", features = ["derive"], optional = true } crossterm = { package = "crossterm", version = "0.28", optional = true } crossterm-025 = { package = "crossterm", version = "0.25", optional = true } -ratatui = { version="0.29.0", default-features = false, optional = true } +ratatui = { version = "0.29.0", default-features = false, optional = true } regex = { version = "1", optional = true } termion = { version = "4.0", optional = true } termion-15 = { package = "termion", version = "1.5", optional = true } From 007c69f5accd95875f74a0a1338ee3940bf6116b Mon Sep 17 00:00:00 2001 From: ricott1 Date: Tue, 22 Oct 2024 10:32:04 +0200 Subject: [PATCH 3/4] Fix linting --- bench/benches/insert.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bench/benches/insert.rs b/bench/benches/insert.rs index 3a8aed0..d2630d5 100644 --- a/bench/benches/insert.rs +++ b/bench/benches/insert.rs @@ -15,7 +15,7 @@ fn append_lorem(repeat: usize) -> usize { key: Key::Char(c), ctrl: false, alt: false, - shift: false + shift: false, }); term.draw_textarea(&textarea); } @@ -24,7 +24,7 @@ fn append_lorem(repeat: usize) -> usize { key: Key::Enter, ctrl: false, alt: false, - shift: false + shift: false, }); term.draw_textarea(&textarea); } @@ -47,7 +47,7 @@ fn random_lorem(repeat: usize) -> usize { key: Key::Enter, ctrl: false, alt: false, - shift: false + shift: false, }); term.draw_textarea(&textarea); @@ -56,7 +56,7 @@ fn random_lorem(repeat: usize) -> usize { key: Key::Char(c), ctrl: false, alt: false, - shift: false + shift: false, }); term.draw_textarea(&textarea); } @@ -78,7 +78,7 @@ fn append_long_lorem(repeat: usize) -> usize { key: Key::Char(c), ctrl: false, alt: false, - shift: false + shift: false, }); term.draw_textarea(&textarea); } From 988741d2384db2079d2c1a46f7e14bc8babd7d44 Mon Sep 17 00:00:00 2001 From: ricott1 Date: Tue, 22 Oct 2024 10:33:35 +0200 Subject: [PATCH 4/4] Revert Block import --- examples/editor.rs | 2 +- examples/minimal.rs | 2 +- examples/password.rs | 2 +- examples/popup_placeholder.rs | 2 +- examples/single_line.rs | 2 +- examples/split.rs | 2 +- examples/termion.rs | 2 +- examples/termwiz.rs | 2 +- examples/tuirs_editor.rs | 2 +- examples/tuirs_minimal.rs | 2 +- examples/tuirs_termion.rs | 2 +- examples/variable.rs | 2 +- examples/vim.rs | 2 +- src/textarea.rs | 6 +++--- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/editor.rs b/examples/editor.rs index 2c0a5a2..846eb2b 100644 --- a/examples/editor.rs +++ b/examples/editor.rs @@ -6,7 +6,7 @@ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Direction, Layout}; use ratatui::style::{Color, Modifier, Style}; use ratatui::text::{Line, Span}; -use ratatui::widgets::{block::Block, Borders, Paragraph}; +use ratatui::widgets::{Block, Borders, Paragraph}; use ratatui::Terminal; use std::borrow::Cow; use std::env; diff --git a/examples/minimal.rs b/examples/minimal.rs index f689a21..dfbe92e 100644 --- a/examples/minimal.rs +++ b/examples/minimal.rs @@ -3,7 +3,7 @@ use crossterm::terminal::{ disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen, }; use ratatui::backend::CrosstermBackend; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/password.rs b/examples/password.rs index 2e6428d..1d182b8 100644 --- a/examples/password.rs +++ b/examples/password.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Layout}; use ratatui::style::{Color, Style}; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/popup_placeholder.rs b/examples/popup_placeholder.rs index 06245f3..136de5c 100644 --- a/examples/popup_placeholder.rs +++ b/examples/popup_placeholder.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::Rect; use ratatui::style::{Color, Style}; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/single_line.rs b/examples/single_line.rs index 99fed57..d5f36ef 100644 --- a/examples/single_line.rs +++ b/examples/single_line.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Layout}; use ratatui::style::{Color, Style}; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/split.rs b/examples/split.rs index 40d7fcd..78ebb23 100644 --- a/examples/split.rs +++ b/examples/split.rs @@ -5,7 +5,7 @@ use crossterm::terminal::{ use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Direction, Layout}; use ratatui::style::{Color, Modifier, Style}; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::io; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/termion.rs b/examples/termion.rs index 19c9404..cc8296b 100644 --- a/examples/termion.rs +++ b/examples/termion.rs @@ -1,5 +1,5 @@ use ratatui::backend::TermionBackend; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::error::Error; use std::io; diff --git a/examples/termwiz.rs b/examples/termwiz.rs index 50ed20d..79355d3 100644 --- a/examples/termwiz.rs +++ b/examples/termwiz.rs @@ -1,5 +1,5 @@ use ratatui::backend::TermwizBackend; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::error::Error; use std::time::Duration; diff --git a/examples/tuirs_editor.rs b/examples/tuirs_editor.rs index 8b88130..2dfc881 100644 --- a/examples/tuirs_editor.rs +++ b/examples/tuirs_editor.rs @@ -16,7 +16,7 @@ use tui::backend::CrosstermBackend; use tui::layout::{Constraint, Direction, Layout}; use tui::style::{Color, Modifier, Style}; use tui::text::{Span, Spans}; -use tui::widgets::{block::Block, Borders, Paragraph}; +use tui::widgets::{Block, Borders, Paragraph}; use tui::Terminal; use tui_textarea::{CursorMove, Input, Key, TextArea}; diff --git a/examples/tuirs_minimal.rs b/examples/tuirs_minimal.rs index 26e3829..5e5cc27 100644 --- a/examples/tuirs_minimal.rs +++ b/examples/tuirs_minimal.rs @@ -7,7 +7,7 @@ use crossterm::terminal::{ }; use std::io; use tui::backend::CrosstermBackend; -use tui::widgets::{block::Block, Borders}; +use tui::widgets::{Block, Borders}; use tui::Terminal; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/tuirs_termion.rs b/examples/tuirs_termion.rs index 2f9edbf..e398e3d 100644 --- a/examples/tuirs_termion.rs +++ b/examples/tuirs_termion.rs @@ -11,7 +11,7 @@ use termion::input::{MouseTerminal, TermRead}; use termion::raw::IntoRawMode; use termion::screen::AlternateScreen; use tui::backend::TermionBackend; -use tui::widgets::{block::Block, Borders}; +use tui::widgets::{Block, Borders}; use tui::Terminal; use tui_textarea::{Input, Key, TextArea}; diff --git a/examples/variable.rs b/examples/variable.rs index 5ebbd24..42fb93a 100644 --- a/examples/variable.rs +++ b/examples/variable.rs @@ -4,7 +4,7 @@ use crossterm::terminal::{ }; use ratatui::backend::CrosstermBackend; use ratatui::layout::{Constraint, Direction, Layout}; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::cmp; use std::io; diff --git a/examples/vim.rs b/examples/vim.rs index f56a141..42da7ed 100644 --- a/examples/vim.rs +++ b/examples/vim.rs @@ -4,7 +4,7 @@ use crossterm::terminal::{ }; use ratatui::backend::CrosstermBackend; use ratatui::style::{Color, Modifier, Style}; -use ratatui::widgets::{block::Block, Borders}; +use ratatui::widgets::{Block, Borders}; use ratatui::Terminal; use std::env; use std::fmt; diff --git a/src/textarea.rs b/src/textarea.rs index 365c503..32618a9 100644 --- a/src/textarea.rs +++ b/src/textarea.rs @@ -4,7 +4,7 @@ use crate::history::{Edit, EditKind, History}; use crate::input::{Input, Key}; use crate::ratatui::layout::Alignment; use crate::ratatui::style::{Color, Modifier, Style}; -use crate::ratatui::widgets::{block::Block, Widget}; +use crate::ratatui::widgets::{Block, Widget}; use crate::scroll::Scrolling; #[cfg(feature = "search")] use crate::search::Search; @@ -1676,7 +1676,7 @@ impl<'a> TextArea<'a> { /// Set the block of textarea. By default, no block is set. /// ``` /// use tui_textarea::TextArea; - /// use ratatui::widgets::{block::Block, Borders}; + /// use ratatui::widgets::{Block, Borders}; /// /// let mut textarea = TextArea::default(); /// let block = Block::default().borders(Borders::ALL).title("Block Title"); @@ -1690,7 +1690,7 @@ impl<'a> TextArea<'a> { /// Remove the block of textarea which was set by [`TextArea::set_block`]. /// ``` /// use tui_textarea::TextArea; - /// use ratatui::widgets::{block::Block, Borders}; + /// use ratatui::widgets::{Block, Borders}; /// /// let mut textarea = TextArea::default(); /// let block = Block::default().borders(Borders::ALL).title("Block Title");