From f3fd9ee85a049a8f1e38f13ed73ff9c638604ae2 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Thu, 5 Sep 2024 10:54:12 +0200 Subject: [PATCH] lib: Moves table / tree item traits --- src/ui.rs | 16 ++++++++++++++++ src/ui/im.rs | 3 +-- src/ui/im/widget.rs | 3 +-- src/ui/rm/widget/list.rs | 21 +++------------------ 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/ui.rs b/src/ui.rs index 10b5be7a..4d2d2b4e 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -7,6 +7,9 @@ pub mod theme; use ratatui::layout::Constraint; use ratatui::text::Text; +use ratatui::widgets::Cell; + +use tui_tree_widget::TreeItem; pub const RENDER_WIDTH_XSMALL: usize = 50; pub const RENDER_WIDTH_SMALL: usize = 70; @@ -90,3 +93,16 @@ impl<'a> Column<'a> { } } } + +/// Needs to be implemented for items that are supposed to be rendered in tables. +pub trait ToRow { + fn to_row(&self) -> [Cell; W]; +} + +/// Needs to be implemented for items that are supposed to be rendered in trees. +pub trait ToTree +where + Id: ToString, +{ + fn rows(&self) -> Vec>; +} diff --git a/src/ui/im.rs b/src/ui/im.rs index 2a489747..81b53c74 100644 --- a/src/ui/im.rs +++ b/src/ui/im.rs @@ -20,9 +20,8 @@ use crate::event::Event; use crate::store::State; use crate::task::Interrupted; use crate::terminal; -use crate::ui::rm::widget::list::ToRow; use crate::ui::theme::Theme; -use crate::ui::Column; +use crate::ui::{Column, ToRow}; use crate::ui::im::widget::{HeaderedTable, Widget}; diff --git a/src/ui/im/widget.rs b/src/ui/im/widget.rs index f8ab4bd3..24490528 100644 --- a/src/ui/im/widget.rs +++ b/src/ui/im/widget.rs @@ -9,10 +9,9 @@ use ratatui::{layout::Constraint, widgets::Paragraph}; use termion::event::Key; use crate::ui::ext::{FooterBlock, FooterBlockType, HeaderBlock}; -use crate::ui::rm::widget::list::ToRow; use crate::ui::theme::style; -use crate::ui::Column; use crate::ui::{layout, span}; +use crate::ui::{Column, ToRow}; use super::{Borders, Context, InnerResponse, Response, Ui}; diff --git a/src/ui/rm/widget/list.rs b/src/ui/rm/widget/list.rs index 8f1126e9..b8fae17f 100644 --- a/src/ui/rm/widget/list.rs +++ b/src/ui/rm/widget/list.rs @@ -10,33 +10,18 @@ use ratatui::style::{Style, Stylize}; use ratatui::symbols::border; use ratatui::text::Text; use ratatui::widgets::TableState; -use ratatui::widgets::{ - Block, Borders, Cell, Row, Scrollbar, ScrollbarOrientation, ScrollbarState, -}; +use ratatui::widgets::{Block, Borders, Row, Scrollbar, ScrollbarOrientation, ScrollbarState}; use ratatui::Frame; -use tui_tree_widget::{TreeItem, TreeState}; +use tui_tree_widget::TreeState; use crate::ui::theme::style; -use crate::ui::Column; use crate::ui::{layout, span}; +use crate::ui::{Column, ToRow, ToTree}; use super::{utils, ViewProps, ViewState}; use super::{RenderProps, View}; -/// Needs to be implemented for items that are supposed to be rendered in tables. -pub trait ToRow { - fn to_row(&self) -> [Cell; W]; -} - -/// Needs to be implemented for items that are supposed to be rendered in trees. -pub trait ToTree -where - Id: ToString, -{ - fn rows(&self) -> Vec>; -} - #[derive(Clone, Debug)] pub struct TableProps<'a, R, const W: usize> where