Skip to content

Hide numeric prefixes on disabled TUI list rows #15660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
canvrno-oai merged 2 commits into from
Mar 24, 2026
Merged

Hide numeric prefixes on disabled TUI list rows #15660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84a3358
Remove numeric prefixes for disabled rows in shared list rendering.
canvrno-oai Mar 24, 2026
27ad3ac
Indent list items when numbers are omitted
canvrno-oai Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion codex-rs/tui/src/bottom_pane/list_selection_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,14 @@ impl ListSelectionView {
""
};
let name_with_marker = format!("{name}{marker}");
let is_disabled = item.is_disabled || item.disabled_reason.is_some();
let n = visible_idx + 1;
let wrap_prefix = if self.is_searchable {
// The number keys don't work when search is enabled (since we let the
// numbers be used for the search query).
format!("{prefix} ")
} else if is_disabled {
format!("{prefix} {}", " ".repeat(n.to_string().len() + 2))
} else {
format!("{prefix} {n}. ")
};
Expand All @@ -388,7 +391,6 @@ impl ListSelectionView {
.flatten()
.or_else(|| item.description.clone());
let wrap_indent = description.is_none().then_some(wrap_prefix_width);
let is_disabled = item.is_disabled || item.disabled_reason.is_some();
GenericDisplayRow {
name: name_with_marker,
name_prefix_spans,
Expand Down
2 changes: 1 addition & 1 deletion .../tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__apps_popup_loading_state.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ expression: before
Apps
Loading installed and available apps...

› 1. Loading apps... This updates when the full list is ready.
› Loading apps... This updates when the full list is ready.
6 changes: 3 additions & 3 deletions ...c/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ expression: popup

› 1. Back to plugins Return to the plugin list.
2. Install plugin Install this plugin now.
3. Skills design-review, extract-copy
4. Apps Figma, Slack
5. MCP Servers figma-mcp, docs-mcp
Skills design-review, extract-copy
Apps Figma, Slack
MCP Servers figma-mcp, docs-mcp

Press esc to close.
2 changes: 1 addition & 1 deletion ...i/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ expression: popup
Loading available plugins...
This first pass shows the ChatGPT marketplace only.

› 1. Loading plugins... This updates when the marketplace list is ready.
› Loading plugins... This updates when the marketplace list is ready.
2 changes: 1 addition & 1 deletion .../chatwidget/snapshots/codex_tui__chatwidget__tests__realtime_microphone_picker_popup.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ expression: popup

1. System default Use your operating system
default device.
› 2. Unavailable: Studio Mic (current) (disabled) Configured device is not
› Unavailable: Studio Mic (current) (disabled) Configured device is not
currently available.
(disabled: Reconnect the
device or choose another
Expand Down
4 changes: 3 additions & 1 deletion codex-rs/tui_app_server/src/bottom_pane/list_selection_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,14 @@ impl ListSelectionView {
""
};
let name_with_marker = format!("{name}{marker}");
let is_disabled = item.is_disabled || item.disabled_reason.is_some();
let n = visible_idx + 1;
let wrap_prefix = if self.is_searchable {
// The number keys don't work when search is enabled (since we let the
// numbers be used for the search query).
format!("{prefix} ")
} else if is_disabled {
format!("{prefix} {}", " ".repeat(n.to_string().len() + 2))
} else {
format!("{prefix} {n}. ")
};
Expand All @@ -388,7 +391,6 @@ impl ListSelectionView {
.flatten()
.or_else(|| item.description.clone());
let wrap_indent = description.is_none().then_some(wrap_prefix_width);
let is_disabled = item.is_disabled || item.disabled_reason.is_some();
GenericDisplayRow {
name: name_with_marker,
name_prefix_spans,
Expand Down
2 changes: 1 addition & 1 deletion ...atwidget/snapshots/codex_tui_app_server__chatwidget__tests__apps_popup_loading_state.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ expression: before
Apps
Loading installed and available apps...

› 1. Loading apps... This updates when the full list is ready.
› Loading apps... This updates when the full list is ready.
6 changes: 3 additions & 3 deletions ...t/snapshots/codex_tui_app_server__chatwidget__tests__plugin_detail_popup_installable.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ expression: popup

› 1. Back to plugins Return to the plugin list.
2. Install plugin Install this plugin now.
3. Skills design-review, extract-copy
4. Apps Figma, Slack
5. MCP Servers figma-mcp, docs-mcp
Skills design-review, extract-copy
Apps Figma, Slack
MCP Servers figma-mcp, docs-mcp

Press esc to close.
2 changes: 1 addition & 1 deletion ...idget/snapshots/codex_tui_app_server__chatwidget__tests__plugins_popup_loading_state.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ expression: popup
Loading available plugins...
This first pass shows the ChatGPT marketplace only.

› 1. Loading plugins... This updates when the marketplace list is ready.
› Loading plugins... This updates when the marketplace list is ready.
2 changes: 1 addition & 1 deletion .../snapshots/codex_tui_app_server__chatwidget__tests__realtime_microphone_picker_popup.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ expression: popup

1. System default Use your operating system
default device.
› 2. Unavailable: Studio Mic (current) (disabled) Configured device is not
› Unavailable: Studio Mic (current) (disabled) Configured device is not
currently available.
(disabled: Reconnect the
device or choose another
Expand Down
Loading