From ba1e389767a7a133af0d41cc83953f97dfa6719b Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Fri, 23 Feb 2024 21:33:39 +0100 Subject: [PATCH] lib: Show hint when table is empty --- bin/commands/inbox/flux/select/ui.rs | 3 +- bin/commands/issue/flux/select/ui.rs | 3 +- bin/commands/patch/flux/select/ui.rs | 3 +- src/flux/ui/layout.rs | 20 +++++++++++ src/flux/ui/widget.rs | 52 +++++++++++++++++++--------- 5 files changed, 61 insertions(+), 20 deletions(-) diff --git a/bin/commands/inbox/flux/select/ui.rs b/bin/commands/inbox/flux/select/ui.rs index f31974aa..54f6ac49 100644 --- a/bin/commands/inbox/flux/select/ui.rs +++ b/bin/commands/inbox/flux/select/ui.rs @@ -1,3 +1,4 @@ +use std::cmp; use std::vec; use tokio::sync::mpsc::UnboundedSender; @@ -264,7 +265,7 @@ impl Render<()> for Notifications { .unwrap_or("-".to_string()); let length = self.props.notifications.len().to_string(); - span::badge(format!("{}/{}", step, length)) + span::badge(format!("{}/{}", cmp::min(&step, &length), length)) }; self.header.render::( diff --git a/bin/commands/issue/flux/select/ui.rs b/bin/commands/issue/flux/select/ui.rs index b90a44c0..51c5f0c1 100644 --- a/bin/commands/issue/flux/select/ui.rs +++ b/bin/commands/issue/flux/select/ui.rs @@ -1,3 +1,4 @@ +use std::cmp; use std::vec; use ratatui::style::Stylize; @@ -293,7 +294,7 @@ impl Render<()> for Issues { .unwrap_or("-".to_string()); let length = self.props.issues.len().to_string(); - span::badge(format!("{}/{}", step, length)) + span::badge(format!("{}/{}", cmp::min(&step, &length), length)) }; self.header.render::( diff --git a/bin/commands/patch/flux/select/ui.rs b/bin/commands/patch/flux/select/ui.rs index e1050162..19789eea 100644 --- a/bin/commands/patch/flux/select/ui.rs +++ b/bin/commands/patch/flux/select/ui.rs @@ -1,3 +1,4 @@ +use std::cmp; use std::vec; use ratatui::style::Stylize; @@ -306,7 +307,7 @@ impl Render<()> for Patches { .unwrap_or("-".to_string()); let length = self.props.patches.len().to_string(); - span::badge(format!("{}/{}", step, length)) + span::badge(format!("{}/{}", cmp::min(&step, &length), length)) }; self.header.render::( diff --git a/src/flux/ui/layout.rs b/src/flux/ui/layout.rs index c13b77fb..e68a753f 100644 --- a/src/flux/ui/layout.rs +++ b/src/flux/ui/layout.rs @@ -31,3 +31,23 @@ pub fn default_page(area: Rect, context_h: u16, shortcuts_h: u16) -> DefaultPage shortcuts: layout[2], } } + +pub fn centered_rect(r: Rect, percent_x: u16, percent_y: u16) -> Rect { + let layout = Layout::default() + .direction(Direction::Vertical) + .constraints([ + Constraint::Percentage((100 - percent_y) / 2), + Constraint::Percentage(percent_y), + Constraint::Percentage((100 - percent_y) / 2), + ]) + .split(r); + + Layout::default() + .direction(Direction::Horizontal) + .constraints([ + Constraint::Percentage((100 - percent_x) / 2), + Constraint::Percentage(percent_x), + Constraint::Percentage((100 - percent_x) / 2), + ]) + .split(layout[1])[1] +} diff --git a/src/flux/ui/widget.rs b/src/flux/ui/widget.rs index e863e32c..84ecb53d 100644 --- a/src/flux/ui/widget.rs +++ b/src/flux/ui/widget.rs @@ -10,6 +10,7 @@ use ratatui::prelude::*; use ratatui::widgets::{Block, BorderType, Borders, Cell, Row, TableState}; use super::theme::style; +use super::{layout, span}; pub trait Widget { fn new(state: &S, action_tx: UnboundedSender) -> Self @@ -205,23 +206,40 @@ where (true, true) => Borders::LEFT | Borders::RIGHT, }; - let rows = props - .items - .iter() - .map(|item| Row::new(item.to_row())) - .collect::>(); - let rows = ratatui::widgets::Table::default() - .rows(rows) - .widths(widths) - .column_spacing(1) - .block( - Block::default() - .border_style(style::border(props.focus)) - .border_type(BorderType::Rounded) - .borders(borders), - ) - .highlight_style(style::highlight()); + if !props.items.is_empty() { + let rows = props + .items + .iter() + .map(|item| Row::new(item.to_row())) + .collect::>(); + let rows = ratatui::widgets::Table::default() + .rows(rows) + .widths(widths) + .column_spacing(1) + .block( + Block::default() + .border_style(style::border(props.focus)) + .border_type(BorderType::Rounded) + .borders(borders), + ) + .highlight_style(style::highlight()); - frame.render_stateful_widget(rows, area, &mut self.state.clone()); + frame.render_stateful_widget(rows, area, &mut self.state.clone()); + } else { + let block = Block::default() + .border_style(style::border(props.focus)) + .border_type(BorderType::Rounded) + .borders(borders); + + frame.render_widget(block, area); + + let center = layout::centered_rect(area, 50, 10); + let hint = span::default("Nothing to show".to_string()) + .centered() + .light_magenta() + .dim(); + + frame.render_widget(hint, center); + } } }