feat: implement up and down arrow keys

Author: c-git

src/app.rs

@@ -6,6 +6,7 @@ use std::{
 
 #[cfg(not(target_arch = "wasm32"))]
 use anyhow::{bail, Context};
+use egui::{Align, Modifiers};
 use egui_extras::{Column, TableBuilder};
 use log::info;
 
@@ -23,6 +24,8 @@ pub struct LogViewerApp {
     last_filename: Arc<Mutex<Option<PathBuf>>>,
     show_last_filename: bool,
 
+    #[serde(skip)]
+    should_scroll: bool,
     #[serde(skip)]
     loading_status: LoadingStatus,
 }
@@ -35,6 +38,7 @@ impl Default for LogViewerApp {
             start_open_path: Default::default(),
             loading_status: Default::default(),
             last_filename: Default::default(),
+            should_scroll: Default::default(),
             show_last_filename: true,
         }
     }
@@ -95,6 +99,21 @@ impl LogViewerApp {
         // Make table clickable
         table_builder = table_builder.sense(egui::Sense::click());
 
+        table_builder = match (self.should_scroll, self.data.as_ref()) {
+            (true, Some(data)) => {
+                self.should_scroll = false;
+                if let Some(selected_row) = data.selected_row {
+                    table_builder.scroll_to_row(selected_row, Some(Align::Center))
+                } else {
+                    table_builder
+                }
+            }
+            (true, None) | (false, _) => {
+                self.should_scroll = false;
+                table_builder
+            }
+        };
+
         let table = table_builder.header(text_height, |mut header| {
             for field_name in self.data_display_options.main_list_fields() {
                 header.col(|ui| {
@@ -374,6 +393,23 @@ impl LogViewerApp {
             )),
         }
     }
+
+    fn check_shortcuts(&mut self, ui: &mut egui::Ui) {
+        if let Some(data) = self.data.as_mut() {
+            let up_shortcut = egui::KeyboardShortcut::new(Modifiers::NONE, egui::Key::ArrowUp);
+            let down_shortcut = egui::KeyboardShortcut::new(Modifiers::NONE, egui::Key::ArrowDown);
+
+            if ui.input_mut(|i| i.consume_shortcut(&up_shortcut)) {
+                data.move_selected_to_prev();
+                self.should_scroll = true;
+            }
+
+            if ui.input_mut(|i| i.consume_shortcut(&down_shortcut)) {
+                data.move_selected_to_next();
+                self.should_scroll = true;
+            }
+        }
+    }
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -430,6 +466,8 @@ impl eframe::App for LogViewerApp {
         egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
             // The top panel is often a good place for a menu bar:
 
+            self.check_shortcuts(ui);
+
             egui::menu::bar(ui, |ui| {
                 // NOTE: no File->Quit on web pages!
                 let is_web = cfg!(target_arch = "wasm32");

src/app/data.rs

@@ -127,6 +127,36 @@ impl Data {
         let selected_row_index = self.selected_row?;
         Some(self.rows[selected_row_index].as_slice(common_fields))
     }
+
+    pub fn move_selected_to_next(&mut self) {
+        if let Some(selected) = self.selected_row.as_mut() {
+            if *selected < self.rows.len() - 1 {
+                *selected += 1;
+            } else {
+                // Do nothing already on last row
+            }
+        } else if !self.rows.is_empty() {
+            // Set to first row
+            self.selected_row = Some(0)
+        } else {
+            // No rows to select
+        }
+    }
+
+    pub fn move_selected_to_prev(&mut self) {
+        if let Some(selected) = self.selected_row.as_mut() {
+            if *selected > 0 {
+                *selected -= 1;
+            } else {
+                // Do nothing already on first row
+            }
+        } else if !self.rows.is_empty() {
+            // Set to last row
+            self.selected_row = Some(self.rows.len() - 1)
+        } else {
+            // No rows to select
+        }
+    }
 }
 
 impl TryFrom<&str> for LogRow {

src/lib.rs

@@ -3,7 +3,6 @@
 mod app;
 pub use app::LogViewerApp;
 
-// TODO 2: Add support for navigating using arrow keys Implement hot keys https://github.com/c-git/egui/blob/34db001db14940c948eb03d3fe87f2af2c45daba/crates/egui_demo_lib/src/demo/demo_app_windows.rs#L323
 // TODO 2: Add filter by and let user pick like ID or date or something like that
 // TODO 2: Add button to set to current value if a field is selected
 // TODO 3: Support auto reload (look into watching for changes) https://watchexec.github.io/