Skip to content

return user to their previous position if they exit a subdir #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from Oct 31, 2024
Merged

return user to their previous position if they exit a subdir #725

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
edae301
return user to their previous position if they enter a subdir
Oct 2, 2024
0061868
fix lint
Oct 2, 2024
92643de
implement changes proposed by adam
Oct 2, 2024
70d3abf
add newline back
Oct 2, 2024
6d1f3a0
coalesce `visit_stack` and `position_stack` (#6)
cartercanedy Oct 3, 2024
0680c19
Merge remote-tracking branch 'upstream/main' into savestate
Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions tui/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ pub struct AppState {
drawable: bool,
#[cfg(feature = "tips")]
tip: &'static str,
position_stack: Vec<usize>,
}

pub enum Focus {
Expand Down Expand Up @@ -94,6 +95,7 @@ impl AppState {
drawable: false,
#[cfg(feature = "tips")]
tip: get_random_tip(),
position_stack: vec![0],
};

state.update_items();
Expand Down Expand Up @@ -572,9 +574,12 @@ impl AppState {
}

fn enter_parent_directory(&mut self) {
self.visit_stack.pop();
self.selection.select(Some(0));
self.update_items();
if self.visit_stack.len() > 1 {
self.visit_stack.pop();
let previous_position = self.position_stack.pop().unwrap_or(0);
self.selection.select(Some(previous_position));
self.update_items();
}
}

fn get_selected_node(&self) -> Option<Rc<ListNode>> {
Expand All @@ -601,20 +606,23 @@ impl AppState {
}

pub fn go_to_selected_dir(&mut self) {
let mut selected_index = self.selection.selected().unwrap_or(0);
let selected_index = self.selection.selected().unwrap_or(0);

if !self.at_root() && selected_index == 0 {
self.enter_parent_directory();
return;
}

if !self.at_root() {
selected_index = selected_index.saturating_sub(1);
}
let actual_index = if self.at_root() {
selected_index
} else {
selected_index - 1
};

if let Some(item) = self.filter.item_list().get(selected_index) {
if let Some(item) = self.filter.item_list().get(actual_index) {
if item.has_children {
self.visit_stack.push(item.id);
self.position_stack.push(selected_index);
self.selection.select(Some(0));
self.update_items();
}
Expand Down Expand Up @@ -646,7 +654,6 @@ impl AppState {

pub fn selected_item_is_up_dir(&self) -> bool {
let selected_index = self.selection.selected().unwrap_or(0);

!self.at_root() && selected_index == 0
}

Expand All @@ -668,7 +675,11 @@ impl AppState {
}

fn handle_enter(&mut self) {
if self.selected_item_is_cmd() {
if self.selected_item_is_up_dir() {
self.enter_parent_directory();
} else if self.selected_item_is_dir() {
self.go_to_selected_dir();
} else if self.selected_item_is_cmd() {
if self.selected_commands.is_empty() {
if let Some(node) = self.get_selected_node() {
self.selected_commands.push(node);
Expand All @@ -683,8 +694,6 @@ impl AppState {

let prompt = ConfirmPrompt::new(&cmd_names[..]);
self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
} else {
self.go_to_selected_dir();
}
}

Expand Down