Merge pull request #48 from ckaznable/ratatui

Update Ratatui version

Cargo.toml

@@ -13,17 +13,16 @@ version = "1.12.2"
 edition = "2021"
 
 [dependencies]
-ratatui = "=0.26.2"
+ratatui = "=0.27.0"
 tui-input = "=0.8.0"
-crossterm = "=0.27.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sys-locale = "0.3.1"
 lazy_static = "1.4"
 clap = { version = "4.4.7", features = ["derive"] }
 regex = "1.10.2"
 textwrap = "0.16.0"
-ansi-to-tui = "=3.1.0"
+ansi-to-tui = "4.0.1"
 anyhow = "1.0.79"
 xdg = "2.5.2"
 

src/keybinding.rs

@@ -1,4 +1,4 @@
-use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
+use ratatui::crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 use tui_input::backend::crossterm::EventHandler;
 
 use crate::state::{AppState, InputMode};

src/main.rs

@@ -9,11 +9,6 @@ use std::{
 use xdg::BaseDirectories;
 
 use clap::Parser;
-use crossterm::{
-    event::{self, DisableMouseCapture, Event},
-    execute,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
-};
 use poketex::{
     env::DEF_LOCALES,
     keybinding::handle_key,
@@ -24,6 +19,11 @@ use poketex::{
     state::{AppState, PokemonListState},
     ui::ui,
 };
+use ratatui::crossterm::{
+    event::{self, DisableMouseCapture, Event},
+    execute,
+    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+};
 use ratatui::{
     backend::{Backend, CrosstermBackend},
     Terminal,
@@ -58,7 +58,7 @@ impl Tui {
 impl Drop for Tui {
     fn drop(&mut self) {
         // restore terminal
-        if crossterm::terminal::is_raw_mode_enabled().unwrap() {
+        if ratatui::crossterm::terminal::is_raw_mode_enabled().unwrap() {
             let _ = execute!(
                 self.terminal.backend_mut(),
                 LeaveAlternateScreen,

src/state/pokemon.rs

@@ -30,7 +30,7 @@ impl PokemonListState {
         let list_scrollbar_state = ScrollbarState::default().content_length(pokemon_len);
 
         let mut list_state = ListState::default();
-        list_state.select(Some(0));
+        list_state.select_first();
 
         let filtered_list = Vec::with_capacity(pokemon_len);
 
@@ -69,7 +69,7 @@ impl PokemonListState {
     }
 
     pub fn scroll_to_first(&mut self) {
-        self.select(0)
+        self.list_state.select_first();
     }
 
     pub fn scroll_to_end(&mut self) {
@@ -138,7 +138,7 @@ impl PokemonListState {
     }
 
     pub fn set_list_filter(&mut self, filter: String) {
-        self.filter_query = filter.clone();
+        self.filter_query.clone_from(&filter);
 
         if !filter.is_empty() {
             self.filtered_list.clear();

src/widget/profile/mod.rs

@@ -66,21 +66,21 @@ impl StatefulWidget for PokemonProfileWidget {
             ascii_form.to_string()
         };
 
-        let (ansi_width, ansi_height, ansi) = match std::fs::read(
+        let (ansi_width, ansi_height, ansi) = std::fs::read(
             state
                 .get_assets_path(ascii_type)
                 .join(lowercase_name + &ascii_form),
-        ) {
-            Err(_) => (0u16, 0u16, None),
-            Ok(buffer) => match buffer.into_text() {
-                Ok(ansi) => (
-                    ansi.width() as u16 + 1,
-                    ansi.height() as u16 + 1,
-                    Some(ansi),
-                ),
-                Err(_) => (0u16, 0u16, None),
-            },
-        };
+        )
+        .map(|buffer| buffer.into_text().ok())
+        .ok()
+        .flatten()
+        .map_or((0u16, 0u16, None), |ansi| {
+            (
+                ansi.width() as u16 + 1,
+                ansi.height() as u16 + 1,
+                Some(ansi),
+            )
+        });
 
         let [overview, _, main, _, ability_bottom_area, region_form_navigation] =
             Layout::vertical([