radicle/radicle-tui
1
0
Fork 0
mirror of https://seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git synced 2026-11-12 14:40:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

inbox: Use render properties /w focus

Browse Source
This commit is contained in:
Erik Kundt
2024-05-10 12:37:56 +02:00
parent f965993b35
commit cf388c8cf1
1 changed files with 37 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/commands/issue/select/ui.rs
+37 -51
View File
@@ -1,4 +1,3 @@
use std::any::Any;
use std::collections::HashMap;
use std::str::FromStr;
use std::vec;
@@ -22,7 +21,7 @@ use tui::ui::widget::container::{
};
use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState};
use tui::ui::widget::text::{Paragraph, ParagraphProps, ParagraphState};
use tui::ui::widget::{self, BaseView, WidgetState};
use tui::ui::widget::{self, BaseView, RenderProps, WidgetState};
use tui::ui::widget::{
Column, Properties, Shortcuts, ShortcutsProps, Table, TableProps, TableUtils, Widget,
};
@@ -45,7 +44,6 @@ struct BrowsePageProps<'a> {
columns: Vec<Column<'a>>,
cutoff: usize,
cutoff_after: usize,
focus: bool,
page_size: usize,
show_search: bool,
shortcuts: Vec<(&'a str, &'a str)>,
@@ -99,7 +97,6 @@ impl<'a> From<&State> for BrowsePageProps<'a> {
.to_vec(),
cutoff: 200,
cutoff_after: 5,
focus: false,
stats,
page_size: state.browser.page_size,
show_search: state.browser.show_search,
@@ -151,7 +148,6 @@ impl<'a: 'static> Widget for BrowsePage<'a> {
Header::new(state, action_tx.clone())
.columns(props.columns.clone())
.cutoff(props.cutoff, props.cutoff_after)
.focus(props.focus)
.to_boxed(),
)
.content(Box::<Table<State, Action, IssueItem, 8>>::new(
@@ -188,9 +184,20 @@ impl<'a: 'static> Widget for BrowsePage<'a> {
})
.to_boxed(),
)
.on_update(|state| {
ContainerProps::default()
.hide_footer(BrowsePageProps::from(state).show_search)
.to_boxed()
})
.to_boxed(),
search: Search::new(state, action_tx.clone()).to_boxed(),
shortcuts: Shortcuts::new(state, action_tx.clone()).to_boxed(),
shortcuts: Shortcuts::new(state, action_tx.clone())
.on_update(|state| {
ShortcutsProps::default()
.shortcuts(&BrowsePageProps::from(state).shortcuts)
.to_boxed()
})
.to_boxed(),
}
}
@@ -263,41 +270,28 @@ impl<'a: 'static> Widget for BrowsePage<'a> {
self.shortcuts.update(state);
}
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: Option<&dyn Any>) {
let props = props
.and_then(|props| props.downcast_ref::<BrowsePageProps>())
.unwrap_or(&self.props);
fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: Option<RenderProps>) {
let page_size = area.height.saturating_sub(6) as usize;
let [content_area, shortcuts_area] =
Layout::vertical([Constraint::Min(1), Constraint::Length(1)]).areas(area);
if props.show_search {
if self.props.show_search {
let [table_area, search_area] =
Layout::vertical([Constraint::Min(1), Constraint::Length(2)]).areas(content_area);
self.issues.render(
frame,
table_area,
Some(&ContainerProps::default().hide_footer(props.show_search)),
);
self.search.render(frame, search_area, None);
self.issues
.render(frame, table_area, Some(RenderProps::default()));
self.search
.render(frame, search_area, Some(RenderProps::focused()));
} else {
self.issues.render(
frame,
content_area,
Some(&ContainerProps::default().hide_footer(props.show_search)),
);
self.issues
.render(frame, content_area, Some(RenderProps::focused()));
}
self.shortcuts.render(
frame,
shortcuts_area,
Some(&ShortcutsProps::default().shortcuts(&props.shortcuts)),
);
self.shortcuts.render(frame, shortcuts_area, None);
if page_size != props.page_size {
if page_size != self.props.page_size {
let _ = self.base.action_tx.send(Action::BrowserPageSize(page_size));
}
}
@@ -375,7 +369,7 @@ impl Widget for Search {
self.input.update(state);
}
fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: Option<&dyn Any>) {
fn render(&self, frame: &mut ratatui::Frame, area: Rect, _props: Option<RenderProps>) {
let layout = Layout::horizontal(Constraint::from_mins([0]))
.horizontal_margin(1)
.split(area);
@@ -390,7 +384,6 @@ impl Widget for Search {
#[derive(Clone)]
struct HelpPageProps<'a> {
focus: bool,
page_size: usize,
help_progress: usize,
shortcuts: Vec<(&'a str, &'a str)>,
@@ -399,7 +392,6 @@ struct HelpPageProps<'a> {
impl<'a> From<&State> for HelpPageProps<'a> {
fn from(state: &State) -> Self {
Self {
focus: false,
page_size: state.help.page_size,
help_progress: state.help.progress,
shortcuts: vec![("?", "close")],
@@ -438,12 +430,9 @@ impl<'a: 'static> Widget for HelpPage<'a> {
content: Container::new(state, action_tx.clone())
.header(
Header::new(state, action_tx.clone())
.on_update(|state| {
let props = HelpPageProps::from(state);
.on_update(|_| {
HeaderProps::default()
.columns([Column::new(" Help ", Constraint::Fill(1))].to_vec())
.focus(props.focus)
.to_boxed()
})
.to_boxed(),
@@ -456,7 +445,6 @@ impl<'a: 'static> Widget for HelpPage<'a> {
ParagraphProps::default()
.text(&help_text())
.page_size(props.page_size)
.focus(props.focus)
.to_boxed()
})
.on_event(|paragraph, action_tx| {
@@ -487,13 +475,18 @@ impl<'a: 'static> Widget for HelpPage<'a> {
]
.to_vec(),
)
.focus(props.focus)
.to_boxed()
})
.to_boxed(),
)
.to_boxed(),
shortcuts: Shortcuts::new(state, action_tx.clone()).to_boxed(),
shortcuts: Shortcuts::new(state, action_tx.clone())
.on_update(|state| {
ShortcutsProps::default()
.shortcuts(&HelpPageProps::from(state).shortcuts)
.to_boxed()
})
.to_boxed(),
}
}
@@ -516,26 +509,19 @@ impl<'a: 'static> Widget for HelpPage<'a> {
.unwrap_or(HelpPageProps::from(state));
self.content.update(state);
self.shortcuts.update(state);
}
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: Option<&dyn Any>) {
let props = props
.and_then(|props| props.downcast_ref::<HelpPageProps>())
.unwrap_or(&self.props);
fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: Option<RenderProps>) {
let page_size = area.height.saturating_sub(6) as usize;
let [content_area, shortcuts_area] =
Layout::vertical([Constraint::Min(1), Constraint::Length(1)]).areas(area);
self.content.render(frame, content_area, None);
self.shortcuts.render(
frame,
shortcuts_area,
Some(&ShortcutsProps::default().shortcuts(&props.shortcuts)),
);
self.content.render(frame, content_area, props);
self.shortcuts.render(frame, shortcuts_area, None);
if page_size != props.page_size {
if page_size != self.props.page_size {
let _ = self.base.action_tx.send(Action::HelpPageSize(page_size));
}
}