mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
## What changed - Apply shared picker styling to apps, plugins, settings, skills, hooks, and multi-select views, with full-width selection highlights and compact key hints. - Share row measurement and layout helpers, show scroll indicators, and let optional spacing yield on short screens to keep selected rows visible. - Wrap headers and footers, simplify search fields, and use a compact hooks event table at narrow widths. - Reserve plugin result rows while filtering and cap the plugin name column width. ## Testing Add regression coverage for selected rows in short multi-select views, compact hooks navigation, and checkbox, preview, and overflow rendering. Extend experimental-feature and memory-reset wrapping snapshots to narrower widths and update affected popup snapshots. GitOrigin-RevId: 0eedbbff307c84cc858629e578091bbbd59b2423
163 lines
6.2 KiB
Rust
163 lines
6.2 KiB
Rust
//! Responsive hook browsing presentation; trust and toggle policies stay in the view.
|
||
|
||
use super::*;
|
||
use crate::bottom_pane::picker_style;
|
||
use crate::bottom_pane::selection_popup_common::RenderedRows;
|
||
use crate::render::Insets;
|
||
use crate::render::RectExt;
|
||
use ratatui::widgets::Wrap;
|
||
|
||
impl HooksBrowserView {
|
||
// Keep the existing yellow warning treatment for hooks awaiting review.
|
||
#[allow(clippy::disallowed_methods)]
|
||
fn event_parts(&self, width: u16) -> (Vec<Line<'static>>, Vec<Line<'static>>) {
|
||
let events = self.event_rows();
|
||
let mut header = self.event_page_lines();
|
||
let mut rows = header.split_off(header.len().saturating_sub(events.len()));
|
||
if width < 72 {
|
||
header.pop();
|
||
header.push("Event Active/Installed".dim().into());
|
||
rows = events
|
||
.iter()
|
||
.enumerate()
|
||
.map(|(index, row)| {
|
||
let name = event_label(row.event_name);
|
||
let review = if row.needs_review > 0 { " !" } else { "" };
|
||
let line = Line::from(format!(
|
||
"{name:<18} {}/{}{review}",
|
||
row.active, row.installed
|
||
));
|
||
if self.state.selected_idx == Some(index) {
|
||
line.style(selection_style())
|
||
} else if row.needs_review > 0 {
|
||
line.yellow()
|
||
} else {
|
||
line
|
||
}
|
||
})
|
||
.collect();
|
||
}
|
||
for (index, line) in rows.iter_mut().enumerate() {
|
||
let prefix = if self.state.selected_idx == Some(index) {
|
||
"› "
|
||
} else {
|
||
" "
|
||
};
|
||
line.spans.insert(/*index*/ 0, prefix.into());
|
||
}
|
||
(header, rows)
|
||
}
|
||
}
|
||
|
||
fn render_line_rows(
|
||
area: Rect,
|
||
buf: &mut Buffer,
|
||
rows: Vec<Line<'static>>,
|
||
mut state: ScrollState,
|
||
) {
|
||
let body = area.inset(Insets::vh(u16::from(area.height >= 3), /*h*/ 0));
|
||
let visible = usize::from(body.height);
|
||
state.ensure_visible(rows.len(), visible.max(/*other*/ 1));
|
||
for (offset, line) in rows.iter().skip(state.scroll_top).take(visible).enumerate() {
|
||
let row_area = Rect::new(
|
||
body.x,
|
||
body.y + offset as u16,
|
||
body.width,
|
||
/*height*/ 1,
|
||
);
|
||
line.clone().render(row_area, buf);
|
||
if line.style.bg.is_some() {
|
||
buf.set_style(row_area, line.style);
|
||
}
|
||
}
|
||
picker_style::render_scroll_indicators(
|
||
area,
|
||
buf,
|
||
RenderedRows {
|
||
has_above: state.scroll_top > 0,
|
||
has_below: state.scroll_top + visible < rows.len(),
|
||
..Default::default()
|
||
},
|
||
);
|
||
}
|
||
|
||
impl Renderable for HooksBrowserView {
|
||
fn desired_height(&self, width: u16) -> u16 {
|
||
let inner_width = width.saturating_sub(/*rhs*/ 4).max(/*other*/ 1);
|
||
let (header, rows, detail) = match self.page {
|
||
HooksBrowserPage::Events => {
|
||
let (header, rows) = self.event_parts(inner_width);
|
||
(header, rows.len(), 0)
|
||
}
|
||
HooksBrowserPage::Handlers(event) => {
|
||
let rows = self.handlers_for_event(event).count();
|
||
let detail = if rows == 0 {
|
||
0
|
||
} else {
|
||
self.detail_lines(event, usize::from(inner_width)).len() + 1
|
||
};
|
||
(
|
||
Self::handler_header_lines(event, self.review_needed_count(event)),
|
||
rows,
|
||
detail,
|
||
)
|
||
}
|
||
};
|
||
let header_height = Paragraph::new(header)
|
||
.wrap(Wrap { trim: false })
|
||
.line_count(inner_width);
|
||
u16::try_from(header_height + rows.clamp(/*min*/ 1, MAX_POPUP_ROWS) + detail + 5)
|
||
.unwrap_or(u16::MAX)
|
||
}
|
||
|
||
fn render(&self, area: Rect, buf: &mut Buffer) {
|
||
if area.is_empty() {
|
||
return;
|
||
}
|
||
let [panel, footer] =
|
||
Layout::vertical([Constraint::Fill(1), Constraint::Length(1)]).areas(area);
|
||
let content = render_menu_surface(panel, buf);
|
||
if content.is_empty() {
|
||
self.render_footer(footer, buf);
|
||
return;
|
||
}
|
||
let (header, rows) = match self.page {
|
||
HooksBrowserPage::Events => self.event_parts(content.width),
|
||
HooksBrowserPage::Handlers(event) => (
|
||
Self::handler_header_lines(event, self.review_needed_count(event)),
|
||
self.handler_row_lines(event, usize::from(area.width)),
|
||
),
|
||
};
|
||
let header = Paragraph::new(header).wrap(Wrap { trim: false });
|
||
let header_height =
|
||
(header.line_count(content.width) as u16).min(content.height.saturating_sub(/*rhs*/ 3));
|
||
let [header_area, body] =
|
||
Layout::vertical([Constraint::Length(header_height), Constraint::Fill(1)])
|
||
.areas(content);
|
||
header.render(header_area, buf);
|
||
let body = Rect::new(area.x, body.y, area.width, body.height);
|
||
match self.page {
|
||
HooksBrowserPage::Events => render_line_rows(body, buf, rows, self.state),
|
||
HooksBrowserPage::Handlers(event) => {
|
||
if rows.is_empty() {
|
||
Paragraph::new(" No hooks installed for this event.")
|
||
.dim()
|
||
.render(body, buf);
|
||
} else {
|
||
let desired = rows.len().min(MAX_POPUP_ROWS) as u16 + 2;
|
||
let list_height = desired
|
||
.min(body.height.saturating_sub(/*rhs*/ 3).max(/*other*/ 3))
|
||
.min(body.height);
|
||
let [list, details] =
|
||
Layout::vertical([Constraint::Length(list_height), Constraint::Fill(1)])
|
||
.areas(body);
|
||
render_line_rows(list, buf, rows, self.state);
|
||
Paragraph::new(self.detail_lines(event, usize::from(content.width)))
|
||
.render(details.inset(Insets::vh(/*v*/ 0, /*h*/ 2)), buf);
|
||
}
|
||
}
|
||
}
|
||
self.render_footer(footer, buf);
|
||
}
|
||
}
|