update crossterm and ratatui

Author: extrawurst

Cargo.lock

@@ -25,7 +25,7 @@ bytesize = { version = "1.3", default-features = false }
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 clap = { version = "4.5", features = ["env", "cargo"] }
 crossbeam-channel = "0.5"
-crossterm = { version = "0.27", features = ["serde"] }
+crossterm = { version = "0.28", features = ["serde"] }
 dirs = "5.0"
 easy-cast = "0.5"
 filetreelist = { path = "./filetreelist", version = "0.5" }
@@ -39,7 +39,7 @@ notify-debouncer-mini = "0.4"
 once_cell = "1"
 # pin until upgrading this does not introduce a duplicte dependency
 parking_lot_core = "=0.9.9"
-ratatui = { version = "0.27", default-features = false, features = [
+ratatui = { version = "0.28", default-features = false, features = [
     'crossterm',
     'serde',
 ] }
@@ -57,7 +57,7 @@ syntect = { version = "5.2", default-features = false, features = [
     "default-themes",
     "html",
 ] }
-tui-textarea = "0.5"
+tui-textarea = "0.6"
 two-face = { version = "0.4.0", default-features = false }
 unicode-segmentation = "1.11"
 unicode-truncate = "1.0"

Cargo.toml

@@ -22,4 +22,4 @@ version = "1.0.3"
 
 [bans]
 multiple-versions = "deny"
-skip-tree = [{ name = "windows-sys" }, { name = "bitflags" }]
+skip-tree = [{ name = "windows-sys" }, { name = "bitflags" }, { name = "mio" }]

deny.toml

@@ -227,7 +227,7 @@ impl App {
 
 	///
 	pub fn draw(&self, f: &mut Frame) -> Result<()> {
-		let fsize = f.size();
+		let fsize = f.area();
 
 		self.cmdbar.borrow_mut().refresh_width(fsize.width);
 

src/app.rs

@@ -82,7 +82,7 @@ macro_rules! draw_popups {
                 ]
                 .as_ref(),
             )
-            .split(f.size())[0];
+            .split(f.area())[0];
 
             ($($self.$element.draw(&mut f, size)?) , +);
 

src/components/mod.rs

@@ -623,18 +623,18 @@ impl DrawableComponent for TextInputComponent {
 			let area = if self.embed {
 				rect
 			} else if self.input_type == InputType::Multiline {
-				let area = ui::centered_rect(60, 20, f.size());
+				let area = ui::centered_rect(60, 20, f.area());
 				ui::rect_inside(
 					Size::new(10, 3),
-					f.size().into(),
+					f.area().into(),
 					area,
 				)
 			} else {
-				let area = ui::centered_rect(60, 1, f.size());
+				let area = ui::centered_rect(60, 1, f.area());
 
 				ui::rect_inside(
 					Size::new(10, 3),
-					Size::new(f.size().width, 3),
+					Size::new(f.area().width, 3),
 					area,
 				)
 			};

src/components/textinput.rs

@@ -302,7 +302,7 @@ fn shutdown_terminal() {
 
 fn draw(terminal: &mut Terminal, app: &App) -> io::Result<()> {
 	if app.requires_redraw() {
-		terminal.resize(terminal.size()?)?;
+		terminal.clear()?;
 	}
 
 	terminal.draw(|f| {

src/main.rs

@@ -64,10 +64,10 @@ impl DrawableComponent for BranchListPopup {
 			let area = ui::centered_rect(
 				PERCENT_SIZE.width,
 				PERCENT_SIZE.height,
-				f.size(),
+				f.area(),
 			);
 			let area =
-				ui::rect_inside(MIN_SIZE, f.size().into(), area);
+				ui::rect_inside(MIN_SIZE, f.area().into(), area);
 			let area = area.intersection(rect);
 
 			f.render_widget(Clear, area);

src/popups/branchlist.rs

@@ -35,7 +35,7 @@ impl DrawableComponent for ConfirmPopup {
 				self.theme.text_danger(),
 			);
 
-			let area = ui::centered_rect(50, 20, f.size());
+			let area = ui::centered_rect(50, 20, f.area());
 			f.render_widget(Clear, area);
 			f.render_widget(
 				popup_paragraph(&title, txt, &self.theme, true, true),

src/popups/confirm.rs

@@ -131,7 +131,7 @@ impl DrawableComponent for ExternalEditorPopup {
 					.collect::<Vec<Span>>(),
 			);
 
-			let area = ui::centered_rect_absolute(25, 3, f.size());
+			let area = ui::centered_rect_absolute(25, 3, f.area());
 			f.render_widget(Clear, area);
 			f.render_widget(
 				Paragraph::new(txt)