Skip to content

Commit

Permalink
feat: implement TreeState arrow key methods
Browse files Browse the repository at this point in the history
  • Loading branch information
EdJoPaTo committed Aug 31, 2022
1 parent 63a5fa0 commit c0e4967
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 35 deletions.
8 changes: 4 additions & 4 deletions examples/example.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Result<(
if let Event::Key(key) = event::read()? {
match key.code {
KeyCode::Char('q') => return Ok(()),
KeyCode::Left => app.tree.close(),
KeyCode::Right => app.tree.open(),
KeyCode::Left => app.tree.left(),
KeyCode::Right => app.tree.right(),
KeyCode::Char('\n') => app.tree.toggle(),
KeyCode::Down => app.tree.next(),
KeyCode::Up => app.tree.previous(),
KeyCode::Down => app.tree.down(),
KeyCode::Up => app.tree.up(),
_ => {}
}
}
Expand Down
40 changes: 9 additions & 31 deletions examples/util/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use tui_tree_widget::{flatten, get_identifier_without_leaf, TreeItem, TreeState};
use tui_tree_widget::{TreeItem, TreeState};

pub struct StatefulTree<'a> {
pub state: TreeState,
Expand All @@ -21,42 +21,20 @@ impl<'a> StatefulTree<'a> {
}
}

fn move_up_down(&mut self, down: bool) {
let visible = flatten(&self.state.get_all_opened(), &self.items);
let current_identifier = self.state.selected();
let current_index = visible
.iter()
.position(|o| o.identifier == current_identifier);
let new_index = current_index.map_or(0, |current_index| {
if down {
current_index.saturating_add(1)
} else {
current_index.saturating_sub(1)
}
.min(visible.len() - 1)
});
let new_identifier = visible.get(new_index).unwrap().identifier.clone();
self.state.select(new_identifier);
pub fn down(&mut self) {
self.state.key_down(&self.items);
}

pub fn next(&mut self) {
self.move_up_down(true);
pub fn up(&mut self) {
self.state.key_up(&self.items);
}

pub fn previous(&mut self) {
self.move_up_down(false);
pub fn left(&mut self) {
self.state.key_left();
}

pub fn close(&mut self) {
let selected = self.state.selected();
if !self.state.close(&selected) {
let (head, _) = get_identifier_without_leaf(&selected);
self.state.select(head);
}
}

pub fn open(&mut self) {
self.state.open(self.state.selected());
pub fn right(&mut self) {
self.state.key_right();
}

pub fn toggle(&mut self) {
Expand Down
46 changes: 46 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,52 @@ impl TreeState {
pub fn close_all(&mut self) {
self.opened.clear();
}

/// Handles the up arrow key.
/// Moves up in the current depth or to its parent.
pub fn key_up(&mut self, items: &[TreeItem]) {
let visible = flatten(&self.get_all_opened(), items);
let current_identifier = self.selected();
let current_index = visible
.iter()
.position(|o| o.identifier == current_identifier);
let new_index = current_index.map_or(0, |current_index| {
current_index.saturating_sub(1).min(visible.len() - 1)
});
let new_identifier = visible[new_index].identifier.clone();
self.select(new_identifier);
}

/// Handles the down arrow key.
/// Moves down in the current depth or into a child node.
pub fn key_down(&mut self, items: &[TreeItem]) {
let visible = flatten(&self.get_all_opened(), items);
let current_identifier = self.selected();
let current_index = visible
.iter()
.position(|o| o.identifier == current_identifier);
let new_index = current_index.map_or(0, |current_index| {
current_index.saturating_add(1).min(visible.len() - 1)
});
let new_identifier = visible[new_index].identifier.clone();
self.select(new_identifier);
}

/// Handles the left arrow key.
/// Closes the currently selected or moves to its parent.
pub fn key_left(&mut self) {
let selected = self.selected();
if !self.close(&selected) {
let (head, _) = get_identifier_without_leaf(&selected);
self.select(head);
}
}

/// Handles the right arrow key.
/// Openes the currently selected.
pub fn key_right(&mut self) {
self.open(self.selected());
}
}

#[derive(Debug, Clone)]
Expand Down

0 comments on commit c0e4967

Please sign in to comment.