Merge pull request #54 from ynqa/v0.8.0/dev

ynqa · web-flow · commit d5b69906587f · 2025-03-17T19:07:50.000+09:00
v0.8.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Put the package in your `Cargo.toml`.
 
 ```toml
 [dependencies]
-promkit = "0.7.0"
+promkit = "0.8.0"
 ```
 
 ## Features
diff --git a/promkit-derive/Cargo.toml b/promkit-derive/Cargo.toml
@@ -15,4 +15,4 @@ proc-macro = true
 syn = { version = "2.0.52", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
-promkit = { path = "../promkit", version = "0.7.0" }
+promkit = { path = "../promkit", version = "0.8.0" }
diff --git a/promkit/Cargo.toml b/promkit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "promkit"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["ynqa <un.pensiero.vano@gmail.com>"]
 edition = "2021"
 description = "A toolkit for building your own interactive command-line tools"
diff --git a/promkit/src/core/text/state.rs b/promkit/src/core/text/state.rs
@@ -6,7 +6,7 @@ use super::Text;
 ///
 /// This state encapsulates the properties and
 /// behaviors specific to text handling,
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct State {
     /// The text to be rendered.
     pub text: Text,
diff --git a/promkit/src/core/text_editor/state.rs b/promkit/src/core/text_editor/state.rs
@@ -4,7 +4,7 @@ use crate::{crossterm::style::ContentStyle, grapheme::StyledGraphemes, pane::Pan
 
 use super::{History, Mode, TextEditor};
 
-#[derive(Clone)]
+#[derive(Clone, Default)]
 pub struct State {
     /// The `TextEditor` component to be rendered.
     pub texteditor: TextEditor,
diff --git a/promkit/src/grapheme.rs b/promkit/src/grapheme.rs
@@ -233,7 +233,6 @@ impl StyledGraphemes {
     ///     - with the style applied to all occurrences of the query if the query is found.
     ///     - unchanged if the query string is empty.
     /// - `None`: if the query string is not found in the collection.
-
     pub fn highlight<S: AsRef<str>>(mut self, query: S, style: ContentStyle) -> Option<Self> {
         let query_str = query.as_ref();
         if query_str.is_empty() {
@@ -324,7 +323,7 @@ pub struct StyledGraphemesDisplay<'a> {
     styled_graphemes: &'a StyledGraphemes,
 }
 
-impl<'a> fmt::Display for StyledGraphemesDisplay<'a> {
+impl fmt::Display for StyledGraphemesDisplay<'_> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         for styled_grapheme in self.styled_graphemes.iter() {
             write!(f, "{}", styled_grapheme.style.apply(styled_grapheme.ch))?;
diff --git a/promkit/src/jsonz.rs b/promkit/src/jsonz.rs
@@ -395,7 +395,7 @@ pub struct PathIterator<'a> {
     stack: Vec<(String, &'a serde_json::Value)>,
 }
 
-impl<'a> PathIterator<'a> {
+impl PathIterator<'_> {
     fn escape_json_path_key(key: &str) -> String {
         if key.contains('.') || key.contains('-') || key.contains('@') {
             format!("\"{}\"", key)
@@ -405,7 +405,7 @@ impl<'a> PathIterator<'a> {
     }
 }
 
-impl<'a> Iterator for PathIterator<'a> {
+impl Iterator for PathIterator<'_> {
     type Item = String;
 
     fn next(&mut self) -> Option<Self::Item> {
diff --git a/promkit/src/keymap.rs b/promkit/src/keymap.rs
diff --git a/promkit/src/lib.rs b/promkit/src/lib.rs
@@ -11,21 +11,21 @@
 //!
 //! ```toml
 //! [dependencies]
-//! promkit = "0.7.0"
+//! promkit = "0.8.0"
 //! ```
 //!
 //! ## Features
 //!
 //! - Support cross-platform both UNIX and Windows owing to [crossterm](https://github.com/crossterm-rs/crossterm)
 //! - Various building methods
 //!   - Preset; Support for quickly setting up a UI by providing simple parameters.
-//!     - [Readline](https://github.com/ynqa/promkit/tree/v0.7.0#readline)
-//!     - [Confirm](https://github.com/ynqa/promkit/tree/v0.7.0#confirm)
-//!     - [Password](https://github.com/ynqa/promkit/tree/v0.7.0#password)
-//!     - [Select](https://github.com/ynqa/promkit/tree/v0.7.0#select)
-//!     - [QuerySelect](https://github.com/ynqa/promkit/tree/v0.7.0#queryselect)
-//!     - [Checkbox](https://github.com/ynqa/promkit/tree/v0.7.0#checkbox)
-//!     - [Tree](https://github.com/ynqa/promkit/tree/v0.7.0#tree)
+//!     - [Readline](https://github.com/ynqa/promkit/tree/v0.8.0#readline)
+//!     - [Confirm](https://github.com/ynqa/promkit/tree/v0.8.0#confirm)
+//!     - [Password](https://github.com/ynqa/promkit/tree/v0.8.0#password)
+//!     - [Select](https://github.com/ynqa/promkit/tree/v0.8.0#select)
+//!     - [QuerySelect](https://github.com/ynqa/promkit/tree/v0.8.0#queryselect)
+//!     - [Checkbox](https://github.com/ynqa/promkit/tree/v0.8.0#checkbox)
+//!     - [Tree](https://github.com/ynqa/promkit/tree/v0.8.0#tree)
 //!   - Combining various UI components.
 //!     - They are provided with the same interface, allowing users to choose and
 //!       assemble them according to their preferences.
@@ -39,7 +39,7 @@
 //!
 //! ## Examples/Demos
 //!
-//! See [here](https://github.com/ynqa/promkit/tree/v0.7.0#examplesdemos)
+//! See [here](https://github.com/ynqa/promkit/tree/v0.8.0#examplesdemos)
 //!
 //! ## Why *promkit*?
 //!
diff --git a/promkit/src/terminal.rs b/promkit/src/terminal.rs
@@ -61,12 +61,7 @@ impl Terminal {
             .collect::<Vec<&Pane>>();
 
         if height < viewable_panes.len() as u16 {
-            return crossterm::execute!(
-                io::stdout(),
-                terminal::Clear(terminal::ClearType::FromCursorDown),
-                style::Print("⚠️ Insufficient Space"),
-            )
-            .map_err(anyhow::Error::from);
+            return Err(anyhow::anyhow!("Insufficient space to display all panes"));
         }
 
         crossterm::queue!(
@@ -77,25 +72,30 @@ impl Terminal {
 
         let mut used = 0;
 
-        let mut current_cursor_y = height.saturating_sub(self.position.1);
-        for (i, pane) in viewable_panes.iter().enumerate() {
-            let rows = pane.extract(
-                1.max(
-                    (height as usize)
-                        // -1 in this context signifies the exclusion of the current pane.
-                        .saturating_sub(used + viewable_panes.len() - 1 - i),
-                ),
+        let mut remaining_lines = height.saturating_sub(self.position.1);
+
+        for (pane_index, pane) in viewable_panes.iter().enumerate() {
+            // We need to ensure each pane gets at least 1 row
+            let max_rows = 1.max(
+                (height as usize).saturating_sub(used + viewable_panes.len() - 1 - pane_index),
             );
+
+            let rows = pane.extract(max_rows);
             used += rows.len();
-            for (j, row) in rows.iter().enumerate() {
+
+            for (row_index, row) in rows.iter().enumerate() {
                 crossterm::queue!(io::stdout(), style::Print(row.styled_display()))?;
 
-                current_cursor_y = current_cursor_y.saturating_sub(1);
+                remaining_lines = remaining_lines.saturating_sub(1);
+
+                // Determine if scrolling is needed:
+                // - We need to scroll if we've reached the bottom of the terminal (remaining_lines == 0)
+                // - AND we have more content to display (either more rows in current pane or more panes)
+                let is_last_pane = pane_index == viewable_panes.len() - 1;
+                let is_last_row_in_pane = row_index == rows.len() - 1;
+                let has_more_content = !(is_last_pane && is_last_row_in_pane);
 
-                if ((i == viewable_panes.len() - 1 && j != rows.len() - 1)
-                    || i != viewable_panes.len() - 1)
-                    && current_cursor_y == 0
-                {
+                if has_more_content && remaining_lines == 0 {
                     crossterm::queue!(io::stdout(), terminal::ScrollUp(1))?;
                     self.position.1 = self.position.1.saturating_sub(1);
                 }

Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ pub struct PathIterator<'a> {`
`395`	`395`	`stack: Vec<(String, &'a serde_json::Value)>,`
`396`	`396`	`}`
`397`	`397`
`398`		`-impl<'a> PathIterator<'a> {`
	`398`	`+impl PathIterator<'_> {`
`399`	`399`	`fn escape_json_path_key(key: &str) -> String {`
`400`	`400`	`if key.contains('.') \|\| key.contains('-') \|\| key.contains('@') {`
`401`	`401`	`format!("\"{}\"", key)`
`@@ -405,7 +405,7 @@ impl<'a> PathIterator<'a> {`
`405`	`405`	`}`
`406`	`406`	`}`
`407`	`407`
`408`		`-impl<'a> Iterator for PathIterator<'a> {`
	`408`	`+impl Iterator for PathIterator<'_> {`
`409`	`409`	`type Item = String;`
`410`	`410`
`411`	`411`	`fn next(&mut self) -> Option<Self::Item> {`