Bump ratatui version

rhysd · Oct 21, 2024 · f5bbc5b · f5bbc5b
1 parent 2cae64b
commit f5bbc5b
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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");