Upgrade crossterm and add value_and_reset()

Closes: #32
Closes: #31

Author: sayanarijit

.github/workflows/ci.yml

@@ -2,25 +2,24 @@ name: Continuous Integration
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
-    - name: Run lint
-      run: cargo clippy --verbose
-    - name: Run fmt
-      run: cargo fmt --verbose
+      - uses: actions/checkout@v2
+      - name: Build
+        run: cargo build
+      - name: Run tests
+        run: cargo test --all-features
+      - name: Run lint
+        run: cargo clippy
+      - name: Run fmt
+        run: cargo fmt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tui-input"
-version = "0.11.1"
+version = "0.12.0"
 edition = "2021"
 authors = ["Arijit Basu <[email protected]>"]
 description = "TUI input library supporting multiple backends"
@@ -14,18 +14,15 @@ autoexamples = true
 
 [features]
 default = ["crossterm"]
-crossterm = ["dep:ratatui"]
-serde = ["dep:serde"]
-termion = ["dep:termion"]
 
 [dependencies]
-ratatui = { version = "0.29", optional = true }
+unicode-width = "0.2.0"
 serde = { version = "1.0.218", optional = true, features = ["derive"] }
+crossterm = { version = "0.29.0", optional = true }
 termion = { version = "4.0.4", optional = true }
-unicode-width = "0.2.0"
 
 [dev-dependencies]
-crossterm = { version = "0.28.1" }
+ratatui = { version = "0.30.0-alpha.2", features = ["crossterm"] }
 
 [[example]]
 name = "crossterm_input"

examples/ratatui_input.rs

@@ -70,8 +70,7 @@ impl App {
     }
 
     fn push_message(&mut self) {
-        self.messages.push(self.input.value().into());
-        self.input.reset();
+        self.messages.push(self.input.value_and_reset());
     }
 
     fn render(&self, frame: &mut Frame) {

src/backend/crossterm.rs

@@ -1,8 +1,8 @@
 use crate::{Input, InputRequest, StateChanged};
-use ratatui::crossterm::event::{
+use crossterm::event::{
     Event as CrosstermEvent, KeyCode, KeyEvent, KeyEventKind, KeyModifiers,
 };
-use ratatui::crossterm::{
+use crossterm::{
     cursor::MoveTo,
     queue,
     style::{Attribute as CAttribute, Print, SetAttribute},
@@ -120,7 +120,7 @@ impl EventHandler for Input {
 
 #[cfg(test)]
 mod tests {
-    use ratatui::crossterm::event::{KeyEventKind, KeyEventState};
+    use crossterm::event::{KeyEventKind, KeyEventState};
 
     use super::*;
 

src/input.rs

@@ -1,3 +1,20 @@
+//! Core logic for handling input.
+//!
+//! # Example: Without any backend
+//!
+//! ```
+//! use tui_input::{Input, InputRequest, StateChanged};
+//!
+//! let mut input: Input = "Hello Worl".into();
+//!
+//! let req = InputRequest::InsertChar('d');
+//! let resp = input.handle(req);
+//!
+//! assert_eq!(resp, Some(StateChanged { value: true, cursor: true }));
+//! assert_eq!(input.cursor(), 11);
+//! assert_eq!(input.to_string(), "Hello World");
+//! ```
+
 /// Input requests are used to change the input state.
 ///
 /// Different backends can be used to convert events into requests.
@@ -77,6 +94,13 @@ impl Input {
         self.value = Default::default();
     }
 
+    // Reset the cursor and value to default, returning the previous value
+    pub fn value_and_reset(&mut self) -> String {
+        let val = self.value.clone();
+        self.reset();
+        val
+    }
+
     /// Handle request and emit response.
     pub fn handle(&mut self, req: InputRequest) -> InputResponse {
         use InputRequest::*;

src/lib.rs

@@ -1,21 +1,6 @@
 //! TUI input library supporting multiple backends.
 //!
-//! # Example: Without any backend
-//!
-//! ```
-//! use tui_input::{Input, InputRequest, StateChanged};
-//!
-//! let mut input: Input = "Hello Worl".into();
-//!
-//! let req = InputRequest::InsertChar('d');
-//! let resp = input.handle(req);
-//!
-//! assert_eq!(resp, Some(StateChanged { value: true, cursor: true }));
-//! assert_eq!(input.cursor(), 11);
-//! assert_eq!(input.to_string(), "Hello World");
-//! ```
-//!
-//! See other examples in the [GitHub repo](https://github.com/sayanarijit/tui-input/tree/main/examples).
+//! See examples in the [GitHub repo](https://github.com/sayanarijit/tui-input/tree/main/examples).
 
 mod input;