feat: scrollable file preview in Files

Author: TD-Sky

src/components/revision_files.rs

@@ -10,7 +10,7 @@ use crate::{
 	queue::{InternalEvent, Queue, StackablePopupOpen},
 	strings::{self, order, symbol},
 	try_or_popup,
-	ui::{self, common_nav, style::SharedTheme},
+	ui::{self, common_nav, key2seek, style::SharedTheme},
 	AsyncNotification,
 };
 use anyhow::Result;
@@ -444,6 +444,11 @@ impl Component for RevisionFilesComponent {
 				)
 				.order(order::RARE_ACTION),
 			);
+			out.push(CommandInfo::new(
+				strings::commands::seek(&self.key_config),
+				self.tree.selected_file().is_some(),
+				true,
+			));
 			tree_nav_cmds(&self.tree, &self.key_config, out);
 		} else {
 			self.current_file.commands(out, force_all);
@@ -480,6 +485,21 @@ impl Component for RevisionFilesComponent {
 					self.hide();
 					return Ok(EventState::Consumed);
 				}
+			} else if key_match(key, self.key_config.keys.seek_up)
+				|| key_match(key, self.key_config.keys.seek_down)
+			{
+				if is_tree_focused {
+					if let Some(nav) = key2seek(key, &self.key_config)
+					{
+						return Ok(
+							if self.current_file.scroll(nav) {
+								EventState::Consumed
+							} else {
+								EventState::NotConsumed
+							},
+						);
+					}
+				}
 			} else if key_match(key, self.key_config.keys.move_right)
 			{
 				if is_tree_focused {

src/components/syntax_text.rs

@@ -135,7 +135,7 @@ impl SyntaxTextComponent {
 		}
 	}
 
-	fn scroll(&self, nav: MoveSelection) -> bool {
+	pub(in crate::components) fn scroll(&self, nav: MoveSelection) -> bool {
 		let state = self.paragraph_state.get();
 
 		let new_scroll_pos = match nav {

src/keys/key_list.rs

@@ -56,6 +56,8 @@ pub struct KeysList {
 	pub move_right: GituiKeyEvent,
 	pub move_up: GituiKeyEvent,
 	pub move_down: GituiKeyEvent,
+    pub seek_up: GituiKeyEvent,
+    pub seek_down: GituiKeyEvent,
 	pub tree_collapse_recursive: GituiKeyEvent,
 	pub tree_expand_recursive: GituiKeyEvent,
 	pub home: GituiKeyEvent,
@@ -152,6 +154,8 @@ impl Default for KeysList {
 			end: GituiKeyEvent::new(KeyCode::End,  KeyModifiers::empty()),
 			move_up: GituiKeyEvent::new(KeyCode::Up,  KeyModifiers::empty()),
 			move_down: GituiKeyEvent::new(KeyCode::Down,  KeyModifiers::empty()),
+			seek_up: GituiKeyEvent::new(KeyCode::Up,  KeyModifiers::ALT),
+			seek_down: GituiKeyEvent::new(KeyCode::Down,  KeyModifiers::ALT),
 			popup_up: GituiKeyEvent::new(KeyCode::Up,  KeyModifiers::empty()),
 			popup_down: GituiKeyEvent::new(KeyCode::Down,  KeyModifiers::empty()),
 			page_down: GituiKeyEvent::new(KeyCode::PageDown,  KeyModifiers::empty()),

src/strings.rs

@@ -546,6 +546,17 @@ pub mod commands {
 			CMD_GROUP_GENERAL,
 		)
 	}
+	pub fn seek(key_config: &SharedKeyConfig) -> CommandText {
+		CommandText::new(
+			format!(
+				"Seek [{}{}]",
+				key_config.get_hint(key_config.keys.seek_up),
+				key_config.get_hint(key_config.keys.seek_down)
+			),
+			"Seek up or down in selected file",
+			CMD_GROUP_GENERAL,
+		)
+	}
 	pub fn commit_list_mark(
 		key_config: &SharedKeyConfig,
 		marked: bool,

src/ui/mod.rs

@@ -153,6 +153,19 @@ pub fn common_nav(
 	}
 }
 
+pub fn key2seek(
+	key: &crossterm::event::KeyEvent,
+	key_config: &SharedKeyConfig,
+) -> Option<MoveSelection> {
+	if key_match(key, key_config.keys.seek_up) {
+		Some(MoveSelection::Up)
+	} else if key_match(key, key_config.keys.seek_down) {
+		Some(MoveSelection::Down)
+	} else {
+		None
+	}
+}
+
 #[cfg(test)]
 mod test {
 	use super::{rect_inside, Size};