From 1f1b524ced930a96854358af306265bfec909bb4 Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Wed, 17 Apr 2024 11:10:37 +0200 Subject: [PATCH] lib: Render w/ properties override --- src/ui/widget.rs | 37 ++++++++++++++++++++----------------- src/ui/widget/container.rs | 35 ++++++++++++++++++----------------- src/ui/widget/input.rs | 18 +++++++++++------- src/ui/widget/text.rs | 10 +++++++--- 4 files changed, 56 insertions(+), 44 deletions(-) diff --git a/src/ui/widget.rs b/src/ui/widget.rs index af19da8b..e328fac1 100644 --- a/src/ui/widget.rs +++ b/src/ui/widget.rs @@ -148,18 +148,21 @@ impl View for Shortcuts { } impl Widget for Shortcuts { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: &dyn Any) { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) { use ratatui::widgets::Table; - let mut shortcuts = self.props.shortcuts.iter().peekable(); + let props = props + .downcast_ref::() + .unwrap_or(&self.props); + + let mut shortcuts = props.shortcuts.iter().peekable(); let mut row = vec![]; while let Some(shortcut) = shortcuts.next() { let short = Text::from(shortcut.0.clone()).style(style::gray()); let long = Text::from(shortcut.1.clone()).style(style::gray().dim()); let spacer = Text::from(String::new()); - let divider = - Text::from(format!(" {} ", self.props.divider)).style(style::gray().dim()); + let divider = Text::from(format!(" {} ", props.divider)).style(style::gray().dim()); row.push((shortcut.0.chars().count(), short)); row.push((1, spacer)); @@ -454,7 +457,11 @@ where B: Backend, R: ToRow + Clone + Debug + 'static, { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: &dyn Any) { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) { + let props = props + .downcast_ref::>() + .unwrap_or(&self.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); @@ -465,30 +472,26 @@ where .filter_map(|c| if !c.skip { Some(c.width) } else { None }) .collect(); - let widths = if area.width < self.props.cutoff as u16 { - widths - .iter() - .take(self.props.cutoff_after) - .collect::>() + let widths = if area.width < props.cutoff as u16 { + widths.iter().take(props.cutoff_after).collect::>() } else { widths.iter().collect::>() }; - let borders = match (self.header.is_some(), self.props.has_footer) { + let borders = match (self.header.is_some(), props.has_footer) { (false, false) => Borders::ALL, (true, false) => Borders::BOTTOM | Borders::LEFT | Borders::RIGHT, (false, true) => Borders::TOP | Borders::LEFT | Borders::RIGHT, (true, true) => Borders::LEFT | Borders::RIGHT, }; - if !self.props.items.is_empty() { - let rows = self - .props + if !props.items.is_empty() { + let rows = props .items .iter() .map(|item| { let mut cells = vec![]; - let mut it = self.props.columns.iter(); + let mut it = props.columns.iter(); for cell in item.to_row() { if let Some(col) = it.next() { @@ -509,7 +512,7 @@ where .column_spacing(1) .block( Block::default() - .border_style(style::border(self.props.focus)) + .border_style(style::border(props.focus)) .border_type(BorderType::Rounded) .borders(borders), ) @@ -522,7 +525,7 @@ where frame.render_stateful_widget(rows, table_area, &mut self.state.clone()); } else { let block = Block::default() - .border_style(style::border(self.props.focus)) + .border_style(style::border(props.focus)) .border_type(BorderType::Rounded) .borders(borders); diff --git a/src/ui/widget/container.rs b/src/ui/widget/container.rs index 928acfd0..14cf54a1 100644 --- a/src/ui/widget/container.rs +++ b/src/ui/widget/container.rs @@ -115,9 +115,12 @@ impl<'a: 'static, S, A> View for Header<'a, S, A> { } impl<'a: 'static, S, A, B: Backend> Widget for Header<'a, S, A> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: &dyn Any) { - let widths: Vec = self - .props + fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) { + let props = props + .downcast_ref::>() + .unwrap_or(&self.props); + + let widths: Vec = props .columns .iter() .filter_map(|column| { @@ -128,8 +131,7 @@ impl<'a: 'static, S, A, B: Backend> Widget for Header<'a, S, A> { } }) .collect(); - let cells = self - .props + let cells = props .columns .iter() .filter_map(|column| { @@ -141,11 +143,8 @@ impl<'a: 'static, S, A, B: Backend> Widget for Header<'a, S, A> { }) .collect::>(); - let widths = if area.width < self.props.cutoff as u16 { - widths - .iter() - .take(self.props.cutoff_after) - .collect::>() + let widths = if area.width < props.cutoff as u16 { + widths.iter().take(props.cutoff_after).collect::>() } else { widths.iter().collect::>() }; @@ -153,7 +152,7 @@ impl<'a: 'static, S, A, B: Backend> Widget for Header<'a, S, A> { // Render header let block = HeaderBlock::default() .borders(Borders::ALL) - .border_style(style::border(self.props.focus)) + .border_style(style::border(props.focus)) .border_type(BorderType::Rounded); let header_layout = Layout::default() @@ -300,9 +299,12 @@ impl<'a, S, A> Footer<'a, S, A> { } impl<'a: 'static, S, A, B: Backend> Widget for Footer<'a, S, A> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: &dyn Any) { - let widths = self - .props + fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) { + let props = props + .downcast_ref::>() + .unwrap_or(&self.props); + + let widths = props .columns .iter() .map(|c| match c.width { @@ -312,8 +314,7 @@ impl<'a: 'static, S, A, B: Backend> Widget for Footer<'a, S, A> { .collect::>(); let layout = Layout::horizontal(widths).split(area); - let cells = self - .props + let cells = props .columns .iter() .map(|c| c.text.clone()) @@ -330,7 +331,7 @@ impl<'a: 'static, S, A, B: Backend> Widget for Footer<'a, S, A> { _ if i == last => FooterBlockType::End, _ => FooterBlockType::Repeat, }; - self.render_cell(frame, *area, block_type, cell.clone(), self.props.focus); + self.render_cell(frame, *area, block_type, cell.clone(), props.focus); } } } diff --git a/src/ui/widget/input.rs b/src/ui/widget/input.rs index 83598aca..9de1475c 100644 --- a/src/ui/widget/input.rs +++ b/src/ui/widget/input.rs @@ -184,15 +184,19 @@ impl View for TextField { } impl Widget for TextField { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: &dyn Any) { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) { + let props = props + .downcast_ref::() + .unwrap_or(&self.props); + let layout = Layout::vertical(Constraint::from_lengths([1, 1])).split(area); - let input = self.props.text.as_str(); - let label = format!(" {} ", self.props.title); + let input = props.text.as_str(); + let label = format!(" {} ", props.title); let overline = String::from("▔").repeat(area.width as usize); - let cursor_pos = self.props.cursor_position as u16; + let cursor_pos = props.cursor_position as u16; - if self.props.inline_label { + if props.inline_label { let top_layout = Layout::horizontal([ Constraint::Length(label.chars().count() as u16), Constraint::Length(1), @@ -209,7 +213,7 @@ impl Widget for TextField { frame.render_widget(input, top_layout[2]); frame.render_widget(overline, layout[1]); - if self.props.show_cursor { + if props.show_cursor { frame.set_cursor(top_layout[2].x + cursor_pos, top_layout[2].y) } } else { @@ -225,7 +229,7 @@ impl Widget for TextField { frame.render_widget(top, layout[0]); frame.render_widget(bottom, layout[1]); - if self.props.show_cursor { + if props.show_cursor { frame.set_cursor(area.x + cursor_pos, area.y) } } diff --git a/src/ui/widget/text.rs b/src/ui/widget/text.rs index d3423249..80f2a9cc 100644 --- a/src/ui/widget/text.rs +++ b/src/ui/widget/text.rs @@ -206,17 +206,21 @@ impl<'a: 'static, S, A> View for Paragraph<'a, S, A> { } impl<'a: 'static, S, A, B: Backend> Widget for Paragraph<'a, S, A> { - fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: &dyn Any) { + fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: &dyn Any) { + let props = props + .downcast_ref::>() + .unwrap_or(&self.props); + let block = Block::default() .borders(Borders::LEFT | Borders::RIGHT) .border_type(BorderType::Rounded) - .border_style(style::border(self.props.focus)); + .border_style(style::border(props.focus)); frame.render_widget(block, area); let [content_area] = Layout::horizontal([Constraint::Min(1)]) .horizontal_margin(2) .areas(area); - let content = ratatui::widgets::Paragraph::new(self.props.content.clone()) + let content = ratatui::widgets::Paragraph::new(props.content.clone()) .scroll((self.offset as u16, 0)); frame.render_widget(content, content_area);