diff --git a/bin/commands/inbox/select/ui.rs b/bin/commands/inbox/select/ui.rs index 227b7641..5bcf7754 100644 --- a/bin/commands/inbox/select/ui.rs +++ b/bin/commands/inbox/select/ui.rs @@ -17,7 +17,7 @@ use tui::ui::span; use tui::ui::widget::container::{Footer, Header}; use tui::ui::widget::input::TextField; use tui::ui::widget::text::Paragraph; -use tui::ui::widget::{Column, Render, Shortcuts, Table, Widget}; +use tui::ui::widget::{Column, Render, Shortcuts, Table, View}; use tui::Selection; use crate::tui_inbox::common::{InboxOperation, Mode, RepositoryMode, SelectionMode}; @@ -53,7 +53,7 @@ pub struct ListPage<'a> { shortcuts: Shortcuts, } -impl<'a> Widget for ListPage<'a> { +impl<'a> View for ListPage<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -103,9 +103,9 @@ impl<'a> Widget for ListPage<'a> { fn handle_key_event(&mut self, key: termion::event::Key) { if self.props.show_search { - >::handle_key_event(&mut self.search, key) + >::handle_key_event(&mut self.search, key) } else if self.props.show_help { - >::handle_key_event(&mut self.help, key) + >::handle_key_event(&mut self.help, key) } else { match key { Key::Esc | Key::Ctrl('c') => { @@ -118,7 +118,7 @@ impl<'a> Widget for ListPage<'a> { let _ = self.action_tx.send(Action::OpenHelp); } _ => { - >::handle_key_event( + >::handle_key_event( &mut self.notifications, key, ); @@ -129,8 +129,8 @@ impl<'a> Widget for ListPage<'a> { } } -impl<'a> Render<()> for ListPage<'a> { - fn render(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) { +impl<'a, B: Backend> Render for ListPage<'a> { + fn render(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) { let area = frame.size(); let layout = tui::ui::layout::default_page(area, 0u16, 1u16); @@ -138,16 +138,25 @@ impl<'a> Render<()> for ListPage<'a> { let component_layout = Layout::vertical([Constraint::Min(1), Constraint::Length(2)]) .split(layout.component); - self.notifications - .render::(frame, component_layout[0], ()); - self.search.render::(frame, component_layout[1], ()); + as Render>::render( + &self.notifications, + frame, + component_layout[0], + (), + ); + >::render(&self.search, frame, component_layout[1], ()); } else if self.props.show_help { - self.help.render::(frame, layout.component, ()); + as Render>::render(&self.help, frame, layout.component, ()); } else { - self.notifications.render::(frame, layout.component, ()); + as Render>::render( + &self.notifications, + frame, + layout.component, + (), + ); } - self.shortcuts.render::(frame, layout.shortcuts, ()); + as Render>::render(&self.shortcuts, frame, layout.shortcuts, ()); } } @@ -225,7 +234,7 @@ struct Notifications<'a> { footer: Footer<'a, Action>, } -impl<'a> Widget for Notifications<'a> { +impl<'a> View for Notifications<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self { let props = NotificationsProps::from(state); let name = match state.mode.repository() { @@ -326,7 +335,7 @@ impl<'a> Widget for Notifications<'a> { }); } _ => { - as Widget<(), Action>>::handle_key_event( + as View<(), Action>>::handle_key_event( &mut self.table, key, ); @@ -414,19 +423,19 @@ impl<'a> Notifications<'a> { } } -impl<'a> Render<()> for Notifications<'a> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, B: Backend> Render for Notifications<'a> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let header_height = 3_usize; let page_size = if self.props.show_search { - self.table.render::(frame, area, ()); + as Render>::render(&self.table, frame, area, ()); (area.height as usize).saturating_sub(header_height) } else { let layout = Layout::vertical([Constraint::Min(1), Constraint::Length(3)]).split(area); - self.table.render::(frame, layout[0], ()); - self.footer.render::(frame, layout[1], ()); + as Render>::render(&self.table, frame, layout[0], ()); + as Render>::render(&self.footer, frame, layout[1], ()); (area.height as usize).saturating_sub(header_height) }; @@ -442,7 +451,7 @@ pub struct Search { pub input: TextField, } -impl Widget for Search { +impl View for Search { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -472,10 +481,7 @@ impl Widget for Search { let _ = self.action_tx.send(Action::ApplySearch); } _ => { - as Widget>::handle_key_event( - &mut self.input, - key, - ); + as View>::handle_key_event(&mut self.input, key); let _ = self.action_tx.send(Action::UpdateSearch { value: self.input.read().to_string(), }); @@ -484,13 +490,13 @@ impl Widget for Search { } } -impl Render<()> for Search { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl Render for Search { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let layout = Layout::horizontal(Constraint::from_mins([0])) .horizontal_margin(1) .split(area); - self.input.render::(frame, layout[0], ()); + as Render>::render(&self.input, frame, layout[0], ()); } } @@ -652,7 +658,7 @@ pub struct Help<'a> { footer: Footer<'a, Action>, } -impl<'a> Widget for Help<'a> { +impl<'a> View for Help<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -714,14 +720,14 @@ impl<'a> Widget for Help<'a> { let _ = self.action_tx.send(Action::CloseHelp); } _ => { - as Widget<(), _>>::handle_key_event(&mut self.content, key); + as View<(), _>>::handle_key_event(&mut self.content, key); } } } } -impl<'a> Render<()> for Help<'a> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, B: Backend> Render for Help<'a> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let [header_area, content_area, footer_area] = Layout::vertical([ Constraint::Length(3), Constraint::Min(1), @@ -729,9 +735,9 @@ impl<'a> Render<()> for Help<'a> { ]) .areas(area); - self.header.render::(frame, header_area, ()); - self.content.render::(frame, content_area, ()); - self.footer.render::(frame, footer_area, ()); + as Render>::render(&self.header, frame, header_area, ()); + as Render>::render(&self.content, frame, content_area, ()); + as Render>::render(&self.footer, frame, footer_area, ()); let page_size = content_area.height as usize; if page_size != self.props.page_size { diff --git a/bin/commands/issue/select/ui.rs b/bin/commands/issue/select/ui.rs index 737937f2..26fba63c 100644 --- a/bin/commands/issue/select/ui.rs +++ b/bin/commands/issue/select/ui.rs @@ -19,7 +19,7 @@ use tui::ui::span; use tui::ui::widget::container::{Footer, Header}; use tui::ui::widget::input::TextField; use tui::ui::widget::text::Paragraph; -use tui::ui::widget::{Column, Render, Shortcuts, Table, Widget}; +use tui::ui::widget::{Column, Render, Shortcuts, Table, View}; use tui::Selection; use crate::tui_issue::common::IssueOperation; @@ -56,7 +56,7 @@ pub struct ListPage<'a> { shortcuts: Shortcuts, } -impl<'a> Widget for ListPage<'a> { +impl<'a> View for ListPage<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -106,9 +106,9 @@ impl<'a> Widget for ListPage<'a> { fn handle_key_event(&mut self, key: termion::event::Key) { if self.props.show_search { - >::handle_key_event(&mut self.search, key) + >::handle_key_event(&mut self.search, key) } else if self.props.show_help { - >::handle_key_event(&mut self.help, key) + >::handle_key_event(&mut self.help, key) } else { match key { Key::Esc | Key::Ctrl('c') => { @@ -121,7 +121,7 @@ impl<'a> Widget for ListPage<'a> { let _ = self.action_tx.send(Action::OpenHelp); } _ => { - >::handle_key_event(&mut self.issues, key); + >::handle_key_event(&mut self.issues, key); } } } @@ -129,8 +129,8 @@ impl<'a> Widget for ListPage<'a> { } } -impl<'a> Render<()> for ListPage<'a> { - fn render(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) { +impl<'a, B: Backend> Render for ListPage<'a> { + fn render(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) { let area = frame.size(); let layout = tui::ui::layout::default_page(area, 0u16, 1u16); @@ -138,15 +138,15 @@ impl<'a> Render<()> for ListPage<'a> { let component_layout = Layout::vertical([Constraint::Min(1), Constraint::Length(2)]) .split(layout.component); - self.issues.render::(frame, component_layout[0], ()); - self.search.render::(frame, component_layout[1], ()); + as Render>::render(&self.issues, frame, component_layout[0], ()); + >::render(&self.search, frame, component_layout[1], ()); } else if self.props.show_help { - self.help.render::(frame, layout.component, ()); + as Render>::render(&self.help, frame, layout.component, ()); } else { - self.issues.render::(frame, layout.component, ()); + as Render>::render(&self.issues, frame, layout.component, ()); } - self.shortcuts.render::(frame, layout.shortcuts, ()); + as Render>::render(&self.shortcuts, frame, layout.shortcuts, ()); } } @@ -236,7 +236,7 @@ struct Issues<'a> { footer: Footer<'a, Action>, } -impl<'a> Widget for Issues<'a> { +impl<'a> View for Issues<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self { let props = IssuesProps::from(state); @@ -329,7 +329,7 @@ impl<'a> Widget for Issues<'a> { }); } _ => { - as Widget<(), Action>>::handle_key_event( + as View<(), Action>>::handle_key_event( &mut self.table, key, ); @@ -435,19 +435,19 @@ impl<'a> Issues<'a> { } } -impl<'a> Render<()> for Issues<'a> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, B: Backend> Render for Issues<'a> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let header_height = 3_usize; let page_size = if self.props.show_search { - self.table.render::(frame, area, ()); + as Render>::render(&self.table, frame, area, ()); (area.height as usize).saturating_sub(header_height) } else { let layout = Layout::vertical([Constraint::Min(1), Constraint::Length(3)]).split(area); - self.table.render::(frame, layout[0], ()); - self.footer.render::(frame, layout[1], ()); + as Render>::render(&self.table, frame, layout[0], ()); + as Render>::render(&self.footer, frame, layout[1], ()); (area.height as usize).saturating_sub(header_height) }; @@ -463,7 +463,7 @@ pub struct Search { pub input: TextField, } -impl Widget for Search { +impl View for Search { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -493,10 +493,7 @@ impl Widget for Search { let _ = self.action_tx.send(Action::ApplySearch); } _ => { - as Widget>::handle_key_event( - &mut self.input, - key, - ); + as View>::handle_key_event(&mut self.input, key); let _ = self.action_tx.send(Action::UpdateSearch { value: self.input.read().to_string(), }); @@ -505,13 +502,13 @@ impl Widget for Search { } } -impl Render<()> for Search { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl Render for Search { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let layout = Layout::horizontal(Constraint::from_mins([0])) .horizontal_margin(1) .split(area); - self.input.render::(frame, layout[0], ()); + as Render>::render(&self.input, frame, layout[0], ()); } } @@ -672,7 +669,7 @@ pub struct Help<'a> { footer: Footer<'a, Action>, } -impl<'a> Widget for Help<'a> { +impl<'a> View for Help<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -734,14 +731,14 @@ impl<'a> Widget for Help<'a> { let _ = self.action_tx.send(Action::CloseHelp); } _ => { - as Widget<(), _>>::handle_key_event(&mut self.content, key); + as View<(), _>>::handle_key_event(&mut self.content, key); } } } } -impl<'a> Render<()> for Help<'a> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, B: Backend> Render for Help<'a> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let [header_area, content_area, footer_area] = Layout::vertical([ Constraint::Length(3), Constraint::Min(1), @@ -749,9 +746,9 @@ impl<'a> Render<()> for Help<'a> { ]) .areas(area); - self.header.render::(frame, header_area, ()); - self.content.render::(frame, content_area, ()); - self.footer.render::(frame, footer_area, ()); + as Render>::render(&self.header, frame, header_area, ()); + as Render>::render(&self.content, frame, content_area, ()); + as Render>::render(&self.footer, frame, footer_area, ()); let page_size = content_area.height as usize; if page_size != self.props.page_size { diff --git a/bin/commands/patch/select/ui.rs b/bin/commands/patch/select/ui.rs index 7dea882d..01149866 100644 --- a/bin/commands/patch/select/ui.rs +++ b/bin/commands/patch/select/ui.rs @@ -20,7 +20,7 @@ use tui::ui::span; use tui::ui::widget::container::{Footer, Header}; use tui::ui::widget::input::TextField; use tui::ui::widget::text::Paragraph; -use tui::ui::widget::{Column, Render, Shortcuts, Table, Widget}; +use tui::ui::widget::{Column, Render, Shortcuts, Table, View, Widget}; use tui::Selection; use crate::tui_patch::common::Mode; @@ -42,6 +42,9 @@ impl From<&State> for ListPageProps { } } +impl<'a, B: Backend> Widget for Patches<'a> {} +impl Widget for Search {} + pub struct ListPage<'a> { /// Action sender pub action_tx: UnboundedSender, @@ -57,7 +60,7 @@ pub struct ListPage<'a> { shortcuts: Shortcuts, } -impl<'a> Widget for ListPage<'a> { +impl<'a> View for ListPage<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -94,7 +97,7 @@ impl<'a> Widget for ListPage<'a> { } }; - let shortcuts = self.shortcuts.move_with_state(&()); + let shortcuts = self.shortcuts.move_with_state(state); let shortcuts = shortcuts.shortcuts(&shorts); ListPage { @@ -109,9 +112,9 @@ impl<'a> Widget for ListPage<'a> { fn handle_key_event(&mut self, key: termion::event::Key) { if self.props.show_search { - >::handle_key_event(&mut self.search, key) + >::handle_key_event(&mut self.search, key) } else if self.props.show_help { - >::handle_key_event(&mut self.help, key); + >::handle_key_event(&mut self.help, key); } else { match key { Key::Esc | Key::Ctrl('c') => { @@ -124,7 +127,7 @@ impl<'a> Widget for ListPage<'a> { let _ = self.action_tx.send(Action::OpenHelp); } _ => { - >::handle_key_event(&mut self.patches, key); + >::handle_key_event(&mut self.patches, key); } } } @@ -132,8 +135,8 @@ impl<'a> Widget for ListPage<'a> { } } -impl<'a> Render<()> for ListPage<'a> { - fn render(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) { +impl<'a, B: Backend> Render for ListPage<'a> { + fn render(&self, frame: &mut ratatui::Frame, _area: Rect, _props: ()) { let area = frame.size(); let layout = tui::ui::layout::default_page(area, 0u16, 1u16); @@ -141,15 +144,15 @@ impl<'a> Render<()> for ListPage<'a> { let component_layout = Layout::vertical([Constraint::Min(1), Constraint::Length(2)]) .split(layout.component); - self.patches.render::(frame, component_layout[0], ()); - self.search.render::(frame, component_layout[1], ()); + as Render>::render(&self.patches, frame, component_layout[0], ()); + >::render(&self.search, frame, component_layout[1], ()); } else if self.props.show_help { - self.help.render::(frame, layout.component, ()); + as Render>::render(&self.help, frame, layout.component, ()); } else { - self.patches.render::(frame, layout.component, ()); + as Render>::render(&self.patches, frame, layout.component, ()); } - self.shortcuts.render::(frame, layout.shortcuts, ()); + as Render>::render(&self.shortcuts, frame, layout.shortcuts, ()); } } @@ -237,7 +240,7 @@ struct Patches<'a> { footer: Footer<'a, Action>, } -impl<'a> Widget for Patches<'a> { +impl<'a> View for Patches<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self { let props = PatchesProps::from(state); @@ -260,10 +263,7 @@ impl<'a> Widget for Patches<'a> { .move_with_state(state) } - fn move_with_state(self, state: &State) -> Self - where - Self: Sized, - { + fn move_with_state(self, state: &State) -> Self { let patches: Vec = state .patches .iter() @@ -347,7 +347,7 @@ impl<'a> Widget for Patches<'a> { }); } _ => { - as Widget<(), Action>>::handle_key_event( + as View<(), Action>>::handle_key_event( &mut self.table, key, ); @@ -468,19 +468,19 @@ impl<'a> Patches<'a> { } } -impl<'a> Render<()> for Patches<'a> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, B: Backend> Render for Patches<'a> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let header_height = 3_usize; let page_size = if self.props.show_search { - self.table.render::(frame, area, ()); + as Render>::render(&self.table, frame, area, ()); (area.height as usize).saturating_sub(header_height) } else { let layout = Layout::vertical([Constraint::Min(1), Constraint::Length(3)]).split(area); - self.table.render::(frame, layout[0], ()); - self.footer.render::(frame, layout[1], ()); + as Render>::render(&self.table, frame, layout[0], ()); + as Render>::render(&self.footer, frame, layout[1], ()); (area.height as usize).saturating_sub(header_height) }; @@ -496,7 +496,7 @@ pub struct Search { pub input: TextField, } -impl Widget for Search { +impl View for Search { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -526,10 +526,7 @@ impl Widget for Search { let _ = self.action_tx.send(Action::ApplySearch); } _ => { - as Widget>::handle_key_event( - &mut self.input, - key, - ); + as View>::handle_key_event(&mut self.input, key); let _ = self.action_tx.send(Action::UpdateSearch { value: self.input.read().to_string(), }); @@ -538,13 +535,13 @@ impl Widget for Search { } } -impl Render<()> for Search { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl Render for Search { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let layout = Layout::horizontal(Constraint::from_mins([0])) .horizontal_margin(1) .split(area); - self.input.render::(frame, layout[0], ()); + as Render>::render(&self.input, frame, layout[0], ()); } } @@ -714,7 +711,7 @@ pub struct Help<'a> { footer: Footer<'a, Action>, } -impl<'a> Widget for Help<'a> { +impl<'a> View for Help<'a> { fn new(state: &State, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -776,14 +773,14 @@ impl<'a> Widget for Help<'a> { let _ = self.action_tx.send(Action::CloseHelp); } _ => { - as Widget<(), _>>::handle_key_event(&mut self.content, key); + as View<(), _>>::handle_key_event(&mut self.content, key); } } } } -impl<'a> Render<()> for Help<'a> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, B: Backend> Render for Help<'a> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let [header_area, content_area, footer_area] = Layout::vertical([ Constraint::Length(3), Constraint::Min(1), @@ -791,9 +788,9 @@ impl<'a> Render<()> for Help<'a> { ]) .areas(area); - self.header.render::(frame, header_area, ()); - self.content.render::(frame, content_area, ()); - self.footer.render::(frame, footer_area, ()); + as Render>::render(&self.header, frame, header_area, ()); + as Render>::render(&self.content, frame, content_area, ()); + as Render>::render(&self.footer, frame, footer_area, ()); let page_size = content_area.height as usize; if page_size != self.props.page_size { diff --git a/src/ui.rs b/src/ui.rs index ab056a8e..64d0b238 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -20,7 +20,7 @@ use super::store::State; use super::task::Interrupted; use super::terminal; use super::terminal::TermionBackendExt; -use super::ui::widget::{Render, Widget}; +use super::ui::widget::{Render, View}; type Backend = TermionBackendExt>; @@ -45,7 +45,7 @@ impl Frontend { ) -> anyhow::Result> where S: State, - W: Widget + Render<()>, + W: View + Render, P: Clone + Send + Sync + Debug, { let mut ticker = tokio::time::interval(RENDERING_TICK_RATE); @@ -79,7 +79,7 @@ impl Frontend { break Ok(interrupted); } } - terminal.draw(|frame| root.render::(frame, frame.size(), ()))?; + terminal.draw(|frame| root.render(frame, frame.size(), ()))?; }; terminal::restore(&mut terminal)?; diff --git a/src/ui/widget.rs b/src/ui/widget.rs index f0fcb0b1..eb48801b 100644 --- a/src/ui/widget.rs +++ b/src/ui/widget.rs @@ -17,7 +17,7 @@ use self::container::Header; use super::theme::style; use super::{layout, span}; -pub trait Widget { +pub trait View { fn new(state: &S, action_tx: UnboundedSender) -> Self where Self: Sized; @@ -29,10 +29,12 @@ pub trait Widget { fn handle_key_event(&mut self, key: Key); } -pub trait Render

{ - fn render(&self, frame: &mut Frame, area: Rect, props: P); +pub trait Render { + fn render(&self, frame: &mut Frame, area: Rect, props: P); } +pub trait Widget: View + Render {} + pub trait ToRow { fn to_row(&self) -> Vec; } @@ -75,11 +77,8 @@ impl Shortcuts { } } -impl Widget<(), A> for Shortcuts { - fn new(state: &(), action_tx: UnboundedSender) -> Self - where - Self: Sized, - { +impl View for Shortcuts { + fn new(state: &S, action_tx: UnboundedSender) -> Self { Self { action_tx: action_tx.clone(), props: ShortcutsProps::default(), @@ -87,18 +86,15 @@ impl Widget<(), A> for Shortcuts { .move_with_state(state) } - fn move_with_state(self, _state: &()) -> Self - where - Self: Sized, - { + fn move_with_state(self, _state: &S) -> Self { Self { ..self } } fn handle_key_event(&mut self, _key: termion::event::Key) {} } -impl Render<()> for Shortcuts { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl Render for Shortcuts { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { use ratatui::widgets::Table; let mut shortcuts = self.props.shortcuts.iter().peekable(); @@ -137,6 +133,8 @@ impl Render<()> for Shortcuts { } } +impl Widget for Shortcuts {} + #[derive(Clone, Debug)] pub struct Column<'a> { pub text: Text<'a>, @@ -299,14 +297,11 @@ impl<'a, A, R: ToRow> Table<'a, A, R> { } } -impl<'a, A, R> Widget<(), A> for Table<'a, A, R> +impl<'a, S, A, R> View for Table<'a, A, R> where R: ToRow, { - fn new(state: &(), action_tx: UnboundedSender) -> Self - where - Self: Sized, - { + fn new(state: &S, action_tx: UnboundedSender) -> Self { Self { action_tx: action_tx.clone(), props: TableProps::default(), @@ -316,12 +311,8 @@ where .move_with_state(state) } - fn move_with_state(self, _state: &()) -> Self - where - Self: Sized, - { - let mut me = Self { ..self }; - + fn move_with_state(self, _state: &S) -> Self { + let mut me = self; if let Some(selected) = me.selected() { if selected > me.props.items.len() { me.begin(); @@ -356,11 +347,12 @@ where } } -impl<'a, A, R> Render<()> for Table<'a, A, R> +impl<'a, A, B, R> Render for Table<'a, A, R> where + B: Backend, R: ToRow + Debug, { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let header_height = if self.header.is_some() { 3 } else { 0 }; let [header_area, table_area] = Layout::vertical([Constraint::Length(header_height), Constraint::Min(1)]).areas(area); @@ -422,7 +414,7 @@ where .highlight_style(style::highlight()); if let Some(header) = &self.header { - header.render::(frame, header_area, ()); + as Render>::render(header, frame, header_area, ()); } frame.render_stateful_widget(rows, table_area, &mut self.state.clone()); } else { @@ -432,7 +424,7 @@ where .borders(borders); if let Some(header) = &self.header { - header.render::(frame, header_area, ()); + as Render>::render(header, frame, header_area, ()); } frame.render_widget(block, table_area); @@ -446,3 +438,10 @@ where } } } + +impl<'a, S, A, B, R> Widget for Table<'a, A, R> +where + B: Backend, + R: ToRow + Debug, +{ +} diff --git a/src/ui/widget/container.rs b/src/ui/widget/container.rs index 4d8b11b9..2960e02f 100644 --- a/src/ui/widget/container.rs +++ b/src/ui/widget/container.rs @@ -10,7 +10,7 @@ use ratatui::widgets::{BorderType, Borders, Row}; use crate::ui::ext::{FooterBlock, FooterBlockType, HeaderBlock}; use crate::ui::theme::style; -use super::{Column, Render, Widget}; +use super::{Column, Render, View}; #[derive(Debug)] pub struct HeaderProps<'a> { @@ -56,11 +56,8 @@ impl<'a, A> Header<'a, A> { } } -impl<'a, A> Widget<(), A> for Header<'a, A> { - fn new(state: &(), action_tx: UnboundedSender) -> Self - where - Self: Sized, - { +impl<'a, A> View<(), A> for Header<'a, A> { + fn new(state: &(), action_tx: UnboundedSender) -> Self { Self { action_tx: action_tx.clone(), props: HeaderProps::default(), @@ -68,18 +65,15 @@ impl<'a, A> Widget<(), A> for Header<'a, A> { .move_with_state(state) } - fn move_with_state(self, _state: &()) -> Self - where - Self: Sized, - { + fn move_with_state(self, _state: &()) -> Self { Self { ..self } } fn handle_key_event(&mut self, _key: Key) {} } -impl<'a, A> Render<()> for Header<'a, A> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, A, B: Backend> Render for Header<'a, A> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let widths: Vec = self .props .columns @@ -182,11 +176,8 @@ impl<'a, A> Footer<'a, A> { } } -impl<'a, A> Widget<(), A> for Footer<'a, A> { - fn new(_state: &(), action_tx: UnboundedSender) -> Self - where - Self: Sized, - { +impl<'a, A> View<(), A> for Footer<'a, A> { + fn new(_state: &(), action_tx: UnboundedSender) -> Self { Self { action_tx: action_tx.clone(), props: FooterProps::default(), @@ -194,10 +185,7 @@ impl<'a, A> Widget<(), A> for Footer<'a, A> { .move_with_state(&()) } - fn move_with_state(self, _state: &()) -> Self - where - Self: Sized, - { + fn move_with_state(self, _state: &()) -> Self { Self { ..self } } @@ -228,8 +216,8 @@ impl<'a, A> Footer<'a, A> { } } -impl<'a, A> Render<()> for Footer<'a, A> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, A, B: Backend> Render for Footer<'a, A> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let widths = self .props .columns diff --git a/src/ui/widget/input.rs b/src/ui/widget/input.rs index 3c3ff91b..8e843b2a 100644 --- a/src/ui/widget/input.rs +++ b/src/ui/widget/input.rs @@ -7,7 +7,7 @@ use ratatui::prelude::{Backend, Rect}; use ratatui::style::Stylize; use ratatui::text::{Line, Span}; -use super::{Render, Widget}; +use super::{Render, View}; pub struct TextFieldProps { title: String, @@ -101,7 +101,7 @@ impl TextField { } } -impl Widget for TextField { +impl View for TextField { fn new(state: &S, action_tx: UnboundedSender) -> Self { Self { action_tx, @@ -110,11 +110,8 @@ impl Widget for TextField { .move_with_state(state) } - fn move_with_state(self, _state: &S) -> Self - where - Self: Sized, - { - Self { ..self } + fn move_with_state(self, _state: &S) -> Self { + self } fn handle_key_event(&mut self, key: Key) { @@ -140,8 +137,8 @@ impl Widget for TextField { } } -impl Render<()> for TextField { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl Render for TextField { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let layout = Layout::vertical(Constraint::from_lengths([1, 1])).split(area); let input = self.props.text.as_str(); diff --git a/src/ui/widget/text.rs b/src/ui/widget/text.rs index d277cb1e..d0994866 100644 --- a/src/ui/widget/text.rs +++ b/src/ui/widget/text.rs @@ -9,7 +9,7 @@ use ratatui::widgets::{Block, BorderType, Borders}; use crate::ui::theme::style; -use super::{Render, Widget}; +use super::{Render, View}; pub struct ParagraphProps<'a> { pub content: Text<'a>, @@ -116,7 +116,7 @@ impl<'a, A> Paragraph<'a, A> { } } -impl<'a, S, A> Widget for Paragraph<'a, A> { +impl<'a, S, A> View for Paragraph<'a, A> { fn new(state: &S, action_tx: UnboundedSender) -> Self where Self: Sized, @@ -165,8 +165,8 @@ impl<'a, S, A> Widget for Paragraph<'a, A> { } } -impl<'a, A> Render<()> for Paragraph<'a, A> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { +impl<'a, A, B: Backend> Render for Paragraph<'a, A> { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: ()) { let block = Block::default() .borders(Borders::LEFT | Borders::RIGHT) .border_type(BorderType::Rounded) @@ -176,8 +176,8 @@ impl<'a, A> Render<()> for Paragraph<'a, A> { let [content_area] = Layout::horizontal([Constraint::Min(1)]) .horizontal_margin(2) .areas(area); - let content = - ratatui::widgets::Paragraph::new(self.props.content.clone()).scroll((self.offset as u16, 0)); + let content = ratatui::widgets::Paragraph::new(self.props.content.clone()) + .scroll((self.offset as u16, 0)); frame.render_widget(content, content_area); }