Skip to content

feat: use tui-textarea #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Calonca merged 1 commit into from
Feb 14, 2026
Merged

feat: use tui-textarea #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Cargo.lock
*.pdb

# End of https://www.toptal.com/developers/gitignore/api/rust
.serena/
archive/
dist/
*.wasm
Expand All @@ -31,4 +30,13 @@ build/
.vscode/
.idea/
ratzilla/
.answers/

# LLMs
openspec/
.opencode/
.github/
.answers/
.serena/
.github/prompts/
.github/skills/
.agent/
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ratatui = "0.30"
libc = "0.2"
clap = { version = "4.4", features = ["derive"] }
success-core = { path = "success-core" }
successlib = { git = "https://github.com/Calonca/success-lib", branch = "v0.5.x" }
successlib = { git = "https://github.com/Calonca/success-lib", branch = "v0.5.x" }
1 change: 0 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ fn open_notes_in_external_editor(state: &mut AppState, archive: &Path) -> Result
})?;

success_core::notes::refresh_notes_for_selection(state);
state.notes_cursor = state.notes.len();
Ok(())
}

Expand Down
4 changes: 4 additions & 0 deletions success-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ web = []

[dependencies]
ratatui = { version = "0.30", default-features = false, features = ["all-widgets"] }
# Fork that updates ratatui from 0.29 to 0.30 to match ratzilla's ratatui version
# and resolve unicode-width version conflict. Original: tui-textarea 0.7.0 uses ratatui 0.29
tui-textarea = { git = "https://github.com/0xferrous/tui-textarea", rev = "b6bf812d1f5edab4f311f56d405a47341e9423cf", default-features = false, features = ["ratatui"] }
chrono = { version = "0.4", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
fuzzy-matcher = "0.3"
successlib = { git = "https://github.com/Calonca/success-lib", branch = "v0.5.x" }

19 changes: 9 additions & 10 deletions success-core/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use crate::notes::refresh_notes_for_selection;
use crate::types::*;
use crate::ui::build_view_items;
use successlib::{Goal, SessionView};
use tui_textarea::TextArea;

/// Central application state, generic over the storage backend.
pub struct AppState {
Expand All @@ -15,14 +16,13 @@ pub struct AppState {
pub current_day: NaiveDate,
pub selected: usize,
pub mode: Mode,
pub search_input: TextInput,
pub search_input: TextArea<'static>,
pub search_selected: usize,
pub duration_input: TextInput,
pub quantity_input: TextInput,
pub duration_input: TextArea<'static>,
pub quantity_input: TextArea<'static>,
pub timer: Option<TimerState>,
pub pending_session: Option<PendingSession>,
pub notes: String,
pub notes_cursor: usize,
pub notes_textarea: TextArea<'static>,
pub focused_block: FocusedBlock,
pub form_state: Option<FormState>,
}
Expand All @@ -43,14 +43,13 @@ impl AppState {
current_day: today,
selected: 0,
mode: Mode::View,
search_input: TextInput::default(),
search_input: TextArea::default(),
search_selected: 0,
duration_input: TextInput::default(),
quantity_input: TextInput::default(),
duration_input: TextArea::default(),
quantity_input: TextArea::default(),
timer: None,
pending_session: None,
notes: String::new(),
notes_cursor: 0,
notes_textarea: TextArea::default(),
focused_block: FocusedBlock::SessionsList,
form_state: None,
};
Expand Down
122 changes: 46 additions & 76 deletions success-core/src/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::utils::{
format_duration_suggestion, parse_commands_input, parse_duration, parse_optional_u32,
selected_goal_id,
};
use tui_textarea::TextArea;

pub fn handle_view_key(state: &mut AppState, key: &AppKeyEvent) {
match key.code {
Expand Down Expand Up @@ -53,15 +54,15 @@ pub fn handle_view_key(state: &mut AppState, key: &AppKeyEvent) {
return;
}
state.mode = Mode::AddSession;
state.search_input.clear();
clear_single_line_textarea(&mut state.search_input);
state.search_selected = 0;
}
ViewItemKind::AddReward => {
if state.timer.is_some() {
return;
}
state.mode = Mode::AddReward;
state.search_input.clear();
clear_single_line_textarea(&mut state.search_input);
state.search_selected = 0;
}
ViewItemKind::RunningTimer => {}
Expand Down Expand Up @@ -97,28 +98,28 @@ pub fn shift_day(state: &mut AppState, delta: i64) {
}

pub fn handle_search_key(state: &mut AppState, key: &AppKeyEvent) {
if state.search_input.handle_key(key) {
if handle_single_line_textarea_key(&mut state.search_input, key) {
state.search_selected = 0;
return;
}
match key.code {
AppKeyCode::Esc => {
state.mode = Mode::View;
state.search_input.clear();
clear_single_line_textarea(&mut state.search_input);
state.search_selected = 0;
}
AppKeyCode::Enter => {
let results = search_results(state);
if let Some((_, result)) = results.get(state.search_selected) {
state.search_input.clear();
clear_single_line_textarea(&mut state.search_input);
state.search_selected = 0;
match result {
SearchResult::Create { name, is_reward } => {
state.form_state = Some(FormState {
current_field: FormField::GoalName,
goal_name: TextInput::from_string(name.clone()),
quantity_name: TextInput::default(),
commands: TextInput::default(),
goal_name: single_line_textarea_from_string(name.clone()),
quantity_name: TextArea::default(),
commands: TextArea::default(),
is_reward: *is_reward,
});
state.mode = Mode::GoalForm;
Expand All @@ -140,7 +141,7 @@ pub fn handle_search_key(state: &mut AppState, key: &AppKeyEvent) {
suggestion = Some(format_duration_suggestion(duration_mins));
}
let suggestion = suggestion.unwrap_or_else(|| "25m".to_string());
state.duration_input = TextInput::from_string(suggestion);
state.duration_input = single_line_textarea_from_string(suggestion);
state.mode = Mode::DurationInput {
is_reward: matches!(state.mode, Mode::AddReward),
goal_name: goal.name.clone(),
Expand Down Expand Up @@ -177,7 +178,7 @@ pub fn handle_form_key(state: &mut AppState, key: &AppKeyEvent) {
FormField::Commands => &mut form.commands,
};

if field.handle_key(key) {
if handle_single_line_textarea_key(field, key) {
return;
}

Expand All @@ -201,16 +202,20 @@ pub fn handle_form_key(state: &mut AppState, key: &AppKeyEvent) {
};
}
AppKeyCode::Enter => {
let name = form.goal_name.value.trim().to_string();
let goal_name_input = single_line_textarea_value(&form.goal_name);
let name = goal_name_input.trim().to_string();
if name.is_empty() {
return;
}

let commands = parse_commands_input(&form.commands.value);
let quantity_name = if form.quantity_name.value.trim().is_empty() {
let commands_input = single_line_textarea_value(&form.commands);
let quantity_input = single_line_textarea_value(&form.quantity_name);

let commands = parse_commands_input(&commands_input);
let quantity_name = if quantity_input.trim().is_empty() {
None
} else {
Some(form.quantity_name.value.trim().to_string())
Some(quantity_input.trim().to_string())
};
let is_reward = form.is_reward;

Expand All @@ -225,7 +230,7 @@ pub fn handle_form_key(state: &mut AppState, key: &AppKeyEvent) {
state.goals.push(created.clone());

state.form_state = None;
state.duration_input = TextInput::from_string("25m".to_string());
state.duration_input = single_line_textarea_from_string("25m".to_string());
state.mode = Mode::DurationInput {
is_reward,
goal_name: created.name.clone(),
Expand All @@ -237,12 +242,12 @@ pub fn handle_form_key(state: &mut AppState, key: &AppKeyEvent) {
}

pub fn handle_duration_key(state: &mut AppState, key: &AppKeyEvent) {
if state.duration_input.handle_key(key) {
if handle_single_line_textarea_key(&mut state.duration_input, key) {
return;
}
match key.code {
AppKeyCode::Esc => {
state.duration_input.clear();
clear_single_line_textarea(&mut state.duration_input);
state.mode = Mode::View;
}
AppKeyCode::Enter => {
Expand All @@ -254,7 +259,8 @@ pub fn handle_duration_key(state: &mut AppState, key: &AppKeyEvent) {
} => (*is_reward, goal_name.clone(), *goal_id),
_ => return,
};
let secs = parse_duration(&state.duration_input.value).unwrap_or(25 * 60);
let duration_value = single_line_textarea_value(&state.duration_input);
let secs = parse_duration(&duration_value).unwrap_or(25 * 60);
start_timer(state, goal_name, goal_id, secs as u32, is_reward);
}
_ => {}
Expand All @@ -266,25 +272,26 @@ pub fn handle_quantity_done_key(state: &mut AppState, key: &AppKeyEvent) {
return;
}

if state.quantity_input.handle_key(key) {
if handle_single_line_textarea_key(&mut state.quantity_input, key) {
return;
}

match key.code {
AppKeyCode::Esc => {
state.quantity_input.clear();
clear_single_line_textarea(&mut state.quantity_input);
if let Some(pending) = state.pending_session.take() {
finalize_session(state, pending, None);
} else {
state.mode = Mode::View;
}
}
AppKeyCode::Enter => {
let qty = parse_optional_u32(&state.quantity_input.value);
let quantity_value = single_line_textarea_value(&state.quantity_input);
let qty = parse_optional_u32(&quantity_value);
if let Some(pending) = state.pending_session.take() {
finalize_session(state, pending, qty);
}
state.quantity_input.clear();
clear_single_line_textarea(&mut state.quantity_input);
}
_ => {}
}
Expand All @@ -295,73 +302,36 @@ pub fn handle_timer_key(state: &mut AppState, key: &AppKeyEvent) {
}

pub fn handle_notes_key(state: &mut AppState, key: &AppKeyEvent) {
if key.ctrl {
match key.code {
AppKeyCode::Left => crate::notes::move_notes_cursor_word_left(state),
AppKeyCode::Right => crate::notes::move_notes_cursor_word_right(state),
_ => {}
}
return;
}

match key.code {
AppKeyCode::Esc => {
save_notes_for_selection(state);
state.mode = Mode::View;
state.focused_block = FocusedBlock::SessionsList;
}
AppKeyCode::Backspace => {
if state.notes_cursor > 0 {
let prev_len = state
.notes
.get(..state.notes_cursor)
.and_then(|s| s.chars().last())
.map(|c| c.len_utf8())
.unwrap_or(1);
let start = state.notes_cursor - prev_len;
state.notes.replace_range(start..state.notes_cursor, "");
state.notes_cursor = start;
save_notes_for_selection(state);
}
}
AppKeyCode::Enter => {
let insert_at = state.notes_cursor;
state.notes.insert(insert_at, '\n');
state.notes_cursor += 1;
save_notes_for_selection(state);
}
AppKeyCode::Tab => {
let insert_at = state.notes_cursor;
state.notes.insert_str(insert_at, " ");
state.notes_cursor += 4;
save_notes_for_selection(state);
}
AppKeyCode::Char(c) => {
if !key.ctrl {
let insert_at = state.notes_cursor;
state.notes.insert(insert_at, c);
state.notes_cursor += c.len_utf8();
_ => {
let Some(input) = app_key_to_textarea_input(key, true) else {
return;
};

state.notes_textarea.input(input);

if matches!(
key.code,
AppKeyCode::Char(_)
| AppKeyCode::Backspace
| AppKeyCode::Delete
| AppKeyCode::Enter
| AppKeyCode::Tab
) {
save_notes_for_selection(state);
}
}
AppKeyCode::Left => {
crate::notes::move_notes_cursor_left(state);
}
AppKeyCode::Right => {
crate::notes::move_notes_cursor_right(state);
}
AppKeyCode::Up => {
crate::notes::move_notes_cursor_vert(state, -1);
}
AppKeyCode::Down => {
crate::notes::move_notes_cursor_vert(state, 1);
}
_ => {}
}
}

pub fn search_results(state: &AppState) -> Vec<(String, SearchResult)> {
let q = state.search_input.value.trim();
let query = single_line_textarea_value(&state.search_input);
let q = query.trim();
let is_reward = matches!(state.mode, Mode::AddReward);

let goals = successlib::search_goals(
Expand Down
Loading