mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-05 21:28:48 +00:00
Merge branch 'main' of https://github.com/ChrisTitusTech/linutil
This commit is contained in:
commit
8040dbb0ff
22
src/list.rs
22
src/list.rs
|
@ -168,7 +168,9 @@ impl CustomList {
|
|||
}
|
||||
items
|
||||
} else {
|
||||
self.filtered_items
|
||||
let mut sorted_items = self.filtered_items.clone();
|
||||
sorted_items.sort_by(|a, b| a.name.cmp(b.name));
|
||||
sorted_items
|
||||
.iter()
|
||||
.map(|node| {
|
||||
Line::from(format!("{} {}", state.theme.cmd_icon, node.name))
|
||||
|
@ -238,6 +240,15 @@ impl CustomList {
|
|||
}
|
||||
}
|
||||
|
||||
/// Resets the selection to the first item
|
||||
pub fn reset_selection(&mut self) {
|
||||
if !self.filtered_items.is_empty() {
|
||||
self.list_state.select(Some(0));
|
||||
} else {
|
||||
self.list_state.select(None);
|
||||
}
|
||||
}
|
||||
|
||||
/// Handle key events, we are only interested in `Press` and `Repeat` events
|
||||
pub fn handle_key(&mut self, event: KeyEvent, state: &AppState) -> Option<Command> {
|
||||
if event.kind == KeyEventKind::Release {
|
||||
|
@ -317,8 +328,11 @@ impl CustomList {
|
|||
}
|
||||
|
||||
fn try_scroll_up(&mut self) {
|
||||
self.list_state
|
||||
.select(Some(self.list_state.selected().unwrap().saturating_sub(1)));
|
||||
if let Some(selected) = self.list_state.selected() {
|
||||
if selected > 0 {
|
||||
self.list_state.select(Some(selected.saturating_sub(1)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn try_scroll_down(&mut self) {
|
||||
|
@ -342,8 +356,6 @@ impl CustomList {
|
|||
self.list_state
|
||||
.select(Some((curr_selection + 1).min(count)));
|
||||
}
|
||||
} else if count > 0 {
|
||||
self.list_state.select(Some(0));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -162,7 +162,10 @@ fn run<B: Backend>(terminal: &mut Terminal<B>, state: &AppState) -> io::Result<(
|
|||
search_input = String::new();
|
||||
in_search_mode = false
|
||||
}
|
||||
KeyCode::Enter => in_search_mode = false,
|
||||
KeyCode::Enter => {
|
||||
in_search_mode = false;
|
||||
custom_list.reset_selection();
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
} else if let Some(cmd) = custom_list.handle_key(key, state) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user