0a0d43a issue: Use base view — radicle-tui

Radicle terminal user interface

issue: Use base view

Erik Kundt committed 2 years ago

commit 0a0d43a5bb972f632326505ffe9aba6f0f516671
parent 089572aebf819d5e86890d3fd31e7095238d35ad

1 file changed +61 -62

modified bin/commands/issue/select/ui.rs

@@ -18,12 +18,12 @@ use radicle_tui as tui;

 use tui::ui::items::{IssueItem, IssueItemFilter};
 use tui::ui::span;
 use tui::ui::widget;
 use tui::ui::widget::container::{
     Container, ContainerProps, Footer, FooterProps, Header, HeaderProps,
 };
 use tui::ui::widget::input::{TextField, TextFieldProps, TextFieldState};
 use tui::ui::widget::text::{Paragraph, ParagraphProps, ParagraphState};
 use tui::ui::widget::{self, BaseView};
 use tui::ui::widget::{
     Column, EventCallback, Properties, Shortcuts, ShortcutsProps, Table, TableProps, TableUtils,
     UpdateCallback, View, Widget,

@@ -122,14 +122,8 @@ impl<'a> From<&State> for BrowsePageProps<'a> {

 impl<'a> Properties for BrowsePageProps<'a> {}
 pub struct BrowsePage<'a, B> {
     /// Internal properties
     props: BrowsePageProps<'a>,
     /// Message sender
     action_tx: UnboundedSender<Action>,
     /// Custom update handler
     on_update: Option<UpdateCallback<State>>,
     /// Additional custom event handler
     on_event: Option<EventCallback<Action>>,
     /// Internal base
     base: BaseView<State, Action, BrowsePageProps<'a>>,
     /// Patches widget
     issues: BoxedWidget<B>,
     /// Search widget

@@ -146,8 +140,12 @@ where

         let props = BrowsePageProps::from(state);
         Self {
             action_tx: action_tx.clone(),
             props: props.clone(),
             base: BaseView {
                 action_tx: action_tx.clone(),
                 props: BrowsePageProps::from(state),
                 on_update: None,
                 on_event: None,
             },
             issues: Container::new(state, action_tx.clone())
                 .header(
                     Header::new(state, action_tx.clone())

@@ -193,23 +191,21 @@ where

                 .to_boxed(),
             search: Search::new(state, action_tx.clone()).to_boxed(),
             shortcuts: Shortcuts::new(state, action_tx.clone()).to_boxed(),
             on_update: None,
             on_event: None,
         }
     }
     fn on_update(mut self, callback: UpdateCallback<State>) -> Self {
         self.on_update = Some(callback);
         self.base.on_update = Some(callback);
         self
     }
     fn on_event(mut self, callback: EventCallback<Action>) -> Self {
         self.on_event = Some(callback);
         self.base.on_event = Some(callback);
         self
     }
     fn update(&mut self, state: &State) {
         self.props = BrowsePageProps::from_callback(self.on_update, state)
         self.base.props = BrowsePageProps::from_callback(self.base.on_update, state)
             .unwrap_or(BrowsePageProps::from(state));
         self.issues.update(state);

@@ -218,30 +214,32 @@ where

     }
     fn handle_key_event(&mut self, key: Key) {
         if self.props.show_search {
         if self.base.props.show_search {
             self.search.handle_key_event(key);
         } else {
             match key {
                 Key::Esc | Key::Ctrl('c') => {
                     let _ = self.action_tx.send(Action::Exit { selection: None });
                     let _ = self.base.action_tx.send(Action::Exit { selection: None });
                 }
                 Key::Char('?') => {
                     let _ = self.action_tx.send(Action::OpenHelp);
                     let _ = self.base.action_tx.send(Action::OpenHelp);
                 }
                 Key::Char('/') => {
                     let _ = self.action_tx.send(Action::OpenSearch);
                     let _ = self.base.action_tx.send(Action::OpenSearch);
                 }
                 Key::Char('\n') => {
                     let operation = match self.props.mode {
                     let operation = match self.base.props.mode {
                         Mode::Operation => Some(IssueOperation::Show.to_string()),
                         Mode::Id => None,
                     };
                     self.props
                     self.base
                         .props
                         .selected
                         .and_then(|selected| self.props.issues.get(selected))
                         .and_then(|selected| self.base.props.issues.get(selected))
                         .and_then(|issue| {
                             self.action_tx
                             self.base
                                 .action_tx
                                 .send(Action::Exit {
                                     selection: Some(Selection {
                                         operation,

@@ -253,11 +251,13 @@ where

                         });
                 }
                 Key::Char('e') => {
                     self.props
                     self.base
                         .props
                         .selected
                         .and_then(|selected| self.props.issues.get(selected))
                         .and_then(|selected| self.base.props.issues.get(selected))
                         .and_then(|issue| {
                             self.action_tx
                             self.base
                                 .action_tx
                                 .send(Action::Exit {
                                     selection: Some(Selection {
                                         operation: Some(IssueOperation::Edit.to_string()),

@@ -280,7 +280,7 @@ impl<'a, B: Backend> BrowsePage<'a, B> {

     fn build_footer(props: &BrowsePageProps<'a>, selected: Option<usize>) -> Vec<Column<'a>> {
         let search = Line::from(vec![
             span::default(" Search ").cyan().dim().reversed(),
             span::default(" ".into()),
             span::default(" "),
             span::default(&props.search).gray().dim(),
         ]);

@@ -360,7 +360,7 @@ where

     fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: Option<Box<dyn Any>>) {
         let props = props
             .and_then(BrowsePageProps::from_boxed_any)
             .unwrap_or(self.props.clone());
             .unwrap_or(self.base.props.clone());
         let page_size = area.height.saturating_sub(6) as usize;

@@ -404,18 +404,18 @@ where

         );
         if page_size != props.page_size {
             let _ = self.action_tx.send(Action::BrowserPageSize(page_size));
             let _ = self.base.action_tx.send(Action::BrowserPageSize(page_size));
         }
     }
 }
 pub struct SearchProps {}
 impl Properties for SearchProps {}
 pub struct Search<B: Backend> {
     /// Message sender
     action_tx: UnboundedSender<Action>,
     /// Custom update handler
     on_update: Option<UpdateCallback<State>>,
     /// Additional custom event handler
     on_event: Option<EventCallback<Action>>,
     /// Internal base
     base: BaseView<State, Action, SearchProps>,
     /// Search input field
     input: BoxedWidget<B>,
 }

@@ -444,20 +444,23 @@ impl<B: Backend> View<State, Action> for Search<B> {

             })
             .to_boxed();
         Self {
             action_tx,
             base: BaseView {
                 action_tx: action_tx.clone(),
                 props: SearchProps {},
                 on_update: None,
                 on_event: None,
             },
             input,
             on_update: None,
             on_event: None,
         }
     }
     fn on_update(mut self, callback: UpdateCallback<State>) -> Self {
         self.on_update = Some(callback);
         self.base.on_update = Some(callback);
         self
     }
     fn on_event(mut self, callback: EventCallback<Action>) -> Self {
         self.on_event = Some(callback);
         self.base.on_event = Some(callback);
         self
     }

@@ -468,10 +471,10 @@ impl<B: Backend> View<State, Action> for Search<B> {

     fn handle_key_event(&mut self, key: termion::event::Key) {
         match key {
             Key::Esc => {
                 let _ = self.action_tx.send(Action::CloseSearch);
                 let _ = self.base.action_tx.send(Action::CloseSearch);
             }
             Key::Char('\n') => {
                 let _ = self.action_tx.send(Action::ApplySearch);
                 let _ = self.base.action_tx.send(Action::ApplySearch);
             }
             _ => {
                 self.input.handle_key_event(key);

@@ -518,14 +521,8 @@ pub struct HelpPage<'a, B>

 where
     B: Backend,
 {
     /// Internal properties
     props: HelpPageProps<'a>,
     /// Message sender
     action_tx: UnboundedSender<Action>,
     /// Custom update handler
     on_update: Option<UpdateCallback<State>>,
     /// Additional custom event handler
     on_event: Option<EventCallback<Action>>,
     /// Internal base
     base: BaseView<State, Action, HelpPageProps<'a>>,
     /// Content widget
     content: BoxedWidget<B>,
     /// Shortcut widget

@@ -541,8 +538,12 @@ where

         Self: Sized,
     {
         Self {
             action_tx: action_tx.clone(),
             props: HelpPageProps::from(state),
             base: BaseView {
                 action_tx: action_tx.clone(),
                 props: HelpPageProps::from(state),
                 on_update: None,
                 on_event: None,
             },
             content: Container::new(state, action_tx.clone())
                 .header(
                     Header::new(state, action_tx.clone())

@@ -602,23 +603,21 @@ where

                 )
                 .to_boxed(),
             shortcuts: Shortcuts::new(state, action_tx.clone()).to_boxed(),
             on_update: None,
             on_event: None,
         }
     }
     fn on_update(mut self, callback: UpdateCallback<State>) -> Self {
         self.on_update = Some(callback);
         self.base.on_update = Some(callback);
         self
     }
     fn on_event(mut self, callback: EventCallback<Action>) -> Self {
         self.on_event = Some(callback);
         self.base.on_event = Some(callback);
         self
     }
     fn update(&mut self, state: &State) {
         self.props = HelpPageProps::from_callback(self.on_update, state)
         self.base.props = HelpPageProps::from_callback(self.base.on_update, state)
             .unwrap_or(HelpPageProps::from(state));
         self.content.update(state);

@@ -627,10 +626,10 @@ where

     fn handle_key_event(&mut self, key: termion::event::Key) {
         match key {
             Key::Esc | Key::Ctrl('c') => {
                 let _ = self.action_tx.send(Action::Exit { selection: None });
                 let _ = self.base.action_tx.send(Action::Exit { selection: None });
             }
             Key::Char('?') => {
                 let _ = self.action_tx.send(Action::LeavePage);
                 let _ = self.base.action_tx.send(Action::LeavePage);
             }
             _ => {
                 self.content.handle_key_event(key);

@@ -646,7 +645,7 @@ where

     fn render(&self, frame: &mut ratatui::Frame, area: Rect, props: Option<Box<dyn Any>>) {
         let props = props
             .and_then(HelpPageProps::from_boxed_any)
             .unwrap_or(self.props.clone());
             .unwrap_or(self.base.props.clone());
         let page_size = area.height.saturating_sub(6) as usize;

@@ -665,7 +664,7 @@ where

         );
         if page_size != props.page_size {
             let _ = self.action_tx.send(Action::HelpPageSize(page_size));
             let _ = self.base.action_tx.send(Action::HelpPageSize(page_size));
         }
     }
 }