diff --git a/README.md b/README.md
index 3debafe..e616bae 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,7 @@ If you want to add connections, you need to edit your config file. For more info
| Ctrl + u, Ctrl + d | Scroll up/down multiple lines |
| g , G | Scroll to top/bottom |
| H, J, K, L | Extend selection by one cell left/down/up/right |
+| V | Extend selection by horizontal line |
| y | Copy a cell value |
| ←, → | Move focus to left/right |
| c | Move focus to connections |
diff --git a/src/components/command.rs b/src/components/command.rs
index e569309..1584c0b 100644
--- a/src/components/command.rs
+++ b/src/components/command.rs
@@ -96,6 +96,16 @@ pub fn extend_selection_by_one_cell(key: &KeyConfig) -> CommandText {
)
}
+pub fn extend_selection_by_line(key: &KeyConfig) -> CommandText {
+ CommandText::new(
+ format!(
+ "Extend selection by horizontal line [{}]",
+ key.extend_selection_by_horizontal_line,
+ ),
+ CMD_GROUP_TABLE,
+ )
+}
+
pub fn extend_or_shorten_widget_width(key: &KeyConfig) -> CommandText {
CommandText::new(
format!(
diff --git a/src/components/table.rs b/src/components/table.rs
index 0c5da62..dbea5dc 100644
--- a/src/components/table.rs
+++ b/src/components/table.rs
@@ -200,6 +200,21 @@ impl TableComponent {
}
}
+ fn expand_selected_by_horizontal_line(&mut self) {
+ let horizontal_length = self.headers.len().saturating_sub(1);
+ let vertical_length = self.selected_row.selected().unwrap_or(0);
+
+ if let Some((x, y)) = self.selection_area_corner {
+ if x == horizontal_length {
+ self.selection_area_corner = None;
+ } else {
+ self.selection_area_corner = Some((horizontal_length, y));
+ }
+ } else {
+ self.selection_area_corner = Some((horizontal_length, vertical_length));
+ }
+ }
+
pub fn selected_cells(&self) -> Option {
if let Some((x, y)) = self.selection_area_corner {
let selected_row_index = self.selected_row.selected()?;
@@ -522,6 +537,9 @@ impl Component for TableComponent {
out.push(CommandInfo::new(command::extend_selection_by_one_cell(
&self.key_config,
)));
+ out.push(CommandInfo::new(command::extend_selection_by_line(
+ &self.key_config,
+ )));
}
fn event(&mut self, key: Key) -> Result {
@@ -561,6 +579,9 @@ impl Component for TableComponent {
} else if key == self.key_config.extend_selection_by_one_cell_right {
self.expand_selected_area_x(true);
return Ok(EventState::Consumed);
+ } else if key == self.key_config.extend_selection_by_horizontal_line {
+ self.expand_selected_by_horizontal_line();
+ return Ok(EventState::Consumed);
}
Ok(EventState::NotConsumed)
}
@@ -686,6 +707,32 @@ mod test {
assert_eq!(component.selected_cells(), Some("b\ne".to_string()));
}
+ #[test]
+ fn test_expand_selected_by_horizontal_line() {
+ let mut component = TableComponent::new(KeyConfig::default());
+ component.headers = vec!["a", "b", "c"].iter().map(|h| h.to_string()).collect();
+ component.rows = vec![
+ vec!["d", "e", "f"].iter().map(|h| h.to_string()).collect(),
+ vec!["g", "h", "i"].iter().map(|h| h.to_string()).collect(),
+ ];
+
+ // select one line
+ component.selected_row.select(Some(0));
+ component.expand_selected_by_horizontal_line();
+ assert_eq!(component.selection_area_corner, Some((2, 0)));
+ assert_eq!(component.selected_cells(), Some("d,e,f".to_string()));
+
+ // undo select horizontal line
+ component.expand_selected_by_horizontal_line();
+ assert_eq!(component.selection_area_corner, None);
+
+ // select two line
+ component.expand_selected_area_y(true);
+ component.expand_selected_by_horizontal_line();
+ assert_eq!(component.selection_area_corner, Some((2, 1)));
+ assert_eq!(component.selected_cells(), Some("d,e,f\ng,h,i".to_string()));
+ }
+
#[test]
fn test_is_number_column() {
let mut component = TableComponent::new(KeyConfig::default());
diff --git a/src/config.rs b/src/config.rs
index 3d41831..5e98bf3 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -105,6 +105,7 @@ pub struct KeyConfig {
pub extend_selection_by_one_cell_right: Key,
pub extend_selection_by_one_cell_up: Key,
pub extend_selection_by_one_cell_down: Key,
+ pub extend_selection_by_horizontal_line: Key,
pub tab_records: Key,
pub tab_columns: Key,
pub tab_constraints: Key,
@@ -144,6 +145,7 @@ impl Default for KeyConfig {
extend_selection_by_one_cell_right: Key::Char('L'),
extend_selection_by_one_cell_down: Key::Char('J'),
extend_selection_by_one_cell_up: Key::Char('K'),
+ extend_selection_by_horizontal_line: Key::Char('V'),
tab_records: Key::Char('1'),
tab_properties: Key::Char('2'),
tab_sql_editor: Key::Char('3'),