Skip to content
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

refactor(tui): Improve aesthetics for helper text. #9478

Merged
merged 5 commits into from
Nov 21, 2024
Merged

refactor(tui): Improve aesthetics for helper text. #9478

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29d3f32
refactor(tui): Gain better aesthetic for helper text.
anthonyshew Nov 21, 2024
c3381ed
WIP
anthonyshew Nov 21, 2024
919d150
Update crates/turborepo-ui/src/tui/pane.rs
anthonyshew Nov 21, 2024
21d961a
Update crates/turborepo-ui/src/tui/pane.rs
anthonyshew Nov 21, 2024
ed505a0
Merge branch 'main' into shew-15b5d
anthonyshew Nov 21, 2024
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
41 changes: 23 additions & 18 deletions crates/turborepo-ui/src/tui/pane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ use tui_term::widget::PseudoTerminal;

use super::{app::LayoutSections, TerminalOutput};

const FOOTER_TEXT_ACTIVE: &str = "Press`Ctrl-Z` to stop interacting.";
const FOOTER_TEXT_INACTIVE: &str = "Press `Enter` to interact.";
const HAS_SELECTION: &str = "Press `c` to copy selection";
const TASK_LIST_HIDDEN: &str = "Press `h` to show task list.";
const FOOTER_TEXT_ACTIVE: &str = "Ctrl-z - Stop interacting";
const FOOTER_TEXT_INACTIVE: &str = "Enter - Interact";
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
const HAS_SELECTION: &str = "c - Copy selection";
const TASK_LIST_HIDDEN: &str = "h - Show task list";

pub struct TerminalPane<'a, W> {
terminal_output: &'a TerminalOutput<W>,
Expand Down Expand Up @@ -39,24 +39,29 @@ impl<'a, W> TerminalPane<'a, W> {
}

fn footer(&self) -> Line {
let task_list_message = if !self.has_sidebar {
TASK_LIST_HIDDEN
} else {
""
let build_message_vec = |footer_text: &str| -> String {
let mut messages = vec![footer_text];

if !self.has_sidebar {
messages.push(TASK_LIST_HIDDEN);
}

if self.terminal_output.has_selection() {
messages.push(HAS_SELECTION);
}

// Spaces are used to pad the footer text for aesthetics
[" ".into(), messages.join(", ")].join("")
anthonyshew marked this conversation as resolved.
Show resolved Hide resolved
};

match self.section {
LayoutSections::Pane if self.terminal_output.has_selection() => Line::from(format!(
"{FOOTER_TEXT_ACTIVE} {task_list_message} {HAS_SELECTION}"
))
.centered(),
LayoutSections::Pane => Line::from(FOOTER_TEXT_ACTIVE.to_owned()).centered(),
LayoutSections::TaskList if self.terminal_output.has_selection() => Line::from(
format!("{FOOTER_TEXT_INACTIVE} {task_list_message} {HAS_SELECTION}"),
)
.centered(),
LayoutSections::Pane => {
let messages = build_message_vec(FOOTER_TEXT_ACTIVE);
Line::from(messages).left_aligned()
}
LayoutSections::TaskList => {
Line::from(format!("{FOOTER_TEXT_INACTIVE} {task_list_message}")).centered()
let messages = build_message_vec(FOOTER_TEXT_INACTIVE);
Line::from(messages).left_aligned()
}
LayoutSections::Search { results, .. } => {
Line::from(format!("/ {}", results.query())).left_aligned()
Expand Down
Loading