mirror of
https://github.com/openai/codex.git
synced 2026-11-14 21:40:39 +00:00
## What changed - Allow selecting warning text while preserving wrapped URLs and hard line breaks when copying. - Add mouse-wheel scrolling within the warning body and keep page navigation working after selection. - Use the shared menu surface and show configured scroll hints only for directions with more content. - Preserve painted backgrounds when rendering text selections. ## Testing Add coverage for warning selection without changing the draft, paging after selection, wheel scrolling and directional hints, and selection boundaries in scrolled text containing tabs and wrapped words. Update warning panel snapshots. GitOrigin-RevId: c4b77277a60b7b4af92043cb3761769ddc636454
244 lines
8.2 KiB
Rust
244 lines
8.2 KiB
Rust
use crate::keymap::ListAction;
|
|
use crossterm::event::MouseEvent;
|
|
use crossterm::event::MouseEventKind;
|
|
use ratatui::layout::Position;
|
|
use ratatui::layout::Rect;
|
|
|
|
/// An unmodified wheel tick moves three rows within the painted region.
|
|
pub(super) fn wheel_rows_in(event: MouseEvent, area: Rect) -> Option<i16> {
|
|
if !event.modifiers.is_empty() || !area.contains(Position::new(event.column, event.row)) {
|
|
return None;
|
|
}
|
|
match event.kind {
|
|
MouseEventKind::ScrollUp => Some(-3),
|
|
MouseEventKind::ScrollDown => Some(3),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// Generic scroll/selection state for a vertical list menu.
|
|
///
|
|
/// Encapsulates the common behavior of a selectable list that supports:
|
|
/// - 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, PartialEq)]
|
|
pub(crate) struct ScrollState {
|
|
pub selected_idx: Option<usize>,
|
|
pub scroll_top: usize,
|
|
}
|
|
|
|
impl ScrollState {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
selected_idx: None,
|
|
scroll_top: 0,
|
|
}
|
|
}
|
|
|
|
/// Apply a vertical list action and keep the resulting selection visible.
|
|
pub fn apply_vertical_action(&mut self, action: ListAction, len: usize, visible_rows: usize) {
|
|
match action {
|
|
ListAction::MoveUp => {
|
|
self.move_up_wrap(len);
|
|
self.ensure_visible(len, visible_rows);
|
|
}
|
|
ListAction::MoveDown => {
|
|
self.move_down_wrap(len);
|
|
self.ensure_visible(len, visible_rows);
|
|
}
|
|
ListAction::PageUp => self.page_up_clamped(len, visible_rows),
|
|
ListAction::PageDown => self.page_down_clamped(len, visible_rows),
|
|
ListAction::JumpTop => self.jump_top(len, visible_rows),
|
|
ListAction::JumpBottom => self.jump_bottom(len, visible_rows),
|
|
ListAction::MoveLeft
|
|
| ListAction::MoveRight
|
|
| ListAction::Accept
|
|
| ListAction::Cancel => {}
|
|
}
|
|
}
|
|
|
|
/// Reset selection and scroll.
|
|
pub fn reset(&mut self) {
|
|
self.selected_idx = None;
|
|
self.scroll_top = 0;
|
|
}
|
|
|
|
/// Clamp selection to be within the [0, len-1] range, or None when empty.
|
|
pub fn clamp_selection(&mut self, len: usize) {
|
|
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 self.clear_if_empty(len) {
|
|
return;
|
|
}
|
|
self.selected_idx = Some(match self.selected_idx {
|
|
Some(idx) if idx > 0 => idx - 1,
|
|
Some(_) => len - 1,
|
|
None => 0,
|
|
});
|
|
}
|
|
|
|
/// Move selection down by one, wrapping to the top when necessary.
|
|
pub fn move_down_wrap(&mut self, len: usize) {
|
|
if self.clear_if_empty(len) {
|
|
return;
|
|
}
|
|
self.selected_idx = Some(match self.selected_idx {
|
|
Some(idx) if idx + 1 < len => idx + 1,
|
|
_ => 0,
|
|
});
|
|
}
|
|
|
|
/// 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) {
|
|
if len == 0 || visible_rows == 0 {
|
|
self.scroll_top = 0;
|
|
return;
|
|
}
|
|
if let Some(sel) = self.selected_idx {
|
|
if sel < self.scroll_top {
|
|
self.scroll_top = sel;
|
|
} else {
|
|
let bottom = self.scroll_top + visible_rows - 1;
|
|
if sel > bottom {
|
|
self.scroll_top = sel + 1 - visible_rows;
|
|
}
|
|
}
|
|
} else {
|
|
self.scroll_top = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::ScrollState;
|
|
use crate::keymap::ListAction;
|
|
|
|
#[test]
|
|
fn wrap_navigation_and_visibility() {
|
|
let mut s = ScrollState::new();
|
|
let len = 10;
|
|
let vis = 5;
|
|
|
|
s.clamp_selection(len);
|
|
assert_eq!(s.selected_idx, Some(0));
|
|
s.ensure_visible(len, vis);
|
|
assert_eq!(s.scroll_top, 0);
|
|
|
|
s.apply_vertical_action(ListAction::MoveUp, len, vis);
|
|
assert_eq!(s.selected_idx, Some(len - 1));
|
|
match s.selected_idx {
|
|
Some(sel) => assert!(s.scroll_top <= sel),
|
|
None => panic!("expected Some(selected_idx) after wrap"),
|
|
}
|
|
|
|
s.apply_vertical_action(ListAction::MoveDown, len, vis);
|
|
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.apply_vertical_action(ListAction::PageDown, len, vis);
|
|
assert_eq!(s.selected_idx, Some(4));
|
|
assert_eq!(s.scroll_top, 1);
|
|
|
|
s.apply_vertical_action(ListAction::PageDown, len, vis);
|
|
assert_eq!(s.selected_idx, Some(8));
|
|
assert_eq!(s.scroll_top, 5);
|
|
|
|
s.apply_vertical_action(ListAction::PageDown, len, vis);
|
|
assert_eq!(s.selected_idx, Some(9));
|
|
assert_eq!(s.scroll_top, 6);
|
|
|
|
s.apply_vertical_action(ListAction::PageUp, len, vis);
|
|
assert_eq!(s.selected_idx, Some(5));
|
|
assert_eq!(s.scroll_top, 5);
|
|
|
|
s.apply_vertical_action(ListAction::JumpTop, len, vis);
|
|
assert_eq!(s.selected_idx, Some(0));
|
|
assert_eq!(s.scroll_top, 0);
|
|
|
|
s.apply_vertical_action(ListAction::JumpBottom, len, vis);
|
|
assert_eq!(s.selected_idx, Some(9));
|
|
assert_eq!(s.scroll_top, 6);
|
|
}
|
|
}
|