Draggable scrollbar

Author: andornaut

src/views/table.rs

@@ -22,6 +22,7 @@ use crate::{
     command::{result::CommandResult, Command, PromptKind},
     file_system::path_info::PathInfo,
 };
+use log::debug;
 
 #[derive(Default)]
 pub(super) struct TableView {
@@ -39,6 +40,7 @@ pub(super) struct TableView {
     columns: Columns,
     double_click: DoubleClick,
     mapper: LineItemMap,
+    is_scrollbar_dragging: bool,
 }
 
 impl TableView {
@@ -308,4 +310,64 @@ impl TableView {
         self.columns.sort_by(column);
         self.sort()
     }
+
+    fn is_scrollbar_click(&self, x: u16, y: u16) -> bool {
+        // Check if click is within the scrollbar area
+        self.scrollbar_area.intersects(Rect::new(x, y, 1, 1))
+    }
+
+    fn update_scrollbar_position(&mut self, y: u16) {
+        let total_lines = self.mapper.total_number_of_lines();
+        let visible_height = self.table_area.height as usize;
+
+        if total_lines <= visible_height {
+            return;
+        }
+
+        // Calculate the scroll position based on the click/drag position
+        let scrollbar_height = self.scrollbar_area.height;
+        let scrollbar_y = self.scrollbar_area.y;
+        let relative_y = y.saturating_sub(scrollbar_y);
+
+        // Use a slightly reduced height to ensure we can reach the bottom when dragging
+        let effective_height = scrollbar_height.saturating_sub(2);
+
+        // Calculate percentage of scrollbar that was clicked/dragged
+        let percentage = if relative_y >= effective_height {
+            1.0 // At bottom
+        } else {
+            relative_y as f32 / effective_height as f32
+        };
+
+        // Map percentage to content position
+        let selected_pos = (percentage * (total_lines - 1) as f32).round() as usize;
+
+        // Calculate offset (what appears at the top of the view)
+        let max_offset = total_lines.saturating_sub(visible_height);
+        let offset = if percentage >= 0.95 {
+            // When near the bottom, show the last page
+            max_offset
+        } else if selected_pos + visible_height > total_lines {
+            // When selection would be off-screen, adjust offset
+            max_offset
+        } else {
+            // Normal case: selected position at the top
+            selected_pos
+        };
+
+        // Update scrollbar visual state
+        self.scrollbar_state = self
+            .scrollbar_state
+            .content_length(total_lines)
+            .position(selected_pos);
+
+        // Update the table scroll position
+        *self.table_state.offset_mut() = offset;
+
+        // Update the selection to match
+        if !self.directory_items_sorted.is_empty() {
+            let max_index = self.directory_items_sorted.len() - 1;
+            self.table_state.select(Some(selected_pos.min(max_index)));
+        }
+    }
 }

src/views/table/handler.rs

@@ -57,23 +57,40 @@ impl CommandHandler for TableView {
     }
 
     fn handle_mouse(&mut self, event: &MouseEvent) -> CommandResult {
+        let x = event.column.saturating_sub(self.table_area.x);
+        let y = event.row.saturating_sub(self.table_area.y);
+
         match event.kind {
             MouseEventKind::Down(MouseButton::Left) => {
-                let x = event.column.saturating_sub(self.table_area.x);
-                let y = event.row.saturating_sub(self.table_area.y);
+                if self.is_scrollbar_click(x, y) {
+                    self.is_scrollbar_dragging = true;
+                    self.update_scrollbar_position(y);
+                    return CommandResult::none();
+                }
                 if y == 0 {
                     self.click_header(x)
                 } else {
                     self.click_table(y)
                 }
             }
+            MouseEventKind::Up(MouseButton::Left) => {
+                self.is_scrollbar_dragging = false;
+                CommandResult::none()
+            }
+            MouseEventKind::Drag(MouseButton::Left) => {
+                if self.is_scrollbar_dragging {
+                    self.update_scrollbar_position(y);
+                    return CommandResult::none();
+                }
+                CommandResult::none()
+            }
             MouseEventKind::ScrollUp => self.previous(),
             MouseEventKind::ScrollDown => self.next(),
             _ => CommandResult::none(),
         }
     }
 
     fn should_receive_mouse(&self, x: u16, y: u16) -> bool {
-        self.table_area.intersects(Rect::new(x, y, 1, 1))
+        self.table_area.intersects(Rect::new(x, y, 1, 1)) || self.is_scrollbar_click(x, y)
     }
 }