mirror of
https://github.com/openai/codex.git
synced 2026-10-21 17:48:44 +00:00
Eric Traut
93b44c3a73
## What changed - Group shortcut help into Navigate, Tasks, and View sections using the shared shortcut renderer, adapting to one, two, or three columns and indicating when more height is needed. - Show movement hints in the footer, move the new-worktree hint into help, and remove the idle search row. Give task-list column headers consistent styling. - Change the default task-deletion binding from `Delete` to `Backspace`, while preserving text editing in search and rename inputs. ## Testing Add snapshots for responsive help layouts, custom bindings, and active search. Add regression coverage for `Backspace` editing without deleting tasks, and update keymap conflict tests for the new default. GitOrigin-RevId: 45d7f122c9474f1c054450800dcca5a9b2bbbcc5
101 lines
3.2 KiB
Rust
101 lines
3.2 KiB
Rust
//! Shared shortcut groups align keys and flow into three, two, or one column.
|
|
//! Surface owners provide runtime bindings and handle titles, footers, and height limits.
|
|
|
|
use crate::key_hint::ShortcutHint;
|
|
use crate::style::accent_color;
|
|
use ratatui::style::Stylize;
|
|
use ratatui::text::Line;
|
|
use ratatui::text::Span;
|
|
|
|
const COLUMN_GAP: usize = 4;
|
|
|
|
pub(crate) struct Shortcut {
|
|
pub(crate) key: String,
|
|
pub(crate) action: &'static str,
|
|
}
|
|
|
|
impl Shortcut {
|
|
pub(crate) fn new(key: impl Into<ShortcutHint>, action: &'static str) -> Self {
|
|
Self {
|
|
key: key.into().display_label(),
|
|
action,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub(crate) struct Group {
|
|
pub(crate) title: &'static str,
|
|
pub(crate) entries: Vec<Shortcut>,
|
|
}
|
|
|
|
impl Group {
|
|
pub(crate) fn push(&mut self, key: Option<ShortcutHint>, action: &'static str) {
|
|
if let Some(key) = key {
|
|
self.entries.push(Shortcut::new(key, action));
|
|
}
|
|
}
|
|
|
|
fn lines(&self) -> Vec<Line<'static>> {
|
|
let key_width = self
|
|
.entries
|
|
.iter()
|
|
.map(|entry| Span::raw(&entry.key).width())
|
|
.max()
|
|
.unwrap_or(/*default*/ 0);
|
|
let mut lines = vec![self.title.bold().into()];
|
|
for entry in &self.entries {
|
|
let key = entry.key.clone().fg(accent_color());
|
|
let padding = " ".repeat(key_width.saturating_sub(key.width()) + 2);
|
|
lines.push(vec![key, padding.into(), entry.action.into()].into());
|
|
}
|
|
lines
|
|
}
|
|
}
|
|
|
|
pub(crate) fn group_lines(groups: [Group; 3], width: u16) -> Vec<Line<'static>> {
|
|
let groups = groups.map(|group| group.lines());
|
|
let widths: Vec<usize> = groups
|
|
.iter()
|
|
.map(|group| group.iter().map(Line::width).max().unwrap_or(/*default*/ 0))
|
|
.collect();
|
|
let width = usize::from(width.max(/*other*/ 1));
|
|
let mut result = Vec::new();
|
|
if widths.iter().sum::<usize>() + COLUMN_GAP * 2 <= width {
|
|
result.extend(columns(&groups, &widths));
|
|
} else if widths[0] + COLUMN_GAP + widths[1].max(widths[2]) <= width {
|
|
let mut right = groups[1].clone();
|
|
right.push(Line::default());
|
|
right.extend(groups[2].clone());
|
|
result.extend(columns(
|
|
&[groups[0].clone(), right],
|
|
&[widths[0], widths[1].max(widths[2])],
|
|
));
|
|
} else {
|
|
for (index, group) in groups.into_iter().enumerate() {
|
|
if index > 0 {
|
|
result.push(Line::default());
|
|
}
|
|
result.extend(group);
|
|
}
|
|
}
|
|
result
|
|
}
|
|
|
|
fn columns(groups: &[Vec<Line<'static>>], widths: &[usize]) -> Vec<Line<'static>> {
|
|
let height = groups.iter().map(Vec::len).max().unwrap_or(/*default*/ 0);
|
|
(0..height)
|
|
.map(|row| {
|
|
let mut line = Line::default();
|
|
for (column, group) in groups.iter().enumerate() {
|
|
let entry = group.get(row).cloned().unwrap_or_default();
|
|
let padding = widths[column].saturating_sub(entry.width()) + COLUMN_GAP;
|
|
line.extend(entry.spans);
|
|
if column + 1 < groups.len() {
|
|
line.push_span(" ".repeat(padding));
|
|
}
|
|
}
|
|
line
|
|
})
|
|
.collect()
|
|
}
|