Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions src/view/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,16 @@ impl TableView {
FilterState::Filtering | FilterState::Filtered => {
self.filter_input.reset();
self.filter_state = FilterState::None;
// let orig_idx = self.view_indices[self.list_state.selected];
let orig_idx = self
.view_indices
.get(self.table_state.selected_row)
.cloned();
let before_offset_idx = self.table_state.selected_row_offset_index();
self.filter_view_indices();
// self.list_state.select_index(orig_idx);
if let Some(orig_idx) = orig_idx {
self.table_state.select_index(orig_idx, before_offset_idx);
self.table_state.update_table_state();
}
self.tx.send(AppEvent::ClearStatus);
}
FilterState::None => {}
Expand Down
12 changes: 12 additions & 0 deletions src/widget/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,14 @@ impl TableState {
self.offset_col = self.total_cols - count;
}

pub fn select_index(&mut self, index: usize, offset_index: usize) {
if index >= self.total_rows {
return;
}
self.selected_row = index;
self.offset_row = index.saturating_sub(offset_index);
}

pub fn update_table_state(&mut self) {
let row = self.selected_row - self.offset_row;
if let Some(col) = self.selected_col {
Expand Down Expand Up @@ -269,6 +277,10 @@ impl TableState {
pub fn selected_col_width(&self) -> Option<usize> {
self.selected_col.map(|col| self.col_widths[col])
}

pub fn selected_row_offset_index(&self) -> usize {
self.selected_row - self.offset_row
}
}

#[derive(Debug, Default)]
Expand Down