Removed out of place handling of float window in list.rs

src/list.rs

@@ -1,4 +1,6 @@
-use crate::{float::floating_window, running_command::Command, state::AppState};
+use crate::{
+    float::Float, preview_content::PreviewContent, running_command::Command, state::AppState,
+};
 use crossterm::event::{KeyCode, KeyEvent, KeyEventKind};
 use ego_tree::{tree, NodeId};
 use ratatui::{
@@ -26,28 +28,12 @@ pub struct CustomList {
     /// This is the state asociated with the list widget, used to display the selection in the
     /// widget
     list_state: ListState,
-    /// This stores the preview windows state. If it is None, it will not be displayed.
-    /// If it is Some, we show it with the content of the selected item
-    preview_window_state: Option<PreviewWindowState>,
     // This stores the current search query
     filter_query: String,
     // This stores the filtered tree
     filtered_items: Vec<ListNode>,
-}
+    // This is the preview window for the commands
-
+    preview_float: Float<PreviewContent>,
-/// This struct stores the preview window state
-struct PreviewWindowState {
-    /// The text inside the window
-    text: Vec<String>,
-    /// The current line scroll
-    scroll: usize,
-}
-
-impl PreviewWindowState {
-    /// Create a new PreviewWindowState
-    pub fn new(text: Vec<String>) -> Self {
-        Self { text, scroll: 0 }
-    }
 }
 
 impl CustomList {
@@ -192,10 +178,9 @@ impl CustomList {
             inner_tree: tree,
             visit_stack: vec![root_id],
             list_state: ListState::default().with_selected(Some(0)),
-            // By default the PreviewWindowState is set to None, so it is not being shown
-            preview_window_state: None,
             filter_query: String::new(),
             filtered_items: vec![],
+            preview_float: Float::new(80, 80),
         }
     }
 
@@ -259,32 +244,8 @@ impl CustomList {
         // Render it
         frame.render_stateful_widget(list, area, &mut self.list_state);
 
-        // Draw the preview window if it's active
+        //Render the preview window
-        if let Some(pw_state) = &self.preview_window_state {
+        self.preview_float.draw(frame, area);
-            // Set the window to be floating
-            let floating_area = floating_window(area);
-
-            // Draw the preview windows lines
-            let lines: Vec<Line> = pw_state
-                .text
-                .iter()
-                .skip(pw_state.scroll)
-                .take(floating_area.height as usize)
-                .map(|line| Line::from(line.as_str()))
-                .collect();
-
-            // Create list widget
-            let list = List::new(lines)
-                .block(
-                    Block::default()
-                        .borders(Borders::ALL)
-                        .title("Action preview"),
-                )
-                .highlight_style(Style::default().reversed());
-
-            // Finally render the preview window
-            frame.render_widget(list, floating_area);
-        }
     }
 
     pub fn filter(&mut self, query: String) {
@@ -323,98 +284,32 @@ impl CustomList {
         if event.kind == KeyEventKind::Release {
             return None;
         }
+
+        if self.preview_float.handle_key_event(&event) {
+            return None; // If the key event was handled by the preview, don't propagate it further
+        }
+
         match event.code {
             // Damm you Up arrow, use vim lol
             KeyCode::Char('j') | KeyCode::Down => {
-                // If the preview window is active, scroll down and consume the scroll action,
+                self.list_state.select_next();
-                // so the scroll does not happen in the main window as well
-                if self.preview_window_state.is_some() {
-                    self.scroll_preview_window_down();
-                } else {
-                    self.list_state.select_next();
-                }
-
                 None
             }
             KeyCode::Char('k') | KeyCode::Up => {
-                // If the preview window is active, scroll up and consume the scroll action,
+                self.list_state.select_previous();
-                // so the scroll does not happen in the main window as well
-                if self.preview_window_state.is_some() {
-                    self.scroll_preview_window_up();
-                } else {
-                    self.list_state.select_previous();
-                }
-
                 None
             }
-            // The 'p' key toggles the preview on and off
             KeyCode::Char('p') => {
                 self.toggle_preview_window(state);
                 None
             }
-            KeyCode::Enter if self.preview_window_state.is_none() => self.handle_enter(),
+            KeyCode::Enter => self.handle_enter(),
             _ => None,
         }
     }
-    fn toggle_preview_window(&mut self, state: &AppState) {
-        // If the preview window is active, disable it
-        if self.preview_window_state.is_some() {
-            self.preview_window_state = None;
-        } else {
-            // If the preview windows is not active, show it
 
-            // Get the selected command
-            if let Some(selected_command) = self.get_selected_command() {
-                let lines = match selected_command {
-                    Command::Raw(cmd) => {
-                        // Reconstruct the line breaks and file formatting after the
-                        // 'include_str!()' call in the node
-                        cmd.lines().map(|line| line.to_string()).collect()
-                    }
-                    Command::LocalFile(file_path) => {
-                        let mut full_path = state.temp_path.clone();
-                        full_path.push(file_path);
-                        let file_contents = std::fs::read_to_string(&full_path)
-                            .map_err(|_| format!("File not found: {:?}", &full_path))
-                            .unwrap();
-                        file_contents.lines().map(|line| line.to_string()).collect()
-                    }
-                    // If command is a folder, we don't display a preview
-                    Command::None => return,
-                };
-
-                // Show the preview window with the text lines
-                self.preview_window_state = Some(PreviewWindowState::new(lines));
-            }
-        }
-    }
-
-    /// Scroll the preview window down
-    fn scroll_preview_window_down(&mut self) {
-        if let Some(pw_state) = &mut self.preview_window_state {
-            if pw_state.scroll + 1 < pw_state.text.len() {
-                pw_state.scroll += 1;
-            }
-        }
-    }
-
-    /// Scroll the preview window up
-    fn scroll_preview_window_up(&mut self) {
-        if let Some(pw_state) = &mut self.preview_window_state {
-            if pw_state.scroll > 0 {
-                pw_state.scroll = pw_state.scroll.saturating_sub(1);
-            }
-        }
-    }
-
-    /// This method returns the currently selected command, or None if no command is selected.
-    /// It was extracted from the 'handle_enter()'
-    ///
-    /// This could probably be integrated into the 'handle_enter()' method to avoid code
-    /// duplication, but I don't want to make too major changes to the codebase.
     fn get_selected_command(&self) -> Option<Command> {
         let selected_index = self.list_state.selected().unwrap_or(0);
-        println!("Selected Index: {}", selected_index);
 
         if self.filter_query.is_empty() {
             // No filter query, use the regular tree navigation
@@ -440,7 +335,6 @@ impl CustomList {
         } else {
             // Filter query is active, use the filtered items
             if let Some(filtered_node) = self.filtered_items.get(selected_index) {
-                println!("Filtered Node Name: {}", filtered_node.name);
                 return Some(filtered_node.command.clone());
             }
         }
@@ -496,6 +390,37 @@ impl CustomList {
         None
     }
 
+    fn toggle_preview_window(&mut self, state: &AppState) {
+        if self.preview_float.get_content().is_some() {
+            // If the preview window is active, disable it
+            self.preview_float.set_content(None);
+        } else {
+            // If the preview window is not active, show it
+
+            // Get the selected command
+            if let Some(selected_command) = self.get_selected_command() {
+                let lines = match selected_command {
+                    Command::Raw(cmd) => cmd.lines().map(|line| line.to_string()).collect(),
+                    Command::LocalFile(file_path) => {
+                        if file_path.is_empty() {
+                            return;
+                        }
+                        let mut full_path = state.temp_path.clone();
+                        full_path.push(file_path);
+                        let file_contents = std::fs::read_to_string(&full_path)
+                            .map_err(|_| format!("File not found: {:?}", &full_path))
+                            .unwrap();
+                        file_contents.lines().map(|line| line.to_string()).collect()
+                    }
+                    Command::None => return,
+                };
+
+                self.preview_float
+                    .set_content(Some(PreviewContent::new(lines)));
+            }
+        }
+    }
+
     /// Checks weather the current tree node is the root node (can we go up the tree or no)
     /// Returns `true` if we can't go up the tree (we are at the tree root)
     /// else returns `false`