Implement a faster input field and get rid of edtui

Author: asinglebit

Cargo.lock

@@ -13,7 +13,6 @@ git2 = "0.20.3"
 colored = "3"
 chrono = "0.4"
 rand = "0.9"
-edtui = "0.10.0"
 encoding_rs = "0.8.35"
 im = "15.1.0"
 indexmap = "2.12.1"

Cargo.toml

@@ -21,11 +21,6 @@ use std::{
     io,
 };
 #[rustfmt::skip]
-use edtui::{
-    EditorEventHandler,
-    EditorState
-};
-#[rustfmt::skip]
 use git2::{
     Repository
 };
@@ -50,7 +45,7 @@ use ratatui::{
         Span
     },
 };
-use crate::{core::stashes::Stashes, helpers::{copy::{STR_CREATE_BRANCH, STR_CREATE_COMMIT, STR_CREATE_TAG, STR_FIND_SHA}, heatmap::{DAYS, WEEKS}, keymap::{Command, KeyBinding}}};
+use crate::{app::input::TextInput, core::stashes::Stashes, helpers::{copy::{STR_CREATE_BRANCH, STR_CREATE_COMMIT, STR_CREATE_TAG, STR_FIND_SHA}, heatmap::{DAYS, WEEKS}, keymap::{Command, KeyBinding}}};
 #[rustfmt::skip]
 use crate::{
     app::{
@@ -105,7 +100,6 @@ use crate::{
 pub enum Viewport {
     Graph,
     Viewer,
-    Editor,
     Splash,
     Settings
 }
@@ -208,10 +202,6 @@ pub struct App {
     pub settings_selected: usize,
     pub settings_selections: Vec<usize>,
 
-    // Editor
-    pub file_editor: EditorState,
-    pub file_editor_event_handler: EditorEventHandler,
-
     // Inspector
     pub inspector_selected: usize,
     pub inspector_scroll: Cell<usize>,
@@ -231,8 +221,7 @@ pub struct App {
     pub modal_solo_selected: i32,
 
     // Modal editor
-    pub modal_editor: EditorState,
-    pub modal_editor_event_handler: EditorEventHandler,
+    pub modal_input: TextInput,
 
     // Modal delete a branch
     pub modal_delete_branch_selected: i32,
@@ -297,9 +286,6 @@ impl App  {
             Viewport::Viewer => {
                 self.draw_viewer(frame);
             }
-            Viewport::Editor => {
-                self.draw_editor(frame);
-            }
             Viewport::Splash => {
                 self.draw_splash(frame);
             }

src/app/app.rs

@@ -18,11 +18,7 @@ use ratatui::{
     }
 };
 #[rustfmt::skip]
-use edtui::{
-    EditorEventHandler,
-    EditorState
-};
-use crate::{core::stashes::Stashes, git::queries::helpers::commits_per_day, helpers::heatmap::build_heatmap};
+use crate::{app::input::TextInput, core::stashes::Stashes, git::queries::helpers::commits_per_day, helpers::heatmap::build_heatmap};
 #[rustfmt::skip]
 use crate::{
     app::{
@@ -157,10 +153,6 @@ impl Default for App {
             // Viewer
             viewer_selected: 0,
             viewer_scroll: 0.into(),
-
-            // Editor
-            file_editor: EditorState::default(),
-            file_editor_event_handler: EditorEventHandler::default(),
 
             // Inspector
             inspector_selected: 0,
@@ -181,8 +173,7 @@ impl Default for App {
             modal_solo_selected: 0,
 
             // Modal editor
-            modal_editor: EditorState::default(),
-            modal_editor_event_handler: EditorEventHandler::default(),
+            modal_input: TextInput::default(),
 
             // Modal delete branch
             modal_delete_branch_selected: 0,

src/app/app_default.rs

@@ -23,13 +23,6 @@ use ratatui::{
     },
 };
 #[rustfmt::skip]
-use edtui::{
-    EditorStatusLine,
-    EditorTheme,
-    EditorView,
-    EditorMode
-};
-#[rustfmt::skip]
 use crate::app::app::{
     App
 };
@@ -38,103 +31,87 @@ impl App {
 
     pub fn draw_modal_input(&mut self, frame: &mut Frame, title: &str) {
 
+        // Modal dimensions
         let length = 60;
-        let height = 12;
+        let height = 13;
+        let fill = 7;
+
+        // Build the modal lines: title + empty padding + footer
+        let mut lines: Vec<Line> = Vec::with_capacity(fill + 2);
 
-        let lines: Vec<Line> = vec![
-            Line::from(vec![
-                Span::styled(title, Style::default().fg(self.theme.COLOR_TEXT)),
-            ]),
-            Line::from(""),
-            Line::from(""),
-            Line::from(""),
-            Line::from(""),
-            Line::from(""),
-            Line::from(""),
-            Line::from(vec![
-                Span::styled(if self.modal_editor.mode == EditorMode::Normal {"(enter)".to_string()} else { "enter".to_string() }, Style::default().fg(if self.modal_editor.mode == EditorMode::Normal { self.theme.COLOR_GREY_500 } else { self.theme.COLOR_GREY_600 })),
-            ]),
-        ];
-            
+        // Title line
+        lines.push(Line::from(Span::styled(title, Style::default().fg(self.theme.COLOR_TEXT))));
+
+        // Vertical padding
+        lines.extend(vec![Line::default(); fill]);
+        
+        // Footer line
+        lines.push(Line::from(Span::styled("(enter)".to_string(), Style::default().fg(self.theme.COLOR_GREY_500))));
+
+        // Render background block behind the modal
         let bg_block = Block::default().style(Style::default().fg(self.theme.COLOR_BORDER));
         bg_block.render(frame.area(), frame.buffer_mut());
 
-        // Modal size (smaller than area)
+         // Compute modal area (centered and smaller than the full frame)
         let modal_width = length.min((frame.area().width as f32 * 0.8) as usize) as u16;
         let modal_height = height.min((frame.area().height as f32 * 0.6) as usize) as u16;
         let x = frame.area().x + (frame.area().width - modal_width) / 2;
         let y = frame.area().y + (frame.area().height - modal_height) / 2;
         let modal_area = Rect::new(x, y, modal_width, modal_height);
 
+        // Clear the modal area
         frame.render_widget(Clear, modal_area);
 
-        // Modal block
+        // Render the main modal block with rounded borders and "esc" title
         let modal_block = Block::default()
             .borders(Borders::ALL)
             .border_style(Style::default().fg(self.theme.COLOR_GREY_600))
-            .title(Span::styled(if self.modal_editor.mode == EditorMode::Normal {" (esc) "} else { "─ esc ─" }, Style::default().fg(if self.modal_editor.mode == EditorMode::Normal { self.theme.COLOR_GREY_500 } else { self.theme.COLOR_GREY_600 })))
+            .title(Span::styled(" (esc) ", Style::default().fg(self.theme.COLOR_GREY_500)))
             .title_alignment(Alignment::Right)
-            .padding(Padding { left: 3, right: 3, top: 1, bottom: 1})
+            .padding(Padding { left: 3, right: 3, top: 1, bottom: 1 })
             .border_type(ratatui::widgets::BorderType::Rounded);
 
-        // Modal content
-        let paragraph = Paragraph::new(Text::from(lines))
+        // Render the text content (title + instructions)
+       Paragraph::new(Text::from(lines))
             .block(modal_block)
-            .alignment(Alignment::Center);
-        
-        // Render the paragraph
-        paragraph.render(modal_area, frame.buffer_mut());
-
-        let custom_theme = EditorTheme {
-            base: Style::default().fg(self.theme.COLOR_GREY_500),
-            cursor_style: Style::default().bg(self.theme.COLOR_TEXT),
-            selection_style: Style::default(),
-            block: Some(
-                Block::default()
-                    .padding(Padding { left: 1, right: 1, top: 0, bottom: 0})
-                    .borders(Borders::TOP)
-                    .border_type(ratatui::widgets::BorderType::Rounded)
-                    .border_style(Style::default().fg(self.theme.COLOR_GREY_800))),
-            status_line: Some(EditorStatusLine::default()
-                .style_text(Style::default().fg(self.theme.COLOR_TEXT))
-                .style_line(Style::default().fg(self.theme.COLOR_GREY_800))
-                .align_left(true))
-        };
-        let editor_view = EditorView::new(&mut self.modal_editor).theme(custom_theme);
+            .alignment(Alignment::Center)
+            .render(modal_area, frame.buffer_mut());
 
+        // Input field area
         let input_area = Rect {
             x: modal_area.x + modal_area.width / 2 - 29,
             y: modal_area.y + 4,
             width: 58,
-            height: 4,
+            height: 5,
         };
 
-        // Render the editor in the modal area
-        editor_view.render(input_area, frame.buffer_mut());
-        
-        // Modal block
-        Block::default()
-            .borders(Borders::TOP)
-            .border_style(Style::default().fg(self.theme.COLOR_GREY_800))
-            .border_type(ratatui::widgets::BorderType::Rounded)
-            .render(Rect {
-            x: modal_area.x + 1,
-            y: modal_area.y + 7,
-            width: 2,
-            height: 1,
-        }, frame.buffer_mut());
+        // Determine visible portion of input text
+        let visible_width = input_area.width.saturating_sub(1) as usize;
+        self.modal_input.set_max_width(visible_width);
+        let start: usize = *self.modal_input.scroll();
+        let end: usize = (start + visible_width).min(self.modal_input.value().len());
+        let visible_text = &self.modal_input.value()[start..end];
+
+        // Calculate cursor x position relative to input area
+        let cursor_x = (self.modal_input.cursor() - self.modal_input.scroll()) as u16 + 1;
+    
+        // Top divider with input value
+        frame.render_widget(Paragraph::new(Line::from(Span::styled(visible_text, Style::default().fg(self.theme.COLOR_TEXT)))).block(
+            Block::default()
+                .padding(ratatui::widgets::Padding {left: 1, right: 1, top: 1, bottom: 0})
+                .borders(Borders::TOP)
+                .border_style(Style::default()
+                .fg(self.theme.COLOR_GREY_800))
+            ), input_area);
 
-        // Modal block
+        // Cursor
+        frame.set_cursor_position((input_area.x + cursor_x, input_area.y + 2));
+
+        // Bottom divider
         Block::default()
             .borders(Borders::TOP)
             .border_style(Style::default().fg(self.theme.COLOR_GREY_800))
             .border_type(ratatui::widgets::BorderType::Rounded)
-            .render(Rect {
-            x: modal_area.x + 11,
-            y: modal_area.y + 7,
-            width: modal_width - 12,
-            height: 1,
-        }, frame.buffer_mut());
-
+            .render(Rect { x: modal_area.x + 1, y: modal_area.y + 8, width: modal_width - 2, height: 1}, frame.buffer_mut());
     }
 }