From 652720da7687f97027bf7f2eb4fe15df89542d5f Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Tue, 6 Feb 2024 10:10:00 +0100 Subject: [PATCH] lib: Introduce custom list & table state conversions --- bin/commands/issue/select/event.rs | 15 ++++---- bin/commands/issue/select/page.rs | 18 ++++++---- bin/commands/issue/suite/event.rs | 57 ++++++++++++++---------------- bin/commands/issue/suite/page.rs | 16 ++++++--- bin/commands/patch/select/event.rs | 15 ++++---- bin/commands/patch/select/page.rs | 18 ++++++---- bin/commands/patch/suite/event.rs | 17 +++++---- bin/commands/patch/suite/page.rs | 17 +++++---- src/ui/state.rs | 34 +++++++++++++++++- src/ui/widget/list.rs | 12 +++---- 10 files changed, 136 insertions(+), 83 deletions(-) diff --git a/bin/commands/issue/select/event.rs b/bin/commands/issue/select/event.rs index 55936af0..7db143e1 100644 --- a/bin/commands/issue/select/event.rs +++ b/bin/commands/issue/select/event.rs @@ -1,8 +1,9 @@ use radicle::issue::IssueId; +use tui::ui::state::ItemState; use tui::SelectionExit; use tuirealm::command::{Cmd, CmdResult, Direction as MoveDirection}; use tuirealm::event::{Event, Key, KeyEvent}; -use tuirealm::{MockComponent, NoUserEvent, State, StateValue}; +use tuirealm::{MockComponent, NoUserEvent}; use radicle_tui as tui; @@ -35,9 +36,9 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { let mut submit = || -> Option { - let result = self.perform(Cmd::Submit); - match result { - CmdResult::Submit(State::One(StateValue::Usize(selected))) => { + match self.perform(Cmd::Submit) { + CmdResult::Submit(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; let item = self.items().get(selected)?; Some(item.id().to_owned()) } @@ -78,9 +79,9 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { let mut submit = || -> Option { - let result = self.perform(Cmd::Submit); - match result { - CmdResult::Submit(State::One(StateValue::Usize(selected))) => { + match self.perform(Cmd::Submit) { + CmdResult::Submit(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; let item = self.items().get(selected)?; Some(item.id().to_owned()) } diff --git a/bin/commands/issue/select/page.rs b/bin/commands/issue/select/page.rs index d46ff3a7..7cca1332 100644 --- a/bin/commands/issue/select/page.rs +++ b/bin/commands/issue/select/page.rs @@ -2,7 +2,8 @@ use std::collections::HashMap; use anyhow::Result; -use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, State, StateValue, Sub, SubClause}; +use tui::ui::state::ItemState; +use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, Sub, SubClause}; use radicle_tui as tui; @@ -44,12 +45,17 @@ impl ListView { theme: &Theme, ) -> Result<()> { let state = app.state(&Cid::List(ListCid::PatchBrowser))?; - let progress = match state { - State::Tup2((StateValue::Usize(step), StateValue::Usize(total))) => { - Progress::Step(step.saturating_add(1), total) - } - _ => Progress::None, + let progress = match ItemState::try_from(state) { + Ok(state) => Progress::Step( + state + .selected() + .map(|s| s.saturating_add(1)) + .unwrap_or_default(), + state.len(), + ), + Err(_) => Progress::None, }; + let context = common::ui::browse_context(context, theme, self.filter.clone(), progress); app.remount(Cid::List(ListCid::Context), context.to_boxed(), vec![])?; diff --git a/bin/commands/issue/suite/event.rs b/bin/commands/issue/suite/event.rs index 774d85d3..e698dfcf 100644 --- a/bin/commands/issue/suite/event.rs +++ b/bin/commands/issue/suite/event.rs @@ -1,4 +1,5 @@ use radicle::cob::issue::IssueId; +use tui::ui::state::ItemState; use tuirealm::command::{Cmd, CmdResult, Direction as MoveDirection, Position}; use tuirealm::event::{Event, Key, KeyEvent, KeyModifiers}; use tuirealm::{MockComponent, NoUserEvent, State, StateValue}; @@ -51,45 +52,41 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { match event { - Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => match self.state() { - State::Tup2((StateValue::Usize(selected), StateValue::Usize(_))) => { - let item = self.items().get(selected)?; - Some(Message::Issue(IssueMessage::Leave(Some( - item.id().to_owned(), - )))) - } - _ => None, - }, + Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { + let selected = ItemState::try_from(self.state()).ok()?.selected()?; + let item = self.items().get(selected)?; + + Some(Message::Issue(IssueMessage::Leave(Some( + item.id().to_owned(), + )))) + } Event::Keyboard(KeyEvent { code: Key::Up, .. }) | Event::Keyboard(KeyEvent { code: Key::Char('k'), .. - }) => { - let result = self.perform(Cmd::Move(MoveDirection::Up)); - match result { - CmdResult::Changed(State::One(StateValue::Usize(selected))) => { - let item = self.items().get(selected)?; - Some(Message::Issue(IssueMessage::Changed(item.id().to_owned()))) - } - _ => None, + }) => match self.perform(Cmd::Move(MoveDirection::Up)) { + CmdResult::Changed(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; + let item = self.items().get(selected)?; + + Some(Message::Issue(IssueMessage::Changed(item.id().to_owned()))) } - } + _ => None, + }, Event::Keyboard(KeyEvent { code: Key::Down, .. }) | Event::Keyboard(KeyEvent { code: Key::Char('j'), .. - }) => { - let result = self.perform(Cmd::Move(MoveDirection::Down)); - match result { - CmdResult::Changed(State::One(StateValue::Usize(selected))) => { - let item = self.items().get(selected)?; - Some(Message::Issue(IssueMessage::Changed(item.id().to_owned()))) - } - _ => None, + }) => match self.perform(Cmd::Move(MoveDirection::Down)) { + CmdResult::Changed(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; + let item = self.items().get(selected)?; + Some(Message::Issue(IssueMessage::Changed(item.id().to_owned()))) } - } + _ => None, + }, Event::Keyboard(KeyEvent { code: Key::Enter, .. }) => Some(Message::Issue(IssueMessage::Focus(IssueCid::Details))), @@ -235,9 +232,9 @@ impl tuirealm::Component for Widget
{ impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { let mut submit = || -> Option { - let result = self.perform(Cmd::Submit); - match result { - CmdResult::Submit(State::One(StateValue::Usize(selected))) => { + match self.perform(Cmd::Submit) { + CmdResult::Submit(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; let item = self.items().get(selected)?; Some(item.id().to_owned()) } diff --git a/bin/commands/issue/suite/page.rs b/bin/commands/issue/suite/page.rs index 7e28b889..9ca78e47 100644 --- a/bin/commands/issue/suite/page.rs +++ b/bin/commands/issue/suite/page.rs @@ -4,6 +4,7 @@ use anyhow::Result; use radicle::cob::issue::{Issue, IssueId}; +use tui::ui::state::ItemState; use tuirealm::event::Key; use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, State, StateValue, Sub, SubClause}; @@ -80,13 +81,18 @@ impl ListPage { theme: &Theme, ) -> Result<()> { let state = app.state(&Cid::List(ListCid::IssueBrowser))?; - let progress = match state { - State::Tup2((StateValue::Usize(step), StateValue::Usize(total))) => { - Progress::Step(step.saturating_add(1), total) - } - _ => Progress::None, + let progress = match ItemState::try_from(state) { + Ok(state) => Progress::Step( + state + .selected() + .map(|s| s.saturating_add(1)) + .unwrap_or_default(), + state.len(), + ), + Err(_) => Progress::None, }; let context = ui::browse_context(context, theme, progress); + app.remount(Cid::List(ListCid::Context), context.to_boxed(), vec![])?; Ok(()) diff --git a/bin/commands/patch/select/event.rs b/bin/commands/patch/select/event.rs index f050127f..d29cfc75 100644 --- a/bin/commands/patch/select/event.rs +++ b/bin/commands/patch/select/event.rs @@ -1,8 +1,9 @@ use radicle::patch::PatchId; +use tui::ui::state::ItemState; use tui::SelectionExit; use tuirealm::command::{Cmd, CmdResult, Direction as MoveDirection}; use tuirealm::event::{Event, Key, KeyEvent}; -use tuirealm::{MockComponent, NoUserEvent, State, StateValue}; +use tuirealm::{MockComponent, NoUserEvent}; use radicle_tui as tui; @@ -35,9 +36,9 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { let mut submit = || -> Option { - let result = self.perform(Cmd::Submit); - match result { - CmdResult::Submit(State::One(StateValue::Usize(selected))) => { + match self.perform(Cmd::Submit) { + CmdResult::Submit(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; let item = self.items().get(selected)?; Some(item.id().to_owned()) } @@ -78,9 +79,9 @@ impl tuirealm::Component for Widget { impl tuirealm::Component for Widget { fn on(&mut self, event: Event) -> Option { let mut submit = || -> Option { - let result = self.perform(Cmd::Submit); - match result { - CmdResult::Submit(State::One(StateValue::Usize(selected))) => { + match self.perform(Cmd::Submit) { + CmdResult::Submit(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; let item = self.items().get(selected)?; Some(item.id().to_owned()) } diff --git a/bin/commands/patch/select/page.rs b/bin/commands/patch/select/page.rs index ec99eec6..99886588 100644 --- a/bin/commands/patch/select/page.rs +++ b/bin/commands/patch/select/page.rs @@ -2,7 +2,8 @@ use std::collections::HashMap; use anyhow::Result; -use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, State, StateValue, Sub, SubClause}; +use tui::ui::state::ItemState; +use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, Sub, SubClause}; use radicle_tui as tui; @@ -44,12 +45,17 @@ impl ListView { theme: &Theme, ) -> Result<()> { let state = app.state(&Cid::List(ListCid::PatchBrowser))?; - let progress = match state { - State::Tup2((StateValue::Usize(step), StateValue::Usize(total))) => { - Progress::Step(step.saturating_add(1), total) - } - _ => Progress::None, + let progress = match ItemState::try_from(state) { + Ok(state) => Progress::Step( + state + .selected() + .map(|s| s.saturating_add(1)) + .unwrap_or_default(), + state.len(), + ), + Err(_) => Progress::None, }; + let context = common::ui::browse_context(context, theme, self.filter.clone(), progress); app.remount(Cid::List(ListCid::Context), context.to_boxed(), vec![])?; diff --git a/bin/commands/patch/suite/event.rs b/bin/commands/patch/suite/event.rs index ee3732e8..0d5ccf86 100644 --- a/bin/commands/patch/suite/event.rs +++ b/bin/commands/patch/suite/event.rs @@ -1,3 +1,4 @@ +use radicle_tui::ui::state::ItemState; use tuirealm::command::{Cmd, CmdResult, Direction as MoveDirection}; use tuirealm::event::{Event, Key, KeyEvent}; use tuirealm::{MockComponent, NoUserEvent, State, StateValue}; @@ -67,16 +68,14 @@ impl tuirealm::Component for Widget { - let result = self.perform(Cmd::Submit); - match result { - CmdResult::Submit(State::One(StateValue::Usize(selected))) => { - let item = self.items().get(selected)?; - Some(Message::Patch(PatchMessage::Show(item.id().to_owned()))) - } - _ => None, + }) => match self.perform(Cmd::Submit) { + CmdResult::Submit(state) => { + let selected = ItemState::try_from(state).ok()?.selected()?; + let item = self.items().get(selected)?; + Some(Message::Patch(PatchMessage::Show(item.id().to_owned()))) } - } + _ => None, + }, _ => None, } } diff --git a/bin/commands/patch/suite/page.rs b/bin/commands/patch/suite/page.rs index d67bb8f0..74b10bd0 100644 --- a/bin/commands/patch/suite/page.rs +++ b/bin/commands/patch/suite/page.rs @@ -4,7 +4,8 @@ use anyhow::Result; use radicle::cob::patch::{Patch, PatchId}; -use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, State, StateValue, Sub, SubClause}; +use tui::ui::state::ItemState; +use tuirealm::{AttrValue, Attribute, Frame, NoUserEvent, Sub, SubClause}; use radicle_tui as tui; @@ -62,11 +63,15 @@ impl ListView { theme: &Theme, ) -> Result<()> { let state = app.state(&Cid::List(ListCid::PatchBrowser))?; - let progress = match state { - State::Tup2((StateValue::Usize(step), StateValue::Usize(total))) => { - Progress::Step(step.saturating_add(1), total) - } - _ => Progress::None, + let progress = match ItemState::try_from(state) { + Ok(state) => Progress::Step( + state + .selected() + .map(|s| s.saturating_add(1)) + .unwrap_or_default(), + state.len(), + ), + Err(_) => Progress::None, }; let context = ui::browse_context(context, theme, progress); diff --git a/src/ui/state.rs b/src/ui/state.rs index c269c339..fdda7ebe 100644 --- a/src/ui/state.rs +++ b/src/ui/state.rs @@ -1,4 +1,7 @@ +use anyhow::anyhow; + use tuirealm::tui::widgets::{ListState, TableState}; +use tuirealm::{State, StateValue}; /// State that holds the index of a selected tab item and the count of all tab items. /// The index can be increased and will start at 0, if length was reached. @@ -30,7 +33,11 @@ impl ItemState { } pub fn selected(&self) -> Option { - self.selected + if !self.is_empty() { + self.selected + } else { + None + } } pub fn select_previous(&mut self) -> Option { @@ -65,6 +72,31 @@ impl ItemState { None } } + + pub fn len(&self) -> usize { + self.len + } + + pub fn is_empty(&self) -> bool { + self.len == 0 + } +} + +impl TryFrom for ItemState { + type Error = anyhow::Error; + + fn try_from(state: State) -> Result { + match state { + State::Tup2((StateValue::Usize(selected), StateValue::Usize(len))) => Ok(Self { + selected: Some(selected), + len, + }), + _ => Err(anyhow!(format!( + "Cannot convert into item state: {:?}", + state + ))), + } + } } impl From<&ItemState> for TableState { diff --git a/src/ui/widget/list.rs b/src/ui/widget/list.rs index 8b3f7994..54137632 100644 --- a/src/ui/widget/list.rs +++ b/src/ui/widget/list.rs @@ -284,15 +284,15 @@ where use tuirealm::command::Direction; match cmd { Cmd::Move(Direction::Up) => match self.state.select_previous() { - Some(selected) => CmdResult::Changed(State::One(StateValue::Usize(selected))), + Some(_) => CmdResult::Changed(self.state()), None => CmdResult::None, }, Cmd::Move(Direction::Down) => match self.state.select_next() { - Some(selected) => CmdResult::Changed(State::One(StateValue::Usize(selected))), + Some(_) => CmdResult::Changed(self.state()), None => CmdResult::None, }, Cmd::Submit => match self.state.selected() { - Some(selected) => CmdResult::Submit(State::One(StateValue::Usize(selected))), + Some(_) => CmdResult::Submit(self.state()), None => CmdResult::None, }, _ => CmdResult::None, @@ -358,15 +358,15 @@ where use tuirealm::command::Direction; match cmd { Cmd::Move(Direction::Up) => match self.state.select_previous() { - Some(selected) => CmdResult::Changed(State::One(StateValue::Usize(selected))), + Some(_) => CmdResult::Changed(self.state()), None => CmdResult::None, }, Cmd::Move(Direction::Down) => match self.state.select_next() { - Some(selected) => CmdResult::Changed(State::One(StateValue::Usize(selected))), + Some(_) => CmdResult::Changed(self.state()), None => CmdResult::None, }, Cmd::Submit => match self.state.selected() { - Some(selected) => CmdResult::Submit(State::One(StateValue::Usize(selected))), + Some(_) => CmdResult::Submit(self.state()), None => CmdResult::None, }, _ => CmdResult::None,