Improve incremental renders and handling of terminal window resizing (#…

…211)

CHANGELOG.md

@@ -27,6 +27,7 @@
 - Added 'without_filtering' to both Select and MultiSelect, useful when you want to simplify the UX if the filter does not add any value, such as when the list is already short.
 - Added 'with_answered_prompt_prefix' to RenderConfig to allow customization of answered prompt prefix.
 - Revamped keybindings for DateSelect.
+- Improved rendering, with optimizations on incremental rendering and terminal resizing.
 
 ### Fixes
 

inquire/Cargo.toml

@@ -50,6 +50,7 @@ newline-converter = "0.3"
 once_cell = "1.18.0"
 unicode-segmentation = "1"
 unicode-width = "0.1"
+fxhash = "0.2"
 
 [dev-dependencies]
 rstest = "0.18.2"

inquire/src/prompts/test.rs

@@ -9,7 +9,6 @@ where
 {
     fn read_key(&mut self) -> crate::error::InquireResult<Key> {
         let key = self.next();
-        println!("key: {:?}", key);
 
         match key {
             Some(key) => Ok(key),

inquire/src/terminal/console.rs

@@ -12,15 +12,13 @@ use super::Terminal;
 #[derive(Clone)]
 pub struct ConsoleTerminal {
     term: Term,
-    in_memory_content: String,
 }
 
 impl ConsoleTerminal {
     #[allow(unused)]
     pub fn new() -> Self {
         Self {
             term: Term::stderr(),
-            in_memory_content: String::new(),
         }
     }
 }
@@ -80,12 +78,10 @@ impl Terminal for ConsoleTerminal {
     }
 
     fn write<T: std::fmt::Display>(&mut self, val: T) -> Result<()> {
-        self.in_memory_content.push_str(&val.to_string());
         write!(self.term, "{}", val)
     }
 
     fn write_styled<T: std::fmt::Display>(&mut self, val: &Styled<T>) -> Result<()> {
-        self.in_memory_content.push_str(&val.content.to_string());
         let styled_object = Style::from(val.style).apply_to(&val.content);
         write!(self.term, "{}", styled_object)
     }
@@ -105,14 +101,6 @@ impl Terminal for ConsoleTerminal {
     fn cursor_show(&mut self) -> Result<()> {
         self.term.show_cursor()
     }
-
-    fn get_in_memory_content(&self) -> &str {
-        &self.in_memory_content
-    }
-
-    fn clear_in_memory_content(&mut self) {
-        self.in_memory_content.clear();
-    }
 }
 
 impl Drop for ConsoleTerminal {

inquire/src/terminal/crossterm.rs

@@ -24,7 +24,6 @@ enum IO {
 
 pub struct CrosstermTerminal {
     io: IO,
-    in_memory_content: String,
 }
 
 pub struct CrosstermKeyReader;
@@ -51,7 +50,6 @@ impl CrosstermTerminal {
 
         Ok(Self {
             io: IO::Std(stderr()),
-            in_memory_content: String::new(),
         })
     }
 
@@ -140,7 +138,6 @@ impl Terminal for CrosstermTerminal {
     }
 
     fn write<T: std::fmt::Display>(&mut self, val: T) -> Result<()> {
-        self.in_memory_content.push_str(&val.to_string());
         self.write_command(Print(val))
     }
 
@@ -185,14 +182,6 @@ impl Terminal for CrosstermTerminal {
     fn cursor_show(&mut self) -> Result<()> {
         self.write_command(cursor::Show)
     }
-
-    fn get_in_memory_content(&self) -> &str {
-        &self.in_memory_content
-    }
-
-    fn clear_in_memory_content(&mut self) {
-        self.in_memory_content.clear();
-    }
 }
 
 impl Drop for CrosstermTerminal {
@@ -345,7 +334,6 @@ mod test {
         pub fn new_in_memory_output() -> Self {
             Self {
                 io: IO::Test(Vec::new()),
-                in_memory_content: String::new(),
             }
         }
 

inquire/src/terminal/mod.rs

@@ -28,9 +28,6 @@ pub trait Terminal: Sized {
     fn clear_line(&mut self) -> Result<()>;
     fn clear_until_new_line(&mut self) -> Result<()>;
 
-    fn get_in_memory_content(&self) -> &str;
-    fn clear_in_memory_content(&mut self);
-
     fn cursor_hide(&mut self) -> Result<()>;
     fn cursor_show(&mut self) -> Result<()>;
     fn cursor_up(&mut self, cnt: u16) -> Result<()>;

inquire/src/terminal/termion.rs

@@ -53,7 +53,6 @@ impl InputReader for TermionKeyReader {
 
 pub struct TermionTerminal<'a> {
     io: IO<'a>,
-    in_memory_content: String,
 }
 
 impl<'a> TermionTerminal<'a> {
@@ -65,7 +64,6 @@ impl<'a> TermionTerminal<'a> {
 
         Ok(Self {
             io: IO::TTY(raw_terminal),
-            in_memory_content: String::new(),
         })
     }
 
@@ -76,7 +74,6 @@ impl<'a> TermionTerminal<'a> {
     pub fn new_with_writer<W: 'a + Write>(writer: &'a mut W) -> Self {
         Self {
             io: IO::Custom(writer),
-            in_memory_content: String::new(),
         }
     }
 
@@ -161,7 +158,6 @@ impl<'a> Terminal for TermionTerminal<'a> {
     }
 
     fn write<T: std::fmt::Display>(&mut self, val: T) -> Result<()> {
-        self.in_memory_content.push_str(&val.to_string());
         write!(self.get_writer(), "{}", val)
     }
 
@@ -206,14 +202,6 @@ impl<'a> Terminal for TermionTerminal<'a> {
     fn cursor_show(&mut self) -> Result<()> {
         write!(self.get_writer(), "{}", termion::cursor::Show)
     }
-
-    fn get_in_memory_content(&self) -> &str {
-        self.in_memory_content.as_ref()
-    }
-
-    fn clear_in_memory_content(&mut self) {
-        self.in_memory_content.clear();
-    }
 }
 
 impl<'a> Drop for TermionTerminal<'a> {