7a248a6 feat(lib): Make empty message in tables optional — radicle-tui

rad:z39mP9rQAaGmERfUMPULfPUi473tY

Radicle terminal user interface

feat(lib): Make empty message in tables optional

Erik Kundt committed 1 year ago

commit 7a248a687dea7e28519874fdf540a7e18b46c515
parent 5b44b2f

3 files changed +21 -9

modified examples/selection.rs

@@ -102,6 +102,7 @@ impl Show<Message> for App {

                         &mut selected,
                         &self.items,
                         columns,
                         None,
                         Some(Borders::None),
                     );
                     if table.changed {

modified src/ui/im.rs

@@ -555,12 +555,13 @@ where

         selected: &mut Option<usize>,
         items: &'a Vec<R>,
         columns: Vec<Column<'a>>,
         empty_message: Option<String>,
         borders: Option<Borders>,
     ) -> Response
     where
         R: ToRow<W> + Clone,
     {
         widget::Table::new(selected, items, columns, borders).ui(self, frame)
         widget::Table::new(selected, items, columns, empty_message, borders).ui(self, frame)
     }
     pub fn headered_table<'a, R, const W: usize>(

@@ -570,11 +571,12 @@ where

         items: &'a Vec<R>,
         header: impl IntoIterator<Item = Column<'a>>,
         columns: impl IntoIterator<Item = Column<'a>>,
         empty_message: Option<String>,
     ) -> Response
     where
         R: ToRow<W> + Clone,
     {
         HeaderedTable::<R, W>::new(selected, items, header, columns).ui(self, frame)
         HeaderedTable::<R, W>::new(selected, items, header, columns, empty_message).ui(self, frame)
     }
     pub fn shortcuts(

modified src/ui/im/widget.rs

@@ -348,6 +348,7 @@ pub struct Table<'a, R, const W: usize> {

     columns: Vec<Column<'a>>,
     borders: Option<Borders>,
     show_scrollbar: bool,
     empty_message: Option<String>,
     dim: bool,
 }

@@ -359,12 +360,14 @@ where

         selected: &'a mut Option<usize>,
         items: &'a Vec<R>,
         columns: Vec<Column<'a>>,
         empty_message: Option<String>,
         borders: Option<Borders>,
     ) -> Self {
         Self {
             items,
             selected,
             columns,
             empty_message,
             borders,
             show_scrollbar: true,
             dim: false,

@@ -513,13 +516,15 @@ where

                 frame.render_stateful_widget(scroller, scroller_area, &mut state);
             }
         } else {
             let center = layout::centered_rect(area, 50, 10);
             let hint = Text::from(span::default("Nothing to show"))
                 .centered()
                 .light_magenta()
                 .dim();
             frame.render_widget(hint, center);
             if let Some(message) = self.empty_message {
                 let center = layout::centered_rect(area, 50, 10);
                 let hint = Text::from(span::default(&message))
                     .centered()
                     .light_magenta()
                     .dim();
                 frame.render_widget(hint, center);
             }
         }
         *self.selected = state.selected();

@@ -533,6 +538,7 @@ pub struct HeaderedTable<'a, R, const W: usize> {

     selected: &'a mut Option<usize>,
     header: Vec<Column<'a>>,
     columns: Vec<Column<'a>>,
     empty_message: Option<String>,
 }
 impl<'a, R, const W: usize> HeaderedTable<'a, R, W> {

@@ -541,12 +547,14 @@ impl<'a, R, const W: usize> HeaderedTable<'a, R, W> {

         items: &'a Vec<R>,
         header: impl IntoIterator<Item = Column<'a>>,
         columns: impl IntoIterator<Item = Column<'a>>,
         empty_message: Option<String>,
     ) -> Self {
         Self {
             items,
             selected,
             header: header.into_iter().collect(),
             columns: columns.into_iter().collect(),
             empty_message,
         }
     }

@@ -578,6 +586,7 @@ where

                     self.selected,
                     self.items,
                     self.columns.to_vec(),
                     self.empty_message,
                     Some(Borders::BottomSides),
                 );
                 response.changed |= table.changed;