mirror of
https://github.com/openai/codex.git
synced 2026-11-22 07:13:50 +00:00
feat(tui): standardize picker navigation keys (#22347)
## Why Picker-style UI in the TUI has accumulated a mix of hardcoded navigation keys. Some lists supported page movement, some did not; some accepted Vim-like keys, while others only accepted arrows; and tabbed or horizontally adjustable pickers had no shared keymap action for left/right movement. This PR makes picker/list navigation consistent and configurable so users can rely on the same defaults across the TUI. ## What Changed - Adds shared list keymap actions for: - vertical movement: `move_up`, `move_down` - horizontal movement: `move_left`, `move_right` - paging and jumps: `page_up`, `page_down`, `jump_top`, `jump_bottom` - Adds defaults: - Up/down: arrows, `Ctrl+P/N`, `Ctrl+K/J`, and plain `k/j` where text input is not active - Page up/down: `PageUp/PageDown` and `Ctrl+B/F` - First/last: `Home/End` - Left/right: `Left/Right` and `Ctrl+H/L` - Wires the shared list keymap through picker and list surfaces including session resume, multi-select, tabbed selection lists, settings-style lists, app-link selection, MCP elicitation, request-user-input, and the OSS selection wizard. - Keeps search behavior intact by reserving printable characters for query text in searchable pickers. - Updates keymap setup actions, config schema, snapshots, and focused coverage for the new list actions. ## How to Test 1. Start Codex from this branch and open the session picker, for example with an existing session history. 2. In the session list, verify that `Ctrl+J/K` moves the selection down/up. 3. Verify that `Ctrl+F/B` pages down/up and `Home/End` jumps to the first/last visible session. 4. Type printable search text such as `j` or `k` and confirm it updates the query instead of navigating. 5. Focus a picker control that changes values horizontally, such as a session picker toolbar control, and verify `Ctrl+H/L` changes the focused value like left/right arrows. Targeted tests run: - `cargo test -p codex-tui keymap::tests::` - `cargo test -p codex-tui keymap_setup::tests::` - `cargo test -p codex-tui horizontal_list_keys` - `cargo test -p codex-tui page_and_jump_navigation_use_list_keymap` - `cargo test -p codex-tui ctrl_h_l_move_provider_selection` - `cargo test -p codex-tui scroll_state::tests` - `cargo test -p codex-tui switching_tabs_changes_visible_items_and_clears_search` - `cargo test -p codex-tui toggle_sort_key_reloads_with_new_sort` Also ran `just write-config-schema`, `just fmt`, `just fix -p codex-tui`, `just argument-comment-lint`, and `git diff --check`. Note: `cargo test -p codex-tui` was attempted and still aborts in the pre-existing `tests::fork_last_filters_latest_session_by_cwd_unless_show_all` stack overflow, which is unrelated to this branch.
This commit is contained in:
1 parent
441c2f818f
commit
3d517fbd00
37 files changed
+1635
-426
No files matched your search
@@ -29,6 +29,8 @@ use crate::app::app_server_requests::ResolvedAppServerRequest;
|
||||
use crate::app_event::AppEvent;
|
||||
use crate::app_event_sender::AppEventSender;
|
||||
use crate::key_hint;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::Insets;
|
||||
use crate::render::RectExt as _;
|
||||
use crate::style::user_message_style;
|
||||
@@ -238,10 +240,24 @@ pub(crate) struct AppLinkView {
|
||||
screen: AppLinkScreen,
|
||||
selected_action: usize,
|
||||
complete: bool,
|
||||
list_keymap: ListKeymap,
|
||||
}
|
||||
|
||||
impl AppLinkView {
|
||||
#[cfg(test)]
|
||||
pub(crate) fn new(params: AppLinkViewParams, app_event_tx: AppEventSender) -> Self {
|
||||
Self::new_with_keymap(
|
||||
params,
|
||||
app_event_tx,
|
||||
crate::keymap::RuntimeKeymap::defaults().list,
|
||||
)
|
||||
}
|
||||
|
||||
pub(crate) fn new_with_keymap(
|
||||
params: AppLinkViewParams,
|
||||
app_event_tx: AppEventSender,
|
||||
list_keymap: ListKeymap,
|
||||
) -> Self {
|
||||
let AppLinkViewParams {
|
||||
app_id,
|
||||
title,
|
||||
@@ -269,6 +285,7 @@ impl AppLinkView {
|
||||
screen: AppLinkScreen::Link,
|
||||
selected_action: 0,
|
||||
complete: false,
|
||||
list_keymap,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -679,10 +696,6 @@ impl BottomPaneView for AppLinkView {
|
||||
KeyEvent {
|
||||
code: KeyCode::Up, ..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Left,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::BackTab,
|
||||
..
|
||||
@@ -691,20 +704,12 @@ impl BottomPaneView for AppLinkView {
|
||||
code: KeyCode::Char('k'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('h'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_selection_prev(),
|
||||
_ if self.list_keymap.move_left.is_pressed(key_event) => self.move_selection_prev(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Down,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Right,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Tab, ..
|
||||
}
|
||||
@@ -712,12 +717,8 @@ impl BottomPaneView for AppLinkView {
|
||||
code: KeyCode::Char('j'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('l'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_selection_next(),
|
||||
_ if self.list_keymap.move_right.is_pressed(key_event) => self.move_selection_next(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char(c),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
@@ -1087,6 +1088,74 @@ mod tests {
|
||||
assert!(view.terminal_title_requires_action());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn horizontal_list_keys_move_action_selection() {
|
||||
let (tx_raw, _rx) = unbounded_channel::<AppEvent>();
|
||||
let tx = AppEventSender::new(tx_raw);
|
||||
let mut view = AppLinkView::new(
|
||||
AppLinkViewParams {
|
||||
app_id: "connector_1".to_string(),
|
||||
title: "Notion".to_string(),
|
||||
description: None,
|
||||
instructions: "Manage app".to_string(),
|
||||
url: "https://example.test/notion".to_string(),
|
||||
is_installed: true,
|
||||
is_enabled: true,
|
||||
suggest_reason: None,
|
||||
suggestion_type: None,
|
||||
elicitation_target: None,
|
||||
},
|
||||
tx,
|
||||
);
|
||||
|
||||
assert_eq!(view.selected_action, 0);
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('l'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.selected_action, 1);
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('h'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.selected_action, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn remapped_horizontal_list_keys_control_action_selection() {
|
||||
let (tx_raw, _rx) = unbounded_channel::<AppEvent>();
|
||||
let tx = AppEventSender::new(tx_raw);
|
||||
let mut list_keymap = crate::keymap::RuntimeKeymap::defaults().list;
|
||||
list_keymap.move_left = vec![key_hint::plain(KeyCode::Char('x'))];
|
||||
list_keymap.move_right = vec![key_hint::plain(KeyCode::Char('z'))];
|
||||
let mut view = AppLinkView::new_with_keymap(
|
||||
AppLinkViewParams {
|
||||
app_id: "connector_1".to_string(),
|
||||
title: "Notion".to_string(),
|
||||
description: None,
|
||||
instructions: "Manage app".to_string(),
|
||||
url: "https://example.test/notion".to_string(),
|
||||
is_installed: true,
|
||||
is_enabled: true,
|
||||
suggest_reason: None,
|
||||
suggestion_type: None,
|
||||
elicitation_target: None,
|
||||
},
|
||||
tx,
|
||||
list_keymap,
|
||||
);
|
||||
|
||||
assert_eq!(view.selected_action, 0);
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('l'), KeyModifiers::NONE));
|
||||
assert_eq!(view.selected_action, 0);
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Right, KeyModifiers::NONE));
|
||||
assert_eq!(view.selected_action, 0);
|
||||
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('z'), KeyModifiers::NONE));
|
||||
assert_eq!(view.selected_action, 1);
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('h'), KeyModifiers::NONE));
|
||||
assert_eq!(view.selected_action, 1);
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Left, KeyModifiers::NONE));
|
||||
assert_eq!(view.selected_action, 1);
|
||||
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE));
|
||||
assert_eq!(view.selected_action, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn toggle_action_sends_set_app_enabled_and_updates_label() {
|
||||
let (tx_raw, mut rx) = unbounded_channel::<AppEvent>();
|
||||
|
||||
@@ -13,6 +13,8 @@ use ratatui::widgets::Widget;
|
||||
use crate::app_event::AppEvent;
|
||||
use crate::app_event_sender::AppEventSender;
|
||||
use crate::key_hint;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::Insets;
|
||||
use crate::render::RectExt as _;
|
||||
use crate::render::renderable::ColumnRenderable;
|
||||
@@ -43,12 +45,14 @@ pub(crate) struct ExperimentalFeaturesView {
|
||||
app_event_tx: AppEventSender,
|
||||
header: Box<dyn Renderable>,
|
||||
footer_hint: Line<'static>,
|
||||
keymap: ListKeymap,
|
||||
}
|
||||
|
||||
impl ExperimentalFeaturesView {
|
||||
pub(crate) fn new(
|
||||
features: Vec<ExperimentalFeatureItem>,
|
||||
app_event_tx: AppEventSender,
|
||||
keymap: ListKeymap,
|
||||
) -> Self {
|
||||
let mut header = ColumnRenderable::new();
|
||||
header.push(Line::from("Experimental features".bold()));
|
||||
@@ -63,6 +67,7 @@ impl ExperimentalFeaturesView {
|
||||
app_event_tx,
|
||||
header: Box::new(header),
|
||||
footer_hint: experimental_popup_hint_line(),
|
||||
keymap,
|
||||
};
|
||||
view.initialize_selection();
|
||||
view
|
||||
@@ -119,6 +124,30 @@ impl ExperimentalFeaturesView {
|
||||
self.state.ensure_visible(len, MAX_POPUP_ROWS.min(len));
|
||||
}
|
||||
|
||||
fn page_up(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.state.page_up_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn page_down(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.state.page_down_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn jump_top(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.state.jump_top(len, visible);
|
||||
}
|
||||
|
||||
fn jump_bottom(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.state.jump_bottom(len, visible);
|
||||
}
|
||||
|
||||
fn toggle_selected(&mut self) {
|
||||
let Some(selected_idx) = self.state.selected_idx else {
|
||||
return;
|
||||
@@ -137,56 +166,20 @@ impl ExperimentalFeaturesView {
|
||||
impl BottomPaneView for ExperimentalFeaturesView {
|
||||
fn handle_key_event(&mut self, key_event: KeyEvent) {
|
||||
match key_event {
|
||||
KeyEvent {
|
||||
code: KeyCode::Up, ..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('p'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{0010}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_up(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char('k'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_up(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Down,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('n'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{000e}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_down(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char('j'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_down(),
|
||||
_ if self.keymap.move_up.is_pressed(key_event) => self.move_up(),
|
||||
_ if self.keymap.move_down.is_pressed(key_event) => self.move_down(),
|
||||
_ if self.keymap.page_up.is_pressed(key_event) => self.page_up(),
|
||||
_ if self.keymap.page_down.is_pressed(key_event) => self.page_down(),
|
||||
_ if self.keymap.jump_top.is_pressed(key_event) => self.jump_top(),
|
||||
_ if self.keymap.jump_bottom.is_pressed(key_event) => self.jump_bottom(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char(' '),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.toggle_selected(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Enter,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Esc, ..
|
||||
} => {
|
||||
_ if self.keymap.accept.is_pressed(key_event)
|
||||
|| self.keymap.cancel.is_pressed(key_event) =>
|
||||
{
|
||||
self.on_ctrl_c();
|
||||
}
|
||||
_ => {}
|
||||
|
||||
@@ -29,6 +29,8 @@ use crate::app_event_sender::AppEventSender;
|
||||
use crate::hooks_rpc::HookTrustUpdate;
|
||||
use crate::hooks_rpc::hook_needs_review;
|
||||
use crate::key_hint;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::line_truncation::truncate_line_with_ellipsis_if_overflow;
|
||||
use crate::render::renderable::Renderable;
|
||||
use crate::status::format_directory_display;
|
||||
@@ -50,6 +52,7 @@ pub(crate) struct HooksBrowserView {
|
||||
state: ScrollState,
|
||||
complete: bool,
|
||||
app_event_tx: AppEventSender,
|
||||
keymap: ListKeymap,
|
||||
}
|
||||
|
||||
impl HooksBrowserView {
|
||||
@@ -68,10 +71,15 @@ impl HooksBrowserView {
|
||||
errors,
|
||||
},
|
||||
app_event_tx,
|
||||
crate::keymap::RuntimeKeymap::defaults().list,
|
||||
)
|
||||
}
|
||||
|
||||
pub(crate) fn from_entry(mut entry: HooksListEntry, app_event_tx: AppEventSender) -> Self {
|
||||
pub(crate) fn from_entry(
|
||||
mut entry: HooksListEntry,
|
||||
app_event_tx: AppEventSender,
|
||||
keymap: ListKeymap,
|
||||
) -> Self {
|
||||
entry.hooks.sort_by_key(|hook| hook.display_order);
|
||||
let mut view = Self {
|
||||
entry,
|
||||
@@ -79,6 +87,7 @@ impl HooksBrowserView {
|
||||
state: ScrollState::new(),
|
||||
complete: false,
|
||||
app_event_tx,
|
||||
keymap,
|
||||
};
|
||||
if view.page_len() > 0 {
|
||||
view.state.selected_idx = Some(
|
||||
@@ -165,6 +174,26 @@ impl HooksBrowserView {
|
||||
self.state.ensure_visible(len, self.max_visible_rows());
|
||||
}
|
||||
|
||||
fn page_up(&mut self) {
|
||||
let len = self.page_len();
|
||||
self.state.page_up_clamped(len, self.max_visible_rows());
|
||||
}
|
||||
|
||||
fn page_down(&mut self) {
|
||||
let len = self.page_len();
|
||||
self.state.page_down_clamped(len, self.max_visible_rows());
|
||||
}
|
||||
|
||||
fn jump_top(&mut self) {
|
||||
let len = self.page_len();
|
||||
self.state.jump_top(len, self.max_visible_rows());
|
||||
}
|
||||
|
||||
fn jump_bottom(&mut self) {
|
||||
let len = self.page_len();
|
||||
self.state.jump_bottom(len, self.max_visible_rows());
|
||||
}
|
||||
|
||||
fn page_len(&self) -> usize {
|
||||
match self.page {
|
||||
HooksBrowserPage::Events => codex_protocol::protocol::HookEventName::iter().count(),
|
||||
@@ -533,33 +562,18 @@ impl HooksBrowserView {
|
||||
impl BottomPaneView for HooksBrowserView {
|
||||
fn handle_key_event(&mut self, key_event: KeyEvent) {
|
||||
match key_event {
|
||||
KeyEvent {
|
||||
code: KeyCode::Up, ..
|
||||
_ if self.keymap.move_up.is_pressed(key_event) => self.move_up(),
|
||||
_ if self.keymap.move_down.is_pressed(key_event) => self.move_down(),
|
||||
_ if self.keymap.page_up.is_pressed(key_event) => self.page_up(),
|
||||
_ if self.keymap.page_down.is_pressed(key_event) => self.page_down(),
|
||||
_ if self.keymap.jump_top.is_pressed(key_event) => self.jump_top(),
|
||||
_ if self.keymap.jump_bottom.is_pressed(key_event) => self.jump_bottom(),
|
||||
_ if self.keymap.accept.is_pressed(key_event)
|
||||
&& self.page == HooksBrowserPage::Events =>
|
||||
{
|
||||
self.open_selected_event()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('p'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
} => self.move_up(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Down,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('n'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
} => self.move_down(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Enter,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} if self.page == HooksBrowserPage::Events => self.open_selected_event(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Enter,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => {
|
||||
_ if self.keymap.accept.is_pressed(key_event) => {
|
||||
if let HooksBrowserPage::Handlers(event_name) = self.page {
|
||||
self.toggle_selected_hook(event_name);
|
||||
}
|
||||
@@ -581,9 +595,7 @@ impl BottomPaneView for HooksBrowserView {
|
||||
HooksBrowserPage::Events => self.trust_all_hooks(),
|
||||
HooksBrowserPage::Handlers(event_name) => self.trust_selected_hook(event_name),
|
||||
},
|
||||
KeyEvent {
|
||||
code: KeyCode::Esc, ..
|
||||
} => match self.page {
|
||||
_ if self.keymap.cancel.is_pressed(key_event) => match self.page {
|
||||
HooksBrowserPage::Events => self.close(),
|
||||
HooksBrowserPage::Handlers(_) => self.return_to_events(),
|
||||
},
|
||||
|
||||
@@ -17,6 +17,7 @@ use super::selection_popup_common::wrap_styled_line;
|
||||
use crate::app_event_sender::AppEventSender;
|
||||
use crate::key_hint::KeyBinding;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::key_hint::is_plain_text_key_event;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::renderable::ColumnRenderable;
|
||||
use crate::render::renderable::Renderable;
|
||||
@@ -655,8 +656,8 @@ impl ListSelectionView {
|
||||
let len = self.visible_len();
|
||||
self.state.move_up_wrap(len);
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.ensure_visible(len, visible);
|
||||
self.skip_disabled_up();
|
||||
self.state.ensure_visible(len, visible);
|
||||
if self.selected_actual_idx() != before {
|
||||
self.fire_selection_changed();
|
||||
}
|
||||
@@ -667,8 +668,56 @@ impl ListSelectionView {
|
||||
let len = self.visible_len();
|
||||
self.state.move_down_wrap(len);
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.ensure_visible(len, visible);
|
||||
self.skip_disabled_down();
|
||||
self.state.ensure_visible(len, visible);
|
||||
if self.selected_actual_idx() != before {
|
||||
self.fire_selection_changed();
|
||||
}
|
||||
}
|
||||
|
||||
fn page_up(&mut self) {
|
||||
let before = self.selected_actual_idx();
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.page_up_clamped(len, visible);
|
||||
self.skip_disabled_up_clamped();
|
||||
self.state.ensure_visible(len, visible);
|
||||
if self.selected_actual_idx() != before {
|
||||
self.fire_selection_changed();
|
||||
}
|
||||
}
|
||||
|
||||
fn page_down(&mut self) {
|
||||
let before = self.selected_actual_idx();
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.page_down_clamped(len, visible);
|
||||
self.skip_disabled_down_clamped();
|
||||
self.state.ensure_visible(len, visible);
|
||||
if self.selected_actual_idx() != before {
|
||||
self.fire_selection_changed();
|
||||
}
|
||||
}
|
||||
|
||||
fn jump_top(&mut self) {
|
||||
let before = self.selected_actual_idx();
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.jump_top(len, visible);
|
||||
self.skip_disabled_down_clamped();
|
||||
self.state.ensure_visible(len, visible);
|
||||
if self.selected_actual_idx() != before {
|
||||
self.fire_selection_changed();
|
||||
}
|
||||
}
|
||||
|
||||
fn jump_bottom(&mut self) {
|
||||
let before = self.selected_actual_idx();
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.jump_bottom(len, visible);
|
||||
self.skip_disabled_up_clamped();
|
||||
self.state.ensure_visible(len, visible);
|
||||
if self.selected_actual_idx() != before {
|
||||
self.fire_selection_changed();
|
||||
}
|
||||
@@ -788,13 +837,7 @@ impl ListSelectionView {
|
||||
fn skip_disabled_down(&mut self) {
|
||||
let len = self.visible_len();
|
||||
for _ in 0..len {
|
||||
if let Some(idx) = self.state.selected_idx
|
||||
&& let Some(actual_idx) = self.filtered_indices.get(idx)
|
||||
&& self
|
||||
.active_items()
|
||||
.get(*actual_idx)
|
||||
.is_some_and(|item| item.disabled_reason.is_some() || item.is_disabled)
|
||||
{
|
||||
if self.selected_visible_idx_is_disabled() {
|
||||
self.state.move_down_wrap(len);
|
||||
} else {
|
||||
break;
|
||||
@@ -805,34 +848,70 @@ impl ListSelectionView {
|
||||
fn skip_disabled_up(&mut self) {
|
||||
let len = self.visible_len();
|
||||
for _ in 0..len {
|
||||
if let Some(idx) = self.state.selected_idx
|
||||
&& let Some(actual_idx) = self.filtered_indices.get(idx)
|
||||
&& self
|
||||
.active_items()
|
||||
.get(*actual_idx)
|
||||
.is_some_and(|item| item.disabled_reason.is_some() || item.is_disabled)
|
||||
{
|
||||
if self.selected_visible_idx_is_disabled() {
|
||||
self.state.move_up_wrap(len);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn skip_disabled_down_clamped(&mut self) {
|
||||
let Some(start) = self.state.selected_idx else {
|
||||
return;
|
||||
};
|
||||
if !self.visible_idx_is_disabled(start) {
|
||||
return;
|
||||
}
|
||||
|
||||
let len = self.visible_len();
|
||||
self.state.selected_idx = ((start + 1)..len)
|
||||
.find(|idx| !self.visible_idx_is_disabled(*idx))
|
||||
.or_else(|| {
|
||||
(0..start)
|
||||
.rev()
|
||||
.find(|idx| !self.visible_idx_is_disabled(*idx))
|
||||
})
|
||||
.or(Some(start));
|
||||
}
|
||||
|
||||
fn skip_disabled_up_clamped(&mut self) {
|
||||
let Some(start) = self.state.selected_idx else {
|
||||
return;
|
||||
};
|
||||
if !self.visible_idx_is_disabled(start) {
|
||||
return;
|
||||
}
|
||||
|
||||
let len = self.visible_len();
|
||||
self.state.selected_idx = (0..start)
|
||||
.rev()
|
||||
.find(|idx| !self.visible_idx_is_disabled(*idx))
|
||||
.or_else(|| ((start + 1)..len).find(|idx| !self.visible_idx_is_disabled(*idx)))
|
||||
.or(Some(start));
|
||||
}
|
||||
|
||||
fn selected_visible_idx_is_disabled(&self) -> bool {
|
||||
self.state
|
||||
.selected_idx
|
||||
.is_some_and(|idx| self.visible_idx_is_disabled(idx))
|
||||
}
|
||||
|
||||
fn visible_idx_is_disabled(&self, idx: usize) -> bool {
|
||||
self.filtered_indices
|
||||
.get(idx)
|
||||
.and_then(|actual_idx| self.active_items().get(*actual_idx))
|
||||
.is_some_and(|item| item.disabled_reason.is_some() || item.is_disabled)
|
||||
}
|
||||
}
|
||||
|
||||
impl BottomPaneView for ListSelectionView {
|
||||
fn handle_key_event(&mut self, key_event: KeyEvent) {
|
||||
let is_plain_text_char = matches!(
|
||||
key_event,
|
||||
KeyEvent {
|
||||
code: KeyCode::Char(ch),
|
||||
modifiers,
|
||||
..
|
||||
} if !ch.is_ascii_control()
|
||||
&& !modifiers.contains(KeyModifiers::CONTROL)
|
||||
&& !modifiers.contains(KeyModifiers::ALT)
|
||||
);
|
||||
let allow_plain_char_navigation = !self.is_searchable || !is_plain_text_char;
|
||||
// Searchable lists reserve printable characters for query input. This
|
||||
// keeps vim-style plain j/k/h/l useful in non-search lists without
|
||||
// making those letters impossible to type into a filter.
|
||||
let allow_plain_char_navigation =
|
||||
!self.is_searchable || !is_plain_text_key_event(key_event);
|
||||
|
||||
match key_event {
|
||||
_ if allow_plain_char_navigation && self.keymap.move_up.is_pressed(key_event) => {
|
||||
@@ -841,14 +920,30 @@ impl BottomPaneView for ListSelectionView {
|
||||
_ if allow_plain_char_navigation && self.keymap.move_down.is_pressed(key_event) => {
|
||||
self.move_down()
|
||||
}
|
||||
KeyEvent {
|
||||
code: KeyCode::Left,
|
||||
..
|
||||
} if self.tabs_enabled() => self.switch_tab(/*step*/ -1),
|
||||
KeyEvent {
|
||||
code: KeyCode::Right,
|
||||
..
|
||||
} if self.tabs_enabled() => self.switch_tab(/*step*/ 1),
|
||||
_ if allow_plain_char_navigation && self.keymap.page_up.is_pressed(key_event) => {
|
||||
self.page_up()
|
||||
}
|
||||
_ if allow_plain_char_navigation && self.keymap.page_down.is_pressed(key_event) => {
|
||||
self.page_down()
|
||||
}
|
||||
_ if allow_plain_char_navigation && self.keymap.jump_top.is_pressed(key_event) => {
|
||||
self.jump_top()
|
||||
}
|
||||
_ if allow_plain_char_navigation && self.keymap.jump_bottom.is_pressed(key_event) => {
|
||||
self.jump_bottom()
|
||||
}
|
||||
_ if allow_plain_char_navigation
|
||||
&& self.tabs_enabled()
|
||||
&& self.keymap.move_left.is_pressed(key_event) =>
|
||||
{
|
||||
self.switch_tab(/*step*/ -1)
|
||||
}
|
||||
_ if allow_plain_char_navigation
|
||||
&& self.tabs_enabled()
|
||||
&& self.keymap.move_right.is_pressed(key_event) =>
|
||||
{
|
||||
self.switch_tab(/*step*/ 1)
|
||||
}
|
||||
KeyEvent {
|
||||
code: KeyCode::Backspace,
|
||||
..
|
||||
@@ -1618,6 +1713,10 @@ mod tests {
|
||||
|
||||
assert_eq!(view.active_tab_id(), Some("alpha"));
|
||||
assert_eq!(view.search_query, "");
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('l'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.active_tab_id(), Some("beta"));
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('h'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.active_tab_id(), Some("alpha"));
|
||||
let rendered = render_lines(&view);
|
||||
assert!(
|
||||
rendered.contains("Alpha Item") && !rendered.contains("Beta Item"),
|
||||
@@ -2059,6 +2158,77 @@ mod tests {
|
||||
assert_eq!(view.selected_actual_idx(), Some(1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_and_jump_navigation_use_list_keymap() {
|
||||
let (tx_raw, _rx) = unbounded_channel::<AppEvent>();
|
||||
let tx = AppEventSender::new(tx_raw);
|
||||
let mut keymap = crate::keymap::RuntimeKeymap::defaults().list;
|
||||
keymap.page_down = vec![crate::key_hint::ctrl(KeyCode::Char('d'))];
|
||||
keymap.page_up = vec![crate::key_hint::ctrl(KeyCode::Char('u'))];
|
||||
keymap.jump_bottom = vec![crate::key_hint::ctrl(KeyCode::Char('e'))];
|
||||
keymap.jump_top = vec![crate::key_hint::ctrl(KeyCode::Char('a'))];
|
||||
let mut view = ListSelectionView::new(
|
||||
SelectionViewParams {
|
||||
items: (0..12)
|
||||
.map(|idx| SelectionItem {
|
||||
name: format!("Item {idx}"),
|
||||
..Default::default()
|
||||
})
|
||||
.collect(),
|
||||
..Default::default()
|
||||
},
|
||||
tx,
|
||||
keymap,
|
||||
);
|
||||
|
||||
view.handle_key_event(KeyEvent::from(KeyCode::PageDown));
|
||||
assert_eq!(view.selected_actual_idx(), Some(0));
|
||||
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('d'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.selected_actual_idx(), Some(8));
|
||||
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('u'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.selected_actual_idx(), Some(0));
|
||||
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('e'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.selected_actual_idx(), Some(11));
|
||||
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Char('a'), KeyModifiers::CONTROL));
|
||||
assert_eq!(view.selected_actual_idx(), Some(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_and_jump_navigation_skip_trailing_disabled_rows_without_wrapping() {
|
||||
let (tx_raw, _rx) = unbounded_channel::<AppEvent>();
|
||||
let tx = AppEventSender::new(tx_raw);
|
||||
let mut view = ListSelectionView::new(
|
||||
SelectionViewParams {
|
||||
items: (0..12)
|
||||
.map(|idx| SelectionItem {
|
||||
name: format!("Item {idx}"),
|
||||
is_disabled: idx >= 8,
|
||||
..Default::default()
|
||||
})
|
||||
.collect(),
|
||||
..Default::default()
|
||||
},
|
||||
tx,
|
||||
crate::keymap::RuntimeKeymap::defaults().list,
|
||||
);
|
||||
|
||||
view.handle_key_event(KeyEvent::from(KeyCode::PageDown));
|
||||
assert_eq!(view.selected_actual_idx(), Some(7));
|
||||
let selected = view.state.selected_idx.expect("selection should be set");
|
||||
assert!(view.state.scroll_top <= selected);
|
||||
assert!(selected < view.state.scroll_top + ListSelectionView::max_visible_rows(/*len*/ 12));
|
||||
|
||||
view.handle_key_event(KeyEvent::from(KeyCode::End));
|
||||
assert_eq!(view.selected_actual_idx(), Some(7));
|
||||
let selected = view.state.selected_idx.expect("selection should be set");
|
||||
assert!(view.state.scroll_top <= selected);
|
||||
assert!(selected < view.state.scroll_top + ListSelectionView::max_visible_rows(/*len*/ 12));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn wraps_long_option_without_overflowing_columns() {
|
||||
let (tx_raw, _rx) = unbounded_channel::<AppEvent>();
|
||||
|
||||
@@ -49,6 +49,8 @@ use crate::bottom_pane::selection_popup_common::menu_surface_inset;
|
||||
use crate::bottom_pane::selection_popup_common::menu_surface_padding_height;
|
||||
use crate::bottom_pane::selection_popup_common::render_menu_surface;
|
||||
use crate::bottom_pane::selection_popup_common::render_rows;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::renderable::Renderable;
|
||||
use crate::text_formatting::format_json_compact;
|
||||
use crate::text_formatting::truncate_text;
|
||||
@@ -711,15 +713,35 @@ pub(crate) struct McpServerElicitationOverlay {
|
||||
current_idx: usize,
|
||||
done: bool,
|
||||
validation_error: Option<String>,
|
||||
list_keymap: ListKeymap,
|
||||
}
|
||||
|
||||
impl McpServerElicitationOverlay {
|
||||
#[cfg(test)]
|
||||
pub(crate) fn new(
|
||||
request: McpServerElicitationFormRequest,
|
||||
app_event_tx: AppEventSender,
|
||||
has_input_focus: bool,
|
||||
enhanced_keys_supported: bool,
|
||||
disable_paste_burst: bool,
|
||||
) -> Self {
|
||||
Self::new_with_keymap(
|
||||
request,
|
||||
app_event_tx,
|
||||
has_input_focus,
|
||||
enhanced_keys_supported,
|
||||
disable_paste_burst,
|
||||
crate::keymap::RuntimeKeymap::defaults().list,
|
||||
)
|
||||
}
|
||||
|
||||
pub(crate) fn new_with_keymap(
|
||||
request: McpServerElicitationFormRequest,
|
||||
app_event_tx: AppEventSender,
|
||||
has_input_focus: bool,
|
||||
enhanced_keys_supported: bool,
|
||||
disable_paste_burst: bool,
|
||||
list_keymap: ListKeymap,
|
||||
) -> Self {
|
||||
let mut composer = ChatComposer::new_with_config(
|
||||
has_input_focus,
|
||||
@@ -739,6 +761,7 @@ impl McpServerElicitationOverlay {
|
||||
current_idx: 0,
|
||||
done: false,
|
||||
validation_error: None,
|
||||
list_keymap,
|
||||
};
|
||||
overlay.reset_for_request();
|
||||
overlay.restore_current_draft();
|
||||
@@ -1529,18 +1552,40 @@ impl BottomPaneView for McpServerElicitationOverlay {
|
||||
code: KeyCode::Left,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('h'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} if self.current_field_is_select() => {
|
||||
self.move_field(/*next*/ false);
|
||||
return;
|
||||
}
|
||||
_ if self.current_field_is_select()
|
||||
&& self.list_keymap.move_left.is_pressed(key_event) =>
|
||||
{
|
||||
self.move_field(/*next*/ false);
|
||||
return;
|
||||
}
|
||||
KeyEvent {
|
||||
code: KeyCode::Right,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('l'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} if self.current_field_is_select() => {
|
||||
self.move_field(/*next*/ true);
|
||||
return;
|
||||
}
|
||||
_ if self.current_field_is_select()
|
||||
&& self.list_keymap.move_right.is_pressed(key_event) =>
|
||||
{
|
||||
self.move_field(/*next*/ true);
|
||||
return;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
@@ -2155,6 +2200,43 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn horizontal_list_keys_move_between_select_fields() {
|
||||
let (tx, _rx) = test_sender();
|
||||
let request = from_form_request(
|
||||
ThreadId::default(),
|
||||
form_request(
|
||||
"Choose values",
|
||||
serde_json::json!({
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"first": {
|
||||
"type": "boolean",
|
||||
"title": "First",
|
||||
},
|
||||
"second": {
|
||||
"type": "boolean",
|
||||
"title": "Second",
|
||||
}
|
||||
},
|
||||
"required": ["first", "second"],
|
||||
}),
|
||||
/*meta*/ None,
|
||||
),
|
||||
)
|
||||
.expect("expected supported form");
|
||||
let mut overlay = McpServerElicitationOverlay::new(
|
||||
request, tx, /*has_input_focus*/ true, /*enhanced_keys_supported*/ false,
|
||||
/*disable_paste_burst*/ false,
|
||||
);
|
||||
|
||||
assert_eq!(overlay.current_idx, 0);
|
||||
overlay.handle_key_event(KeyEvent::new(KeyCode::Char('l'), KeyModifiers::CONTROL));
|
||||
assert_eq!(overlay.current_idx, 1);
|
||||
overlay.handle_key_event(KeyEvent::new(KeyCode::Char('h'), KeyModifiers::CONTROL));
|
||||
assert_eq!(overlay.current_idx, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn empty_tool_approval_schema_session_choice_sets_persist_meta() {
|
||||
let (tx, mut rx) = test_sender();
|
||||
|
||||
@@ -14,6 +14,8 @@ use crate::app_event::AppEvent;
|
||||
use crate::app_event_sender::AppEventSender;
|
||||
use crate::bottom_pane::popup_consts::standard_popup_hint_line;
|
||||
use crate::key_hint;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::Insets;
|
||||
use crate::render::RectExt as _;
|
||||
use crate::render::renderable::ColumnRenderable;
|
||||
@@ -62,6 +64,7 @@ pub(crate) struct MemoriesSettingsView {
|
||||
complete: bool,
|
||||
app_event_tx: AppEventSender,
|
||||
docs_link: Line<'static>,
|
||||
keymap: ListKeymap,
|
||||
}
|
||||
|
||||
impl MemoriesSettingsView {
|
||||
@@ -69,6 +72,7 @@ impl MemoriesSettingsView {
|
||||
use_memories: bool,
|
||||
generate_memories: bool,
|
||||
app_event_tx: AppEventSender,
|
||||
keymap: ListKeymap,
|
||||
) -> Self {
|
||||
let mut view = Self {
|
||||
items: vec![
|
||||
@@ -98,6 +102,7 @@ impl MemoriesSettingsView {
|
||||
"Learn more: ".dim(),
|
||||
MEMORIES_DOC_URL.cyan().underlined(),
|
||||
]),
|
||||
keymap,
|
||||
};
|
||||
view.initialize_selection();
|
||||
view
|
||||
@@ -216,6 +221,30 @@ impl MemoriesSettingsView {
|
||||
state.ensure_visible(len, MAX_POPUP_ROWS.min(len));
|
||||
}
|
||||
|
||||
fn page_up(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.active_state_mut().page_up_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn page_down(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.active_state_mut().page_down_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn jump_top(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.active_state_mut().jump_top(len, visible);
|
||||
}
|
||||
|
||||
fn jump_bottom(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = MAX_POPUP_ROWS.min(len);
|
||||
self.active_state_mut().jump_bottom(len, visible);
|
||||
}
|
||||
|
||||
fn toggle_selected(&mut self) {
|
||||
if self.reset_confirmation.is_some() {
|
||||
return;
|
||||
@@ -271,56 +300,19 @@ impl MemoriesSettingsView {
|
||||
impl BottomPaneView for MemoriesSettingsView {
|
||||
fn handle_key_event(&mut self, key_event: KeyEvent) {
|
||||
match key_event {
|
||||
KeyEvent {
|
||||
code: KeyCode::Up, ..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('p'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{0010}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_up(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char('k'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_up(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Down,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('n'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{000e}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_down(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char('j'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.move_down(),
|
||||
_ if self.keymap.move_up.is_pressed(key_event) => self.move_up(),
|
||||
_ if self.keymap.move_down.is_pressed(key_event) => self.move_down(),
|
||||
_ if self.keymap.page_up.is_pressed(key_event) => self.page_up(),
|
||||
_ if self.keymap.page_down.is_pressed(key_event) => self.page_down(),
|
||||
_ if self.keymap.jump_top.is_pressed(key_event) => self.jump_top(),
|
||||
_ if self.keymap.jump_bottom.is_pressed(key_event) => self.jump_bottom(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char(' '),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.toggle_selected(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Enter,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.save(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Esc, ..
|
||||
} => self.cancel(),
|
||||
_ if self.keymap.accept.is_pressed(key_event) => self.save(),
|
||||
_ if self.keymap.cancel.is_pressed(key_event) => self.cancel(),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1082,6 +1082,10 @@ impl BottomPane {
|
||||
popup_consts::standard_popup_hint_line_for_keymap(&self.keymap.list)
|
||||
}
|
||||
|
||||
pub(crate) fn list_keymap(&self) -> crate::keymap::ListKeymap {
|
||||
self.keymap.list.clone()
|
||||
}
|
||||
|
||||
/// Replace one or more active views whose IDs are in `view_ids` with a
|
||||
/// generic list selection view.
|
||||
pub(crate) fn replace_active_views_with_selection_view(
|
||||
@@ -1298,12 +1302,13 @@ impl BottomPane {
|
||||
request
|
||||
};
|
||||
|
||||
let modal = RequestUserInputOverlay::new(
|
||||
let modal = RequestUserInputOverlay::new_with_keymap(
|
||||
request,
|
||||
self.app_event_tx.clone(),
|
||||
self.has_input_focus,
|
||||
self.enhanced_keys_supported,
|
||||
self.disable_paste_burst,
|
||||
self.keymap.list.clone(),
|
||||
);
|
||||
self.pause_status_timer_for_modal();
|
||||
self.set_composer_input_enabled(
|
||||
@@ -1342,7 +1347,7 @@ impl BottomPane {
|
||||
tool_suggestion.suggest_type,
|
||||
mcp_server_elicitation::ToolSuggestionType::Enable
|
||||
);
|
||||
let view = AppLinkView::new(
|
||||
let view = AppLinkView::new_with_keymap(
|
||||
AppLinkViewParams {
|
||||
app_id: tool_suggestion.tool_id.clone(),
|
||||
title: tool_suggestion.tool_name.clone(),
|
||||
@@ -1373,6 +1378,7 @@ impl BottomPane {
|
||||
}),
|
||||
},
|
||||
self.app_event_tx.clone(),
|
||||
self.keymap.list.clone(),
|
||||
);
|
||||
self.pause_status_timer_for_modal();
|
||||
self.set_composer_input_enabled(
|
||||
@@ -1383,12 +1389,13 @@ impl BottomPane {
|
||||
return;
|
||||
}
|
||||
|
||||
let modal = McpServerElicitationOverlay::new(
|
||||
let modal = McpServerElicitationOverlay::new_with_keymap(
|
||||
request,
|
||||
self.app_event_tx.clone(),
|
||||
self.has_input_focus,
|
||||
self.enhanced_keys_supported,
|
||||
self.disable_paste_burst,
|
||||
self.keymap.list.clone(),
|
||||
);
|
||||
self.pause_status_timer_for_modal();
|
||||
self.set_composer_input_enabled(
|
||||
|
||||
@@ -61,6 +61,11 @@ use crate::bottom_pane::popup_consts::MAX_POPUP_ROWS;
|
||||
use crate::bottom_pane::scroll_state::ScrollState;
|
||||
use crate::bottom_pane::selection_popup_common::render_rows_single_line;
|
||||
use crate::key_hint;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::key_hint::is_plain_text_key_event;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::keymap::RuntimeKeymap;
|
||||
use crate::keymap::primary_binding;
|
||||
use crate::line_truncation::truncate_line_with_ellipsis_if_overflow;
|
||||
use crate::render::Insets;
|
||||
use crate::render::RectExt;
|
||||
@@ -182,6 +187,9 @@ pub(crate) struct MultiSelectPicker {
|
||||
/// Whether left/right arrow reordering is enabled.
|
||||
ordering_enabled: bool,
|
||||
|
||||
/// Shared list keybindings for navigation and completion.
|
||||
keymap: ListKeymap,
|
||||
|
||||
/// Optional callback to generate a preview line from current item states.
|
||||
preview_builder: Option<PreviewCallback>,
|
||||
|
||||
@@ -352,6 +360,30 @@ impl MultiSelectPicker {
|
||||
self.state.ensure_visible(len, visible);
|
||||
}
|
||||
|
||||
fn page_up(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.page_up_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn page_down(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.page_down_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn jump_top(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.jump_top(len, visible);
|
||||
}
|
||||
|
||||
fn jump_bottom(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.jump_bottom(len, visible);
|
||||
}
|
||||
|
||||
/// Toggles the enabled state of the currently selected item.
|
||||
///
|
||||
/// Updates the preview line and invokes the `on_change` callback if set.
|
||||
@@ -493,50 +525,41 @@ impl BottomPaneView for MultiSelectPicker {
|
||||
}
|
||||
|
||||
fn handle_key_event(&mut self, key_event: KeyEvent) {
|
||||
// Printable characters always feed search. Movement aliases such as
|
||||
// plain j/k only apply through non-text events or modified bindings.
|
||||
let allow_plain_char_navigation = !is_plain_text_key_event(key_event);
|
||||
|
||||
match key_event {
|
||||
KeyEvent { code: KeyCode::Left, .. } if self.ordering_enabled => {
|
||||
_ if allow_plain_char_navigation
|
||||
&& self.ordering_enabled
|
||||
&& self.keymap.move_left.is_pressed(key_event) =>
|
||||
{
|
||||
self.move_selected_item(Direction::Up);
|
||||
}
|
||||
KeyEvent { code: KeyCode::Right, .. } if self.ordering_enabled => {
|
||||
_ if allow_plain_char_navigation
|
||||
&& self.ordering_enabled
|
||||
&& self.keymap.move_right.is_pressed(key_event) =>
|
||||
{
|
||||
self.move_selected_item(Direction::Down);
|
||||
}
|
||||
KeyEvent {
|
||||
code: KeyCode::Up, ..
|
||||
_ if allow_plain_char_navigation && self.keymap.move_up.is_pressed(key_event) => {
|
||||
self.move_up()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('p'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.move_down.is_pressed(key_event) => {
|
||||
self.move_down()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('k'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.page_up.is_pressed(key_event) => {
|
||||
self.page_up()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{0010}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} /* ^P */ => self.move_up(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Down,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.page_down.is_pressed(key_event) => {
|
||||
self.page_down()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('j'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.jump_top.is_pressed(key_event) => {
|
||||
self.jump_top()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('n'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.jump_bottom.is_pressed(key_event) => {
|
||||
self.jump_bottom()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{000e}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} /* ^N */ => self.move_down(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Backspace,
|
||||
..
|
||||
@@ -549,15 +572,8 @@ impl BottomPaneView for MultiSelectPicker {
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.toggle_selected(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Enter,
|
||||
..
|
||||
} => self.confirm_selection(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Esc, ..
|
||||
} => {
|
||||
self.close();
|
||||
}
|
||||
_ if self.keymap.accept.is_pressed(key_event) => self.confirm_selection(),
|
||||
_ if self.keymap.cancel.is_pressed(key_event) => self.close(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Char(c),
|
||||
modifiers,
|
||||
@@ -703,6 +719,7 @@ pub(crate) struct MultiSelectPickerBuilder {
|
||||
items: Vec<MultiSelectItem>,
|
||||
ordering_enabled: bool,
|
||||
app_event_tx: AppEventSender,
|
||||
keymap: ListKeymap,
|
||||
preview_builder: Option<PreviewCallback>,
|
||||
on_change: Option<ChangeCallBack>,
|
||||
on_confirm: Option<ConfirmCallback>,
|
||||
@@ -719,6 +736,7 @@ impl MultiSelectPickerBuilder {
|
||||
items: Vec::new(),
|
||||
ordering_enabled: false,
|
||||
app_event_tx,
|
||||
keymap: RuntimeKeymap::defaults().list,
|
||||
preview_builder: None,
|
||||
on_change: None,
|
||||
on_confirm: None,
|
||||
@@ -732,15 +750,6 @@ impl MultiSelectPickerBuilder {
|
||||
self
|
||||
}
|
||||
|
||||
/// Sets custom instruction spans for the footer hint line.
|
||||
///
|
||||
/// If not set, default instructions are shown (Space to toggle, Enter to
|
||||
/// confirm, Escape to close).
|
||||
pub fn instructions(mut self, instructions: Vec<Span<'static>>) -> Self {
|
||||
self.instructions = instructions;
|
||||
self
|
||||
}
|
||||
|
||||
/// Enables left/right arrow keys for reordering items.
|
||||
///
|
||||
/// Reordering is only active when the search query is empty.
|
||||
@@ -749,6 +758,12 @@ impl MultiSelectPickerBuilder {
|
||||
self
|
||||
}
|
||||
|
||||
/// Sets the shared list keymap used for navigation and completion.
|
||||
pub fn list_keymap(mut self, keymap: ListKeymap) -> Self {
|
||||
self.keymap = keymap;
|
||||
self
|
||||
}
|
||||
|
||||
/// Sets a callback to generate a preview line from the current item states.
|
||||
///
|
||||
/// The callback receives all items and should return a [`Line`] to display,
|
||||
@@ -806,15 +821,34 @@ impl MultiSelectPickerBuilder {
|
||||
}
|
||||
|
||||
let instructions = if self.instructions.is_empty() {
|
||||
vec![
|
||||
let mut spans = vec![
|
||||
"Press ".into(),
|
||||
key_hint::plain(KeyCode::Char(' ')).into(),
|
||||
" to toggle; ".into(),
|
||||
key_hint::plain(KeyCode::Enter).into(),
|
||||
" to confirm and close; ".into(),
|
||||
key_hint::plain(KeyCode::Esc).into(),
|
||||
" to close".into(),
|
||||
]
|
||||
" to toggle".into(),
|
||||
];
|
||||
if self.ordering_enabled
|
||||
&& let (Some(move_left), Some(move_right)) = (
|
||||
primary_binding(&self.keymap.move_left),
|
||||
primary_binding(&self.keymap.move_right),
|
||||
)
|
||||
{
|
||||
spans.push("; ".into());
|
||||
spans.push(move_left.into());
|
||||
spans.push("/".into());
|
||||
spans.push(move_right.into());
|
||||
spans.push(" to move".into());
|
||||
}
|
||||
if let Some(accept) = primary_binding(&self.keymap.accept) {
|
||||
spans.push("; ".into());
|
||||
spans.push(accept.into());
|
||||
spans.push(" to confirm and close".into());
|
||||
}
|
||||
if let Some(cancel) = primary_binding(&self.keymap.cancel) {
|
||||
spans.push("; ".into());
|
||||
spans.push(cancel.into());
|
||||
spans.push(" to close".into());
|
||||
}
|
||||
spans
|
||||
} else {
|
||||
self.instructions
|
||||
};
|
||||
@@ -827,6 +861,7 @@ impl MultiSelectPickerBuilder {
|
||||
header: Box::new(header),
|
||||
footer_hint: Line::from(instructions),
|
||||
ordering_enabled: self.ordering_enabled,
|
||||
keymap: self.keymap,
|
||||
search_query: String::new(),
|
||||
filtered_indices: Vec::new(),
|
||||
preview_builder: self.preview_builder,
|
||||
@@ -940,6 +975,38 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn horizontal_list_keys_reorder_orderable_items() {
|
||||
let mut picker = test_picker(vec![
|
||||
item(
|
||||
"model", /*orderable*/ true, /*section_break_after*/ false,
|
||||
),
|
||||
item(
|
||||
"branch", /*orderable*/ true, /*section_break_after*/ false,
|
||||
),
|
||||
]);
|
||||
|
||||
picker.handle_key_event(KeyEvent::new(KeyCode::Char('l'), KeyModifiers::CONTROL));
|
||||
assert_eq!(
|
||||
picker
|
||||
.items
|
||||
.iter()
|
||||
.map(|item| item.id.as_str())
|
||||
.collect::<Vec<_>>(),
|
||||
vec!["branch", "model"]
|
||||
);
|
||||
|
||||
picker.handle_key_event(KeyEvent::new(KeyCode::Char('h'), KeyModifiers::CONTROL));
|
||||
assert_eq!(
|
||||
picker
|
||||
.items
|
||||
.iter()
|
||||
.map(|item| item.id.as_str())
|
||||
.collect::<Vec<_>>(),
|
||||
vec!["model", "branch"]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn section_break_after_item_renders_separator_row() {
|
||||
let picker = test_picker(vec![
|
||||
@@ -964,4 +1031,65 @@ mod tests {
|
||||
);
|
||||
assert_eq!(rows.state.selected_idx, Some(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn searchable_plain_j_updates_query_instead_of_navigating() {
|
||||
let mut picker = test_picker(vec![
|
||||
item(
|
||||
"alpha", /*orderable*/ true, /*section_break_after*/ false,
|
||||
),
|
||||
item(
|
||||
"jupiter", /*orderable*/ true, /*section_break_after*/ false,
|
||||
),
|
||||
]);
|
||||
|
||||
picker.handle_key_event(KeyEvent::new(KeyCode::Char('j'), KeyModifiers::NONE));
|
||||
|
||||
assert_eq!(picker.search_query, "j");
|
||||
assert_eq!(picker.filtered_indices, vec![1]);
|
||||
assert_eq!(picker.state.selected_idx, Some(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_and_jump_navigation_use_list_keymap() {
|
||||
let (tx, _rx) = unbounded_channel::<AppEvent>();
|
||||
let mut keymap = RuntimeKeymap::defaults().list;
|
||||
keymap.page_down = vec![key_hint::ctrl(KeyCode::Char('d'))];
|
||||
keymap.page_up = vec![key_hint::ctrl(KeyCode::Char('u'))];
|
||||
keymap.jump_bottom = vec![key_hint::ctrl(KeyCode::Char('e'))];
|
||||
keymap.jump_top = vec![key_hint::ctrl(KeyCode::Char('a'))];
|
||||
let mut picker = MultiSelectPicker::builder(
|
||||
"Test".to_string(),
|
||||
/*subtitle*/ None,
|
||||
AppEventSender::new(tx),
|
||||
)
|
||||
.items(
|
||||
(0..12)
|
||||
.map(|idx| {
|
||||
item(
|
||||
&format!("item-{idx}"),
|
||||
/*orderable*/ true,
|
||||
/*section_break_after*/ false,
|
||||
)
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
.list_keymap(keymap)
|
||||
.build();
|
||||
|
||||
picker.handle_key_event(KeyEvent::from(KeyCode::PageDown));
|
||||
assert_eq!(picker.state.selected_idx, Some(0));
|
||||
|
||||
picker.handle_key_event(KeyEvent::new(KeyCode::Char('d'), KeyModifiers::CONTROL));
|
||||
assert_eq!(picker.state.selected_idx, Some(8));
|
||||
|
||||
picker.handle_key_event(KeyEvent::new(KeyCode::Char('u'), KeyModifiers::CONTROL));
|
||||
assert_eq!(picker.state.selected_idx, Some(0));
|
||||
|
||||
picker.handle_key_event(KeyEvent::new(KeyCode::Char('e'), KeyModifiers::CONTROL));
|
||||
assert_eq!(picker.state.selected_idx, Some(11));
|
||||
|
||||
picker.handle_key_event(KeyEvent::new(KeyCode::Char('a'), KeyModifiers::CONTROL));
|
||||
assert_eq!(picker.state.selected_idx, Some(0));
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,8 @@ use crate::bottom_pane::scroll_state::ScrollState;
|
||||
use crate::bottom_pane::selection_popup_common::GenericDisplayRow;
|
||||
use crate::bottom_pane::selection_popup_common::measure_rows_height;
|
||||
use crate::history_cell;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::renderable::Renderable;
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -138,15 +140,35 @@ pub(crate) struct RequestUserInputOverlay {
|
||||
done: bool,
|
||||
pending_submission_draft: Option<ComposerDraft>,
|
||||
confirm_unanswered: Option<ScrollState>,
|
||||
list_keymap: ListKeymap,
|
||||
}
|
||||
|
||||
impl RequestUserInputOverlay {
|
||||
#[cfg(test)]
|
||||
pub(crate) fn new(
|
||||
request: ToolRequestUserInputParams,
|
||||
app_event_tx: AppEventSender,
|
||||
has_input_focus: bool,
|
||||
enhanced_keys_supported: bool,
|
||||
disable_paste_burst: bool,
|
||||
) -> Self {
|
||||
Self::new_with_keymap(
|
||||
request,
|
||||
app_event_tx,
|
||||
has_input_focus,
|
||||
enhanced_keys_supported,
|
||||
disable_paste_burst,
|
||||
crate::keymap::RuntimeKeymap::defaults().list,
|
||||
)
|
||||
}
|
||||
|
||||
pub(crate) fn new_with_keymap(
|
||||
request: ToolRequestUserInputParams,
|
||||
app_event_tx: AppEventSender,
|
||||
has_input_focus: bool,
|
||||
enhanced_keys_supported: bool,
|
||||
disable_paste_burst: bool,
|
||||
list_keymap: ListKeymap,
|
||||
) -> Self {
|
||||
// Use the same composer widget, but disable popups/slash-commands and
|
||||
// image-path attachment so it behaves like a focused notes field.
|
||||
@@ -171,6 +193,7 @@ impl RequestUserInputOverlay {
|
||||
done: false,
|
||||
pending_submission_draft: None,
|
||||
confirm_unanswered: None,
|
||||
list_keymap,
|
||||
};
|
||||
overlay.reset_for_request();
|
||||
overlay.ensure_focus_available();
|
||||
@@ -1063,11 +1086,8 @@ impl BottomPaneView for RequestUserInputOverlay {
|
||||
code: KeyCode::Char('h'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} if self.has_options() && matches!(self.focus, Focus::Options) => {
|
||||
self.move_question(/*next*/ false);
|
||||
return;
|
||||
}
|
||||
KeyEvent {
|
||||
| KeyEvent {
|
||||
code: KeyCode::Left,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
@@ -1075,19 +1095,30 @@ impl BottomPaneView for RequestUserInputOverlay {
|
||||
self.move_question(/*next*/ false);
|
||||
return;
|
||||
}
|
||||
_ if self.has_options()
|
||||
&& matches!(self.focus, Focus::Options)
|
||||
&& self.list_keymap.move_left.is_pressed(key_event) =>
|
||||
{
|
||||
self.move_question(/*next*/ false);
|
||||
return;
|
||||
}
|
||||
KeyEvent {
|
||||
code: KeyCode::Char('l'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Right,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} if self.has_options() && matches!(self.focus, Focus::Options) => {
|
||||
self.move_question(/*next*/ true);
|
||||
return;
|
||||
}
|
||||
KeyEvent {
|
||||
code: KeyCode::Right,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} if self.has_options() && matches!(self.focus, Focus::Options) => {
|
||||
_ if self.has_options()
|
||||
&& matches!(self.focus, Focus::Options)
|
||||
&& self.list_keymap.move_right.is_pressed(key_event) =>
|
||||
{
|
||||
self.move_question(/*next*/ true);
|
||||
return;
|
||||
}
|
||||
@@ -1886,6 +1917,30 @@ mod tests {
|
||||
assert_eq!(overlay.current_index(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn horizontal_list_keys_move_between_questions_in_options() {
|
||||
let (tx, _rx) = test_sender();
|
||||
let mut overlay = RequestUserInputOverlay::new(
|
||||
request_event(
|
||||
"turn-1",
|
||||
vec![
|
||||
question_with_options("q1", "Pick one"),
|
||||
question_with_options("q2", "Pick two"),
|
||||
],
|
||||
),
|
||||
tx,
|
||||
/*has_input_focus*/ true,
|
||||
/*enhanced_keys_supported*/ false,
|
||||
/*disable_paste_burst*/ false,
|
||||
);
|
||||
|
||||
assert_eq!(overlay.current_index(), 0);
|
||||
overlay.handle_key_event(KeyEvent::new(KeyCode::Char('l'), KeyModifiers::CONTROL));
|
||||
assert_eq!(overlay.current_index(), 1);
|
||||
overlay.handle_key_event(KeyEvent::new(KeyCode::Char('h'), KeyModifiers::CONTROL));
|
||||
assert_eq!(overlay.current_index(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn options_notes_focus_hides_question_navigation_tip() {
|
||||
let (tx, _rx) = test_sender();
|
||||
|
||||
@@ -4,6 +4,13 @@
|
||||
/// - Optional selection (None when list is empty)
|
||||
/// - Wrap-around navigation on Up/Down
|
||||
/// - Maintaining a scroll window (`scroll_top`) so the selected row stays visible
|
||||
///
|
||||
/// Callers own the filtered row count and the visible window size. Every
|
||||
/// mutation method takes those values instead of caching them here, so list
|
||||
/// views can apply filters, pagination, or density changes without this helper
|
||||
/// knowing about their data model. Passing a stale length after filtering would
|
||||
/// leave selection pointing at the wrong row, so callers should clamp or move
|
||||
/// through this type immediately after changing their visible row set.
|
||||
#[derive(Debug, Default, Clone, Copy)]
|
||||
pub(crate) struct ScrollState {
|
||||
pub selected_idx: Option<usize>,
|
||||
@@ -26,20 +33,15 @@ impl ScrollState {
|
||||
|
||||
/// Clamp selection to be within the [0, len-1] range, or None when empty.
|
||||
pub fn clamp_selection(&mut self, len: usize) {
|
||||
self.selected_idx = match len {
|
||||
0 => None,
|
||||
_ => Some(self.selected_idx.unwrap_or(0).min(len - 1)),
|
||||
};
|
||||
if len == 0 {
|
||||
self.scroll_top = 0;
|
||||
if self.clear_if_empty(len) {
|
||||
return;
|
||||
}
|
||||
self.selected_idx = Some(self.selected_idx.unwrap_or(0).min(len - 1));
|
||||
}
|
||||
|
||||
/// Move selection up by one, wrapping to the bottom when necessary.
|
||||
pub fn move_up_wrap(&mut self, len: usize) {
|
||||
if len == 0 {
|
||||
self.selected_idx = None;
|
||||
self.scroll_top = 0;
|
||||
if self.clear_if_empty(len) {
|
||||
return;
|
||||
}
|
||||
self.selected_idx = Some(match self.selected_idx {
|
||||
@@ -51,9 +53,7 @@ impl ScrollState {
|
||||
|
||||
/// Move selection down by one, wrapping to the top when necessary.
|
||||
pub fn move_down_wrap(&mut self, len: usize) {
|
||||
if len == 0 {
|
||||
self.selected_idx = None;
|
||||
self.scroll_top = 0;
|
||||
if self.clear_if_empty(len) {
|
||||
return;
|
||||
}
|
||||
self.selected_idx = Some(match self.selected_idx {
|
||||
@@ -62,6 +62,63 @@ impl ScrollState {
|
||||
});
|
||||
}
|
||||
|
||||
/// Move selection up by one visible page, clamping at the first row.
|
||||
///
|
||||
/// Page movement intentionally does not wrap. It mirrors terminal list
|
||||
/// behavior where repeated page-up/page-down converges at the nearest edge
|
||||
/// while still keeping the selected row visible.
|
||||
pub fn page_up_clamped(&mut self, len: usize, visible_rows: usize) {
|
||||
if self.clear_if_empty(len) {
|
||||
return;
|
||||
}
|
||||
let step = visible_rows.max(1);
|
||||
let current = self.selected_idx.unwrap_or(0).min(len - 1);
|
||||
self.selected_idx = Some(current.saturating_sub(step));
|
||||
self.ensure_visible(len, visible_rows);
|
||||
}
|
||||
|
||||
/// Move selection down by one visible page, clamping at the last row.
|
||||
///
|
||||
/// Page movement intentionally does not wrap. It mirrors terminal list
|
||||
/// behavior where repeated page-up/page-down converges at the nearest edge
|
||||
/// while still keeping the selected row visible.
|
||||
pub fn page_down_clamped(&mut self, len: usize, visible_rows: usize) {
|
||||
if self.clear_if_empty(len) {
|
||||
return;
|
||||
}
|
||||
let step = visible_rows.max(1);
|
||||
let current = self.selected_idx.unwrap_or(0).min(len - 1);
|
||||
self.selected_idx = Some(current.saturating_add(step).min(len - 1));
|
||||
self.ensure_visible(len, visible_rows);
|
||||
}
|
||||
|
||||
/// Jump selection to the first row.
|
||||
pub fn jump_top(&mut self, len: usize, visible_rows: usize) {
|
||||
if self.clear_if_empty(len) {
|
||||
return;
|
||||
}
|
||||
self.selected_idx = Some(0);
|
||||
self.ensure_visible(len, visible_rows);
|
||||
}
|
||||
|
||||
/// Jump selection to the last row.
|
||||
pub fn jump_bottom(&mut self, len: usize, visible_rows: usize) {
|
||||
if self.clear_if_empty(len) {
|
||||
return;
|
||||
}
|
||||
self.selected_idx = Some(len - 1);
|
||||
self.ensure_visible(len, visible_rows);
|
||||
}
|
||||
|
||||
fn clear_if_empty(&mut self, len: usize) -> bool {
|
||||
if len != 0 {
|
||||
return false;
|
||||
}
|
||||
self.selected_idx = None;
|
||||
self.scroll_top = 0;
|
||||
true
|
||||
}
|
||||
|
||||
/// Adjust `scroll_top` so that the current `selected_idx` is visible within
|
||||
/// the window of `visible_rows`.
|
||||
pub fn ensure_visible(&mut self, len: usize, visible_rows: usize) {
|
||||
@@ -112,4 +169,36 @@ mod tests {
|
||||
assert_eq!(s.selected_idx, Some(0));
|
||||
assert_eq!(s.scroll_top, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_and_jump_navigation_clamps() {
|
||||
let mut s = ScrollState::new();
|
||||
let len = 10;
|
||||
let vis = 4;
|
||||
|
||||
s.clamp_selection(len);
|
||||
s.page_down_clamped(len, vis);
|
||||
assert_eq!(s.selected_idx, Some(4));
|
||||
assert_eq!(s.scroll_top, 1);
|
||||
|
||||
s.page_down_clamped(len, vis);
|
||||
assert_eq!(s.selected_idx, Some(8));
|
||||
assert_eq!(s.scroll_top, 5);
|
||||
|
||||
s.page_down_clamped(len, vis);
|
||||
assert_eq!(s.selected_idx, Some(9));
|
||||
assert_eq!(s.scroll_top, 6);
|
||||
|
||||
s.page_up_clamped(len, vis);
|
||||
assert_eq!(s.selected_idx, Some(5));
|
||||
assert_eq!(s.scroll_top, 5);
|
||||
|
||||
s.jump_top(len, vis);
|
||||
assert_eq!(s.selected_idx, Some(0));
|
||||
assert_eq!(s.scroll_top, 0);
|
||||
|
||||
s.jump_bottom(len, vis);
|
||||
assert_eq!(s.selected_idx, Some(9));
|
||||
assert_eq!(s.scroll_top, 6);
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,10 @@ use ratatui::widgets::Widget;
|
||||
use crate::app_event::AppEvent;
|
||||
use crate::app_event_sender::AppEventSender;
|
||||
use crate::key_hint;
|
||||
use crate::key_hint::KeyBindingListExt;
|
||||
use crate::key_hint::is_plain_text_key_event;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::keymap::primary_binding;
|
||||
use crate::render::Insets;
|
||||
use crate::render::RectExt as _;
|
||||
use crate::render::renderable::ColumnRenderable;
|
||||
@@ -49,10 +53,15 @@ pub(crate) struct SkillsToggleView {
|
||||
footer_hint: Line<'static>,
|
||||
search_query: String,
|
||||
filtered_indices: Vec<usize>,
|
||||
keymap: ListKeymap,
|
||||
}
|
||||
|
||||
impl SkillsToggleView {
|
||||
pub(crate) fn new(items: Vec<SkillsToggleItem>, app_event_tx: AppEventSender) -> Self {
|
||||
pub(crate) fn new(
|
||||
items: Vec<SkillsToggleItem>,
|
||||
app_event_tx: AppEventSender,
|
||||
keymap: ListKeymap,
|
||||
) -> Self {
|
||||
let mut header = ColumnRenderable::new();
|
||||
header.push(Line::from("Enable/Disable Skills".bold()));
|
||||
header.push(Line::from(
|
||||
@@ -65,9 +74,10 @@ impl SkillsToggleView {
|
||||
complete: false,
|
||||
app_event_tx,
|
||||
header: Box::new(header),
|
||||
footer_hint: skills_toggle_hint_line(),
|
||||
footer_hint: skills_toggle_hint_line(&keymap),
|
||||
search_query: String::new(),
|
||||
filtered_indices: Vec::new(),
|
||||
keymap,
|
||||
};
|
||||
view.apply_filter();
|
||||
view
|
||||
@@ -161,6 +171,30 @@ impl SkillsToggleView {
|
||||
self.state.ensure_visible(len, visible);
|
||||
}
|
||||
|
||||
fn page_up(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.page_up_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn page_down(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.page_down_clamped(len, visible);
|
||||
}
|
||||
|
||||
fn jump_top(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.jump_top(len, visible);
|
||||
}
|
||||
|
||||
fn jump_bottom(&mut self) {
|
||||
let len = self.visible_len();
|
||||
let visible = Self::max_visible_rows(len);
|
||||
self.state.jump_bottom(len, visible);
|
||||
}
|
||||
|
||||
fn toggle_selected(&mut self) {
|
||||
let Some(idx) = self.state.selected_idx else {
|
||||
return;
|
||||
@@ -200,34 +234,29 @@ impl SkillsToggleView {
|
||||
|
||||
impl BottomPaneView for SkillsToggleView {
|
||||
fn handle_key_event(&mut self, key_event: KeyEvent) {
|
||||
// Printable characters always feed search. Movement aliases such as
|
||||
// plain j/k only apply through non-text events or modified bindings.
|
||||
let allow_plain_char_navigation = !is_plain_text_key_event(key_event);
|
||||
|
||||
match key_event {
|
||||
KeyEvent {
|
||||
code: KeyCode::Up, ..
|
||||
_ if allow_plain_char_navigation && self.keymap.move_up.is_pressed(key_event) => {
|
||||
self.move_up()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('p'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.move_down.is_pressed(key_event) => {
|
||||
self.move_down()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{0010}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} /* ^P */ => self.move_up(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Down,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.page_up.is_pressed(key_event) => {
|
||||
self.page_up()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('n'),
|
||||
modifiers: KeyModifiers::CONTROL,
|
||||
..
|
||||
_ if allow_plain_char_navigation && self.keymap.page_down.is_pressed(key_event) => {
|
||||
self.page_down()
|
||||
}
|
||||
_ if allow_plain_char_navigation && self.keymap.jump_top.is_pressed(key_event) => {
|
||||
self.jump_top()
|
||||
}
|
||||
_ if allow_plain_char_navigation && self.keymap.jump_bottom.is_pressed(key_event) => {
|
||||
self.jump_bottom()
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Char('\u{000e}'),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} /* ^N */ => self.move_down(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Backspace,
|
||||
..
|
||||
@@ -239,15 +268,9 @@ impl BottomPaneView for SkillsToggleView {
|
||||
code: KeyCode::Char(' '),
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
}
|
||||
| KeyEvent {
|
||||
code: KeyCode::Enter,
|
||||
modifiers: KeyModifiers::NONE,
|
||||
..
|
||||
} => self.toggle_selected(),
|
||||
KeyEvent {
|
||||
code: KeyCode::Esc, ..
|
||||
} => {
|
||||
_ if self.keymap.accept.is_pressed(key_event) => self.toggle_selected(),
|
||||
_ if self.keymap.cancel.is_pressed(key_event) => {
|
||||
self.on_ctrl_c();
|
||||
}
|
||||
KeyEvent {
|
||||
@@ -364,16 +387,37 @@ impl Renderable for SkillsToggleView {
|
||||
}
|
||||
}
|
||||
|
||||
fn skills_toggle_hint_line() -> Line<'static> {
|
||||
Line::from(vec![
|
||||
"Press ".into(),
|
||||
key_hint::plain(KeyCode::Char(' ')).into(),
|
||||
" or ".into(),
|
||||
key_hint::plain(KeyCode::Enter).into(),
|
||||
" to toggle; ".into(),
|
||||
key_hint::plain(KeyCode::Esc).into(),
|
||||
" to close".into(),
|
||||
])
|
||||
fn skills_toggle_hint_line(keymap: &ListKeymap) -> Line<'static> {
|
||||
let space = key_hint::plain(KeyCode::Char(' '));
|
||||
let accept = primary_binding(&keymap.accept).filter(|binding| *binding != space);
|
||||
let cancel = primary_binding(&keymap.cancel);
|
||||
|
||||
match (accept, cancel) {
|
||||
(Some(accept), Some(cancel)) => Line::from(vec![
|
||||
"Press ".into(),
|
||||
space.into(),
|
||||
" or ".into(),
|
||||
accept.into(),
|
||||
" to toggle; ".into(),
|
||||
cancel.into(),
|
||||
" to close".into(),
|
||||
]),
|
||||
(Some(accept), None) => Line::from(vec![
|
||||
"Press ".into(),
|
||||
space.into(),
|
||||
" or ".into(),
|
||||
accept.into(),
|
||||
" to toggle".into(),
|
||||
]),
|
||||
(None, Some(cancel)) => Line::from(vec![
|
||||
"Press ".into(),
|
||||
space.into(),
|
||||
" to toggle; ".into(),
|
||||
cancel.into(),
|
||||
" to close".into(),
|
||||
]),
|
||||
(None, None) => Line::from(vec!["Press ".into(), space.into(), " to toggle".into()]),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -429,7 +473,23 @@ mod tests {
|
||||
path: test_path_buf("/tmp/skills/changelog_writer.toml").abs(),
|
||||
},
|
||||
];
|
||||
let view = SkillsToggleView::new(items, tx);
|
||||
let view = SkillsToggleView::new(items, tx, crate::keymap::RuntimeKeymap::defaults().list);
|
||||
assert_snapshot!("skills_toggle_basic", render_lines(&view, /*width*/ 72));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn footer_hint_uses_list_keymap_accept_and_cancel() {
|
||||
let (tx_raw, _rx) = unbounded_channel::<AppEvent>();
|
||||
let tx = AppEventSender::new(tx_raw);
|
||||
let mut keymap = crate::keymap::RuntimeKeymap::defaults().list;
|
||||
keymap.accept = vec![key_hint::ctrl(KeyCode::Char('t'))];
|
||||
keymap.cancel = vec![key_hint::ctrl(KeyCode::Char('x'))];
|
||||
let view = SkillsToggleView::new(Vec::new(), tx, keymap);
|
||||
let rendered = render_lines(&view, /*width*/ 72);
|
||||
|
||||
assert!(rendered.contains("ctrl + t"));
|
||||
assert!(rendered.contains("ctrl + x"));
|
||||
assert!(!rendered.contains("enter"));
|
||||
assert!(!rendered.contains("esc"));
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -18,4 +18,4 @@ expression: "render_lines(&view, 72)"
|
||||
[ ] pull-request-number Open pull request number for the current …
|
||||
|
||||
gpt-5-codex · ~/codex-rs · jif/statusline-preview
|
||||
Use ↑↓ to navigate, ←→ to move, space to select, enter to confirm, esc
|
||||
Press space to toggle; ←/→ to move; enter to confirm and close; esc to
|
||||
+1
-1
@@ -18,4 +18,4 @@ expression: "render_lines(&view, 84)"
|
||||
[ ] context-remaining Percentage of context window remaining (omitted when unk…
|
||||
|
||||
[ ! ] Action Required | my-project | Working | thread title
|
||||
Use ↑↓ to navigate, ←→ to move, space to select, enter to confirm, esc to cancel.
|
||||
Press space to toggle; ←/→ to move; enter to confirm and close; esc to close
|
||||
@@ -35,6 +35,7 @@ use crate::bottom_pane::multi_select_picker::MultiSelectItem;
|
||||
use crate::bottom_pane::multi_select_picker::MultiSelectPicker;
|
||||
use crate::bottom_pane::status_surface_preview::StatusSurfacePreviewData;
|
||||
use crate::bottom_pane::status_surface_preview::StatusSurfacePreviewItem;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::renderable::Renderable;
|
||||
|
||||
const STATUS_LINE_USE_THEME_COLORS_ITEM_ID: &str = "status-line-use-theme-colors";
|
||||
@@ -246,6 +247,7 @@ impl StatusLineSetupView {
|
||||
use_theme_colors: bool,
|
||||
preview_data: StatusSurfacePreviewData,
|
||||
app_event_tx: AppEventSender,
|
||||
list_keymap: ListKeymap,
|
||||
) -> Self {
|
||||
let mut used_ids = HashSet::new();
|
||||
let mut items = vec![MultiSelectItem {
|
||||
@@ -284,10 +286,7 @@ impl StatusLineSetupView {
|
||||
Some("Select which items to display in the status line.".to_string()),
|
||||
app_event_tx,
|
||||
)
|
||||
.instructions(vec![
|
||||
"Use ↑↓ to navigate, ←→ to move, space to select, enter to confirm, esc to cancel."
|
||||
.into(),
|
||||
])
|
||||
.list_keymap(list_keymap)
|
||||
.items(items)
|
||||
.enable_ordering()
|
||||
.on_preview(move |items| {
|
||||
@@ -621,6 +620,7 @@ mod tests {
|
||||
),
|
||||
]),
|
||||
AppEventSender::new(tx_raw),
|
||||
crate::keymap::RuntimeKeymap::defaults().list,
|
||||
);
|
||||
|
||||
assert_snapshot!(render_lines(&view, /*width*/ 72));
|
||||
|
||||
@@ -26,6 +26,7 @@ use crate::bottom_pane::multi_select_picker::MultiSelectItem;
|
||||
use crate::bottom_pane::multi_select_picker::MultiSelectPicker;
|
||||
use crate::bottom_pane::status_surface_preview::StatusSurfacePreviewData;
|
||||
use crate::bottom_pane::status_surface_preview::StatusSurfacePreviewItem;
|
||||
use crate::keymap::ListKeymap;
|
||||
use crate::render::renderable::Renderable;
|
||||
|
||||
/// Available items that can be displayed in the terminal title.
|
||||
@@ -244,6 +245,7 @@ impl TerminalTitleSetupView {
|
||||
title_items: Option<&[String]>,
|
||||
preview_data: StatusSurfacePreviewData,
|
||||
app_event_tx: AppEventSender,
|
||||
list_keymap: ListKeymap,
|
||||
) -> Self {
|
||||
let selected_items = title_items
|
||||
.into_iter()
|
||||
@@ -271,10 +273,7 @@ impl TerminalTitleSetupView {
|
||||
Some("Select which items to display in the terminal title.".to_string()),
|
||||
app_event_tx,
|
||||
)
|
||||
.instructions(vec![
|
||||
"Use ↑↓ to navigate, ←→ to move, space to select, enter to confirm, esc to cancel."
|
||||
.into(),
|
||||
])
|
||||
.list_keymap(list_keymap)
|
||||
.items(items)
|
||||
.enable_ordering()
|
||||
.on_preview(move |items| {
|
||||
@@ -387,8 +386,12 @@ mod tests {
|
||||
"run-state".to_string(),
|
||||
"thread-title".to_string(),
|
||||
];
|
||||
let view =
|
||||
TerminalTitleSetupView::new(Some(&selected), StatusSurfacePreviewData::default(), tx);
|
||||
let view = TerminalTitleSetupView::new(
|
||||
Some(&selected),
|
||||
StatusSurfacePreviewData::default(),
|
||||
tx,
|
||||
crate::keymap::RuntimeKeymap::defaults().list,
|
||||
);
|
||||
assert_snapshot!(
|
||||
"terminal_title_setup_basic",
|
||||
render_lines(&view, /*width*/ 84)
|
||||
|
||||
Reference in new issue
Block a user