From 7e4c46da3e9fa53bb7c994ab4c6789600bedcd76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:49:50 +0000 Subject: [PATCH 1/3] chore(deps): bump ratatui-textarea from 0.9.2 to 0.9.4 Bumps [ratatui-textarea](https://github.com/ratatui/ratatui-textarea) from 0.9.2 to 0.9.4. - [Release notes](https://github.com/ratatui/ratatui-textarea/releases) - [Changelog](https://github.com/ratatui/ratatui-textarea/blob/main/CHANGELOG.md) - [Commits](https://github.com/ratatui/ratatui-textarea/compare/ratatui-textarea-v0.9.2...ratatui-textarea-v0.9.4) --- updated-dependencies: - dependency-name: ratatui-textarea dependency-version: 0.9.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc5d7de..335a07b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3363,9 +3363,9 @@ dependencies = [ [[package]] name = "ratatui-textarea" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c78d5ba0f26f97baed69a4c479f268a31c7b5b89d68ab939842152e383d6e73" +checksum = "6cf7263fbb7f37caa4bcfd00fc604ff1409f70456a833fbdff99282e88fdfe92" dependencies = [ "ratatui-core", "ratatui-crossterm", From 0c198294b52fcd7682d9cb384e4492c11506df37 Mon Sep 17 00:00:00 2001 From: andiveli Date: Wed, 18 Nov 2026 22:14:10 -0500 Subject: [PATCH 2/3] test(composer): pin Tab stops after halfwidth kana --- tests/composer_behavior.rs | 76 +++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/tests/composer_behavior.rs b/tests/composer_behavior.rs index bbddd8e..aced0ba 100644 --- a/tests/composer_behavior.rs +++ b/tests/composer_behavior.rs @@ -1,13 +1,20 @@ +use std::{sync::mpsc, time::Duration}; + use ratatui::crossterm::event::{ Event, KeyCode as TerminalKeyCode, KeyEvent, KeyModifiers as TerminalKeyModifiers, }; -use ratatui::{Terminal, backend::TestBackend, layout::Rect}; +use ratatui::{ + Terminal, + backend::TestBackend, + layout::{Position, Rect}, +}; use wp_tui::app::actions::{ AppAction, ComposerAction, ConversationMode, FocusPane, Section, VimComposerMode, }; use wp_tui::app::composer::Composer; use wp_tui::app::events::MediaRenderPlan; use wp_tui::app::inputs::composer_action_for_editing_key; +use wp_tui::app::optimistic_text_send::{TextSendPort, TextSendRequest, Worker}; use wp_tui::app::read_receipts::VisibilityPlan; use wp_tui::input_key::{Key, KeyCode, KeyModifiers}; use wp_tui::ui::{composer_mention_picker_area, conversation_areas, render_chats_with_plan}; @@ -53,6 +60,73 @@ fn a_normal_space_remains_composer_input() { assert_eq!(composer.text(), " "); } +#[test] +fn plain_tab_preserves_four_column_stops_in_the_draft_and_outgoing_text() { + struct RecordingSendPort(mpsc::Sender); + + impl TextSendPort for RecordingSendPort { + fn send(&mut self, request: &TextSendRequest) -> Result<(), whatsrust::OutboundSendFailure> { + self.0.send(request.clone()).unwrap(); + Ok(()) + } + } + + let key = |code| Event::Key(KeyEvent::new(code, TerminalKeyModifiers::NONE)); + let area = Rect::new(0, 0, 80, 20); + let (_, composer_area) = conversation_areas(Rect::new(1, 1, 78, 18), 1, 0, 0); + let tab_stop = Position::new(composer_area.x + 1 + 4, composer_area.y + 1); + + for (pasted, expected) in [ + ("abc", "abc x"), + ("界", "界 x"), + ("ガ", "ガ x"), + ("パ", "パ x"), + ] { + let mut app = TestApp::new(); + let (app_tx, _app_rx) = mpsc::channel(); + let (sent_tx, sent_rx) = mpsc::channel(); + app.optimistic_text_send_worker = Worker::new(app_tx, Box::new(RecordingSendPort(sent_tx))); + let chat = whatsrust::JID("alice@s.whatsapp.net".into()); + app.open_chat_by_jid(chat.clone()); + app.focus_pane = FocusPane::Conversation; + app.dispatch_action(AppAction::InsertMode); + + app.on_terminal_event(Event::Paste(pasted.into())); + app.on_terminal_event(key(TerminalKeyCode::Tab)); + let mut terminal = Terminal::new(TestBackend::new(area.width, area.height)).unwrap(); + terminal + .draw(|frame| { + render_chats_with_plan( + frame, + &mut app, + &mut MediaRenderPlan::default(), + &mut VisibilityPlan::default(), + area, + ); + }) + .unwrap(); + let caret = terminal.backend().cursor_position(); + app.on_terminal_event(key(TerminalKeyCode::Char('x'))); + let draft = app.composer.text(); + app.on_terminal_event(key(TerminalKeyCode::Enter)); + + let sent = sent_rx + .recv_timeout(Duration::from_secs(2)) + .unwrap_or_else(|error| panic!("{pasted:?}: expected an outgoing message: {error}")); + let whatsrust::MessageContent::Text(text) = sent.content else { + panic!("{pasted:?}: expected a text message"); + }; + assert_eq!( + (draft.as_str(), text.as_ref()), + (expected, expected), + "{pasted:?}: draft and outgoing text" + ); + assert_eq!(caret, tab_stop, "{pasted:?}: rendered caret after Tab"); + assert_eq!(sent.chat, chat, "{pasted:?}: outgoing recipient"); + assert_eq!(app.composer.text(), "", "{pasted:?}: submitted draft"); + } +} + #[test] fn ctrl_enter_inserts_a_newline_without_submitting() { let mut composer = Composer::default(); From b087139f2610a48f73066ecb3be4338e062ca3ba Mon Sep 17 00:00:00 2001 From: andiveli Date: Wed, 18 Nov 2026 22:34:27 -0500 Subject: [PATCH 3/3] fix(composer): preserve legacy soft Tab stops --- src/app/composer.rs | 36 +++++++++++++++++++++++++++++++++--- tests/composer_behavior.rs | 5 ++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/app/composer.rs b/src/app/composer.rs index e6c2a86..4ddd86c 100644 --- a/src/app/composer.rs +++ b/src/app/composer.rs @@ -8,7 +8,7 @@ use whatsrust as wr; use crate::app::actions::ComposerAction; use crate::app::preferences::ComposerDirection; -use crate::input_key::{Key, KeyCode}; +use crate::input_key::{Key, KeyCode, KeyModifiers}; use crate::ui::layout::{ BoundaryAffinity, ComposerVisualLayout, HorizontalDirection, composer_markdown_layout, }; @@ -225,14 +225,44 @@ impl Composer<'_> { } KeyCode::Backspace => self.delete_previous_grapheme(), _ => { - self.input - .input(crate::app::composer_input_mapping::textarea_input(key)); + let tab_length = usize::from(self.input.tab_length()); + if key.code == KeyCode::Tab + && key.modifiers == KeyModifiers::NONE + && tab_length > 0 + && !self.input.hard_tab_indent() + { + self.insert_soft_tab(tab_length); + } else { + self.input + .input(crate::app::composer_input_mapping::textarea_input(key)); + } self.caret_affinity = None; self.preferred_visual_column = None; } } } + fn insert_soft_tab(&mut self, tab_length: usize) { + // Insertion replaces a selection at its start, regardless of cursor direction. + let (row, column) = self.input.selection_range().map_or_else( + || logical_cursor_position(self.input.cursor()), + |(start, _)| start, + ); + let line = &self.input.lines()[row]; + let end = line + .char_indices() + .nth(column) + .map_or(line.len(), |(index, _)| index); + // Preserve the old per-character width: ESC itself is zero-width, but + // it must not cause textwrap to skip the following literal draft text. + let prefix_width: usize = line[..end] + .split('\x1b') + .map(textwrap::core::display_width) + .sum(); + self.input + .insert_str(" ".repeat(tab_length - prefix_width % tab_length)); + } + pub(crate) fn visual_layout( &self, direction: ComposerDirection, diff --git a/tests/composer_behavior.rs b/tests/composer_behavior.rs index aced0ba..ffa4269 100644 --- a/tests/composer_behavior.rs +++ b/tests/composer_behavior.rs @@ -65,7 +65,10 @@ fn plain_tab_preserves_four_column_stops_in_the_draft_and_outgoing_text() { struct RecordingSendPort(mpsc::Sender); impl TextSendPort for RecordingSendPort { - fn send(&mut self, request: &TextSendRequest) -> Result<(), whatsrust::OutboundSendFailure> { + fn send( + &mut self, + request: &TextSendRequest, + ) -> Result<(), whatsrust::OutboundSendFailure> { self.0.send(request.clone()).unwrap(); Ok(()) }