diff --git a/src/flux/ui/widget.rs b/src/flux/ui/widget.rs index 97ee0f38..7e47d80b 100644 --- a/src/flux/ui/widget.rs +++ b/src/flux/ui/widget.rs @@ -145,12 +145,13 @@ impl Table { self.state.selected() } - pub fn prev(&mut self) { + pub fn prev(&mut self) -> Option { let selected = self.selected().map(|current| current.saturating_sub(1)); self.state.select(selected); + selected } - pub fn next(&mut self, len: usize) { + pub fn next(&mut self, len: usize) -> Option { let selected = self.selected().map(|current| { if current < len.saturating_sub(1) { current.saturating_add(1) @@ -159,6 +160,37 @@ impl Table { } }); self.state.select(selected); + selected + } + + pub fn prev_page(&mut self, page_size: usize) -> Option { + let selected = self + .selected() + .map(|current| current.saturating_sub(page_size)); + self.state.select(selected); + selected + } + + pub fn next_page(&mut self, len: usize, page_size: usize) -> Option { + let selected = self.selected().map(|current| { + if current < len.saturating_sub(1) { + cmp::min(current.saturating_add(page_size), len.saturating_sub(1)) + } else { + current + } + }); + self.state.select(selected); + selected + } + + pub fn begin(&mut self) -> Option { + self.state.select(Some(0)); + self.state.selected() + } + + pub fn end(&mut self, len: usize) -> Option { + self.state.select(Some(len.saturating_sub(1))); + self.state.selected() } pub fn progress(&self, len: usize) -> (usize, usize) {