mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-19 06:59:22 +01:00
tabular_data_preview: Range selection, edge jumps, and page navigation (#65161)
## Summary Part of the tabular data preview navigation & selection series (see [PR 1 (#64916)](https://github.com/zed-industries/zed/pull/64916) for the full overview and roadmap). ### Changes in this PR (2/8) - **Range Selection (`tabular_data::ExtendSelection`):** Extends cell selection bounding box with `Shift+Up/Down/Left/Right`, keeping the anchor fixed in data-space. - **Edge Navigation (`MoveUnit::Edge`):** Jumps to the top/bottom or leftmost/rightmost cell on `Cmd/Ctrl+Up/Down/Left/Right` and `Home/End`. - **Symmetric Page Jumps (`MoveUnit::Page`):** Moves by visible page height (`visible_rows - 2`) on `PageUp/PageDown` to maintain a consistent 1-row context overlap. - **Clear Selection (`tabular_data::ClearSelection`):** Clears the active selection cursor on `Escape`. --- Release Notes: - N/A
This commit is contained in:
committed by
GitHub
parent
94f3eb1b72
commit
d2a4fb6ded
@@ -1705,6 +1705,31 @@
|
||||
"down": ["tabular_data::MoveFocusedCell", { "direction": "down" }],
|
||||
"left": ["tabular_data::MoveFocusedCell", { "direction": "left" }],
|
||||
"right": ["tabular_data::MoveFocusedCell", { "direction": "right" }],
|
||||
"pageup": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "page" }],
|
||||
"pagedown": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "page" }],
|
||||
"home": ["tabular_data::MoveFocusedCell", { "direction": "left", "unit": "edge" }],
|
||||
"end": ["tabular_data::MoveFocusedCell", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-up": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-down": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "edge" }],
|
||||
"ctrl-left": ["tabular_data::MoveFocusedCell", { "direction": "left", "unit": "edge" }],
|
||||
"ctrl-right": ["tabular_data::MoveFocusedCell", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-home": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-end": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "edge" }],
|
||||
"shift-up": ["tabular_data::ExtendSelection", { "direction": "up" }],
|
||||
"shift-down": ["tabular_data::ExtendSelection", { "direction": "down" }],
|
||||
"shift-left": ["tabular_data::ExtendSelection", { "direction": "left" }],
|
||||
"shift-right": ["tabular_data::ExtendSelection", { "direction": "right" }],
|
||||
"shift-pageup": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "page" }],
|
||||
"shift-pagedown": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "page" }],
|
||||
"shift-home": ["tabular_data::ExtendSelection", { "direction": "left", "unit": "edge" }],
|
||||
"shift-end": ["tabular_data::ExtendSelection", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-shift-up": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-shift-down": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "edge" }],
|
||||
"ctrl-shift-left": ["tabular_data::ExtendSelection", { "direction": "left", "unit": "edge" }],
|
||||
"ctrl-shift-right": ["tabular_data::ExtendSelection", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-shift-home": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-shift-end": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "edge" }],
|
||||
"escape": "tabular_data::ClearSelection",
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
@@ -1799,6 +1799,27 @@
|
||||
"down": ["tabular_data::MoveFocusedCell", { "direction": "down" }],
|
||||
"left": ["tabular_data::MoveFocusedCell", { "direction": "left" }],
|
||||
"right": ["tabular_data::MoveFocusedCell", { "direction": "right" }],
|
||||
"pageup": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "page" }],
|
||||
"pagedown": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "page" }],
|
||||
"home": ["tabular_data::MoveFocusedCell", { "direction": "left", "unit": "edge" }],
|
||||
"end": ["tabular_data::MoveFocusedCell", { "direction": "right", "unit": "edge" }],
|
||||
"cmd-up": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "edge" }],
|
||||
"cmd-down": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "edge" }],
|
||||
"cmd-left": ["tabular_data::MoveFocusedCell", { "direction": "left", "unit": "edge" }],
|
||||
"cmd-right": ["tabular_data::MoveFocusedCell", { "direction": "right", "unit": "edge" }],
|
||||
"shift-up": ["tabular_data::ExtendSelection", { "direction": "up" }],
|
||||
"shift-down": ["tabular_data::ExtendSelection", { "direction": "down" }],
|
||||
"shift-left": ["tabular_data::ExtendSelection", { "direction": "left" }],
|
||||
"shift-right": ["tabular_data::ExtendSelection", { "direction": "right" }],
|
||||
"shift-pageup": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "page" }],
|
||||
"shift-pagedown": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "page" }],
|
||||
"shift-home": ["tabular_data::ExtendSelection", { "direction": "left", "unit": "edge" }],
|
||||
"shift-end": ["tabular_data::ExtendSelection", { "direction": "right", "unit": "edge" }],
|
||||
"cmd-shift-up": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "edge" }],
|
||||
"cmd-shift-down": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "edge" }],
|
||||
"cmd-shift-left": ["tabular_data::ExtendSelection", { "direction": "left", "unit": "edge" }],
|
||||
"cmd-shift-right": ["tabular_data::ExtendSelection", { "direction": "right", "unit": "edge" }],
|
||||
"escape": "tabular_data::ClearSelection",
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
@@ -1720,6 +1720,31 @@
|
||||
"down": ["tabular_data::MoveFocusedCell", { "direction": "down" }],
|
||||
"left": ["tabular_data::MoveFocusedCell", { "direction": "left" }],
|
||||
"right": ["tabular_data::MoveFocusedCell", { "direction": "right" }],
|
||||
"pageup": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "page" }],
|
||||
"pagedown": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "page" }],
|
||||
"home": ["tabular_data::MoveFocusedCell", { "direction": "left", "unit": "edge" }],
|
||||
"end": ["tabular_data::MoveFocusedCell", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-up": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-down": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "edge" }],
|
||||
"ctrl-left": ["tabular_data::MoveFocusedCell", { "direction": "left", "unit": "edge" }],
|
||||
"ctrl-right": ["tabular_data::MoveFocusedCell", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-home": ["tabular_data::MoveFocusedCell", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-end": ["tabular_data::MoveFocusedCell", { "direction": "down", "unit": "edge" }],
|
||||
"shift-up": ["tabular_data::ExtendSelection", { "direction": "up" }],
|
||||
"shift-down": ["tabular_data::ExtendSelection", { "direction": "down" }],
|
||||
"shift-left": ["tabular_data::ExtendSelection", { "direction": "left" }],
|
||||
"shift-right": ["tabular_data::ExtendSelection", { "direction": "right" }],
|
||||
"shift-pageup": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "page" }],
|
||||
"shift-pagedown": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "page" }],
|
||||
"shift-home": ["tabular_data::ExtendSelection", { "direction": "left", "unit": "edge" }],
|
||||
"shift-end": ["tabular_data::ExtendSelection", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-shift-up": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-shift-down": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "edge" }],
|
||||
"ctrl-shift-left": ["tabular_data::ExtendSelection", { "direction": "left", "unit": "edge" }],
|
||||
"ctrl-shift-right": ["tabular_data::ExtendSelection", { "direction": "right", "unit": "edge" }],
|
||||
"ctrl-shift-home": ["tabular_data::ExtendSelection", { "direction": "up", "unit": "edge" }],
|
||||
"ctrl-shift-end": ["tabular_data::ExtendSelection", { "direction": "down", "unit": "edge" }],
|
||||
"escape": "tabular_data::ClearSelection",
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
@@ -23,6 +23,8 @@ impl Render for TableView {
|
||||
.bg(theme.colors().editor_background)
|
||||
.track_focus(&self.focus_handle)
|
||||
.on_action(cx.listener(Self::move_focused_cell))
|
||||
.on_action(cx.listener(Self::extend_selection))
|
||||
.on_action(cx.listener(Self::clear_selection))
|
||||
.child({
|
||||
let is_loading = self.is_loading;
|
||||
if is_loading || self.engine.contents.number_of_cols == 0 {
|
||||
|
||||
@@ -106,6 +106,11 @@ impl TableView {
|
||||
let data_row = this.engine.d2d_mapping().get_data_row(display_row)?;
|
||||
let row = this.engine.contents.get_row(data_row)?;
|
||||
|
||||
let selection_bounds = this
|
||||
.selection
|
||||
.as_ref()
|
||||
.and_then(|selection| selection.display_bounds(this.engine.d2d_mapping()));
|
||||
|
||||
let mut elements = Vec::with_capacity(cols);
|
||||
elements.push(this.create_row_identifier_cell(display_row, data_row, cx)?);
|
||||
|
||||
@@ -119,6 +124,13 @@ impl TableView {
|
||||
let display_cell_id = DisplayCellId::new(display_row, col);
|
||||
let data_cell_id = DataCellId::new(data_row, col);
|
||||
|
||||
let is_in_selection =
|
||||
selection_bounds
|
||||
.as_ref()
|
||||
.is_some_and(|(row_range, col_range)| {
|
||||
row_range.contains(&display_row.0) && col_range.contains(&col.0)
|
||||
});
|
||||
|
||||
let is_focus_cell = this
|
||||
.selection
|
||||
.as_ref()
|
||||
@@ -126,6 +138,8 @@ impl TableView {
|
||||
|
||||
let cell_bg = if is_focus_cell {
|
||||
Some(cx.theme().colors().element_selected)
|
||||
} else if is_in_selection {
|
||||
Some(cx.theme().colors().element_hover)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
ops::RangeInclusive,
|
||||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
@@ -21,7 +22,7 @@ use ui::{
|
||||
};
|
||||
|
||||
use crate::{
|
||||
MoveFocusedCell, NavigationDirection,
|
||||
ClearSelection, ExtendSelection, MoveFocusedCell, MoveUnit, NavigationDirection,
|
||||
settings::TableViewSettings,
|
||||
table_data_engine::{DisplayToDataMapping, TableDataEngine},
|
||||
types::{AnyColumn, DataCellId, DisplayRow, TableLikeContent},
|
||||
@@ -51,6 +52,20 @@ impl CellSelection {
|
||||
pub fn is_single_cell(&self) -> bool {
|
||||
self.anchor == self.focus
|
||||
}
|
||||
|
||||
/// Returns display-space bounding box `(min_display_row..=max_display_row, min_col..=max_col)` if both anchor and focus are visible.
|
||||
pub fn display_bounds(
|
||||
&self,
|
||||
d2d: &DisplayToDataMapping,
|
||||
) -> Option<(RangeInclusive<usize>, RangeInclusive<usize>)> {
|
||||
let anchor_row = d2d.get_display_row(self.anchor.row)?.0;
|
||||
let focus_row = d2d.get_display_row(self.focus.row)?.0;
|
||||
let min_row = anchor_row.min(focus_row);
|
||||
let max_row = anchor_row.max(focus_row);
|
||||
let min_col = self.anchor.col.0.min(self.focus.col.0);
|
||||
let max_col = self.anchor.col.0.max(self.focus.col.0);
|
||||
Some((min_row..=max_row, min_col..=max_col))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
@@ -248,6 +263,26 @@ impl TableView {
|
||||
action: &MoveFocusedCell,
|
||||
window: &mut Window,
|
||||
cx: &mut Context<Self>,
|
||||
) {
|
||||
self.navigate(action.direction, action.unit, false, window, cx);
|
||||
}
|
||||
|
||||
pub(crate) fn extend_selection(
|
||||
&mut self,
|
||||
action: &ExtendSelection,
|
||||
window: &mut Window,
|
||||
cx: &mut Context<Self>,
|
||||
) {
|
||||
self.navigate(action.direction, action.unit, true, window, cx);
|
||||
}
|
||||
|
||||
fn navigate(
|
||||
&mut self,
|
||||
direction: NavigationDirection,
|
||||
unit: MoveUnit,
|
||||
extend: bool,
|
||||
window: &mut Window,
|
||||
cx: &mut Context<Self>,
|
||||
) {
|
||||
if !self.is_selection_enabled() {
|
||||
return;
|
||||
@@ -260,29 +295,65 @@ impl TableView {
|
||||
return;
|
||||
}
|
||||
|
||||
let current_pos = self.selection.as_ref().and_then(|selection| {
|
||||
self.engine
|
||||
.d2d_mapping()
|
||||
.get_display_row(selection.focus.row)
|
||||
.map(|r| (r.0, selection.focus.col.0))
|
||||
});
|
||||
let (anchor, (current_row, current_col)) = match self.selection.as_ref() {
|
||||
Some(selection) => {
|
||||
let focus_pos = self
|
||||
.engine
|
||||
.d2d_mapping()
|
||||
.get_display_row(selection.focus.row)
|
||||
.map(|r| (r.0, selection.focus.col.0))
|
||||
.unwrap_or((0, 0));
|
||||
(selection.anchor, focus_pos)
|
||||
}
|
||||
None => {
|
||||
let Some(initial_row) = self.engine.d2d_mapping().get_data_row(DisplayRow(0))
|
||||
else {
|
||||
return;
|
||||
};
|
||||
let initial_cell = DataCellId::new(initial_row, AnyColumn(0));
|
||||
(initial_cell, (0, 0))
|
||||
}
|
||||
};
|
||||
|
||||
let (new_row, new_column) = match current_pos {
|
||||
Some(pos) => self.compute_move(pos, action.direction),
|
||||
None => (0, 0),
|
||||
let (new_row, new_column) = if self.selection.is_none() && !extend && unit == MoveUnit::Cell
|
||||
{
|
||||
// First single-cell move initializes focus at (0, 0) without skipping
|
||||
(0, 0)
|
||||
} else {
|
||||
self.compute_move((current_row, current_col), direction, unit, cx)
|
||||
};
|
||||
|
||||
let Some(new_data_row) = self.engine.d2d_mapping().get_data_row(DisplayRow(new_row)) else {
|
||||
return;
|
||||
};
|
||||
let new_cell = DataCellId::new(new_data_row, AnyColumn(new_column));
|
||||
self.selection = Some(CellSelection::single_cell(new_cell));
|
||||
|
||||
self.scroll_to_reveal_row(new_row, action.direction);
|
||||
self.selection = Some(if extend {
|
||||
CellSelection::new(anchor, new_cell)
|
||||
} else {
|
||||
CellSelection::single_cell(new_cell)
|
||||
});
|
||||
|
||||
self.scroll_to_reveal_row(new_row, direction);
|
||||
self.scroll_to_reveal_column(new_column, window, cx);
|
||||
cx.notify();
|
||||
}
|
||||
|
||||
pub fn clear_selection(
|
||||
&mut self,
|
||||
_: &ClearSelection,
|
||||
_window: &mut Window,
|
||||
cx: &mut Context<Self>,
|
||||
) {
|
||||
if !self.is_selection_enabled() {
|
||||
return;
|
||||
}
|
||||
|
||||
if self.selection.take().is_some() {
|
||||
cx.notify();
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn scroll_to_reveal_row(&self, row: usize, direction: NavigationDirection) {
|
||||
let row_count = self.engine.d2d_mapping().visible_row_count();
|
||||
if row_count == 0 {
|
||||
@@ -311,16 +382,55 @@ impl TableView {
|
||||
&self,
|
||||
current: (usize, usize),
|
||||
direction: NavigationDirection,
|
||||
unit: MoveUnit,
|
||||
_cx: &App,
|
||||
) -> (usize, usize) {
|
||||
let row_count = self.engine.d2d_mapping().visible_row_count();
|
||||
let column_count = self.engine.contents.number_of_cols;
|
||||
let (row, column) = current;
|
||||
|
||||
let item_height = self.row_height + px(1.0);
|
||||
let viewport_height = self.list_state.viewport_bounds().size.height;
|
||||
let visible_rows = if item_height > px(0.) && viewport_height > px(0.) {
|
||||
(viewport_height / item_height).floor() as usize
|
||||
} else {
|
||||
1
|
||||
};
|
||||
// 1 row of context overlap: moving by (visible_rows - 2) ensures that
|
||||
// jumping from an edge leaves exactly 1 row of context, perfectly matching the 1-row reveal cushion.
|
||||
let page_rows = visible_rows.saturating_sub(2).max(1);
|
||||
|
||||
match direction {
|
||||
NavigationDirection::Up => (row.saturating_sub(1), column),
|
||||
NavigationDirection::Down => ((row + 1).min(row_count.saturating_sub(1)), column),
|
||||
NavigationDirection::Left => (row, column.saturating_sub(1)),
|
||||
NavigationDirection::Right => (row, (column + 1).min(column_count.saturating_sub(1))),
|
||||
NavigationDirection::Up => {
|
||||
let delta = match unit {
|
||||
MoveUnit::Cell => 1,
|
||||
MoveUnit::Page => page_rows,
|
||||
MoveUnit::Edge => row,
|
||||
};
|
||||
(row.saturating_sub(delta), column)
|
||||
}
|
||||
NavigationDirection::Down => {
|
||||
let delta = match unit {
|
||||
MoveUnit::Cell => 1,
|
||||
MoveUnit::Page => page_rows,
|
||||
MoveUnit::Edge => row_count.saturating_sub(1).saturating_sub(row),
|
||||
};
|
||||
((row + delta).min(row_count.saturating_sub(1)), column)
|
||||
}
|
||||
NavigationDirection::Left => {
|
||||
let delta = match unit {
|
||||
MoveUnit::Cell | MoveUnit::Page => 1,
|
||||
MoveUnit::Edge => column,
|
||||
};
|
||||
(row, column.saturating_sub(delta))
|
||||
}
|
||||
NavigationDirection::Right => {
|
||||
let delta = match unit {
|
||||
MoveUnit::Cell | MoveUnit::Page => 1,
|
||||
MoveUnit::Edge => column_count.saturating_sub(1).saturating_sub(column),
|
||||
};
|
||||
(row, (column + delta).min(column_count.saturating_sub(1)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -365,6 +475,8 @@ impl Focusable for TableView {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::sync::Arc;
|
||||
|
||||
use gpui::{Action, TestAppContext, VisualTestContext};
|
||||
|
||||
use super::*;
|
||||
@@ -415,6 +527,17 @@ mod tests {
|
||||
});
|
||||
}
|
||||
|
||||
fn selection_bounds(
|
||||
view: &Entity<TableView>,
|
||||
cx: &VisualTestContext,
|
||||
) -> Option<(RangeInclusive<usize>, RangeInclusive<usize>)> {
|
||||
view.read_with(cx, |this, _| {
|
||||
this.selection
|
||||
.as_ref()?
|
||||
.display_bounds(this.engine.d2d_mapping())
|
||||
})
|
||||
}
|
||||
|
||||
fn selection_cells(
|
||||
view: &Entity<TableView>,
|
||||
cx: &VisualTestContext,
|
||||
@@ -425,32 +548,55 @@ mod tests {
|
||||
})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cell_selection_display_bounds() {
|
||||
let mut d2d = DisplayToDataMapping::default();
|
||||
d2d.mapping = Arc::new(HashMap::from([
|
||||
(DisplayRow(0), DataRow(5)),
|
||||
(DisplayRow(1), DataRow(2)),
|
||||
(DisplayRow(2), DataRow(8)),
|
||||
]));
|
||||
|
||||
let selection = CellSelection::new(
|
||||
DataCellId::new(DataRow(5), AnyColumn(1)),
|
||||
DataCellId::new(DataRow(8), AnyColumn(3)),
|
||||
);
|
||||
|
||||
assert_eq!(selection.display_bounds(&d2d), Some((0..=2, 1..=3)));
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_compute_move_directions(cx: &mut TestAppContext) {
|
||||
fn test_compute_move_directions_and_edges(cx: &mut TestAppContext) {
|
||||
let (view, cx) = setup_test_view(cx, 10, 5);
|
||||
|
||||
use NavigationDirection as Nav;
|
||||
view.read_with(cx, |this, _| {
|
||||
assert_eq!(this.compute_move((0, 0), Nav::Down), (1, 0));
|
||||
assert_eq!(this.compute_move((0, 0), Nav::Right), (0, 1));
|
||||
assert_eq!(this.compute_move((0, 0), Nav::Up), (0, 0));
|
||||
assert_eq!(this.compute_move((0, 0), Nav::Left), (0, 0));
|
||||
assert_eq!(this.compute_move((9, 4), Nav::Down), (9, 4));
|
||||
assert_eq!(this.compute_move((9, 4), Nav::Right), (9, 4));
|
||||
view.read_with(cx, |this, cx| {
|
||||
use MoveUnit as U;
|
||||
use NavigationDirection as N;
|
||||
assert_eq!(this.compute_move((0, 0), N::Down, U::Cell, cx), (1, 0));
|
||||
assert_eq!(this.compute_move((0, 0), N::Right, U::Cell, cx), (0, 1));
|
||||
assert_eq!(this.compute_move((0, 0), N::Up, U::Cell, cx), (0, 0));
|
||||
assert_eq!(this.compute_move((0, 0), N::Left, U::Cell, cx), (0, 0));
|
||||
assert_eq!(this.compute_move((9, 4), N::Down, U::Cell, cx), (9, 4));
|
||||
assert_eq!(this.compute_move((9, 4), N::Right, U::Cell, cx), (9, 4));
|
||||
assert_eq!(this.compute_move((3, 2), N::Up, U::Edge, cx), (0, 2));
|
||||
assert_eq!(this.compute_move((3, 2), N::Down, U::Edge, cx), (9, 2));
|
||||
assert_eq!(this.compute_move((3, 2), N::Left, U::Edge, cx), (3, 0));
|
||||
assert_eq!(this.compute_move((3, 2), N::Right, U::Edge, cx), (3, 4));
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_move_focused_cell_action(cx: &mut TestAppContext) {
|
||||
fn test_navigation_and_selection_actions(cx: &mut TestAppContext) {
|
||||
let (view, cx) = setup_test_view(cx, 10, 5);
|
||||
|
||||
let cell = |row, column| DataCellId::new(DataRow(row), AnyColumn(column));
|
||||
let move_focus = |direction, unit| MoveFocusedCell { direction, unit };
|
||||
let extend = |direction, unit| ExtendSelection { direction, unit };
|
||||
|
||||
// 1. First move initializes focus at (0, 0)
|
||||
dispatch(
|
||||
&view,
|
||||
&MoveFocusedCell {
|
||||
direction: NavigationDirection::Down,
|
||||
},
|
||||
&move_focus(NavigationDirection::Down, MoveUnit::Cell),
|
||||
cx,
|
||||
);
|
||||
assert_eq!(selection_cells(&view, cx), Some((cell(0, 0), cell(0, 0))));
|
||||
@@ -458,18 +604,41 @@ mod tests {
|
||||
// 2. Step Down and Right -> single cell focus at (1, 1)
|
||||
dispatch(
|
||||
&view,
|
||||
&MoveFocusedCell {
|
||||
direction: NavigationDirection::Down,
|
||||
},
|
||||
&move_focus(NavigationDirection::Down, MoveUnit::Cell),
|
||||
cx,
|
||||
);
|
||||
dispatch(
|
||||
&view,
|
||||
&MoveFocusedCell {
|
||||
direction: NavigationDirection::Right,
|
||||
},
|
||||
&move_focus(NavigationDirection::Right, MoveUnit::Cell),
|
||||
cx,
|
||||
);
|
||||
assert_eq!(selection_cells(&view, cx), Some((cell(1, 1), cell(1, 1))));
|
||||
|
||||
// 3. Extend selection Down and Right -> bounding box (1..=2, 1..=2)
|
||||
dispatch(
|
||||
&view,
|
||||
&extend(NavigationDirection::Down, MoveUnit::Cell),
|
||||
cx,
|
||||
);
|
||||
dispatch(
|
||||
&view,
|
||||
&extend(NavigationDirection::Right, MoveUnit::Cell),
|
||||
cx,
|
||||
);
|
||||
assert_eq!(selection_cells(&view, cx), Some((cell(1, 1), cell(2, 2))));
|
||||
assert_eq!(selection_bounds(&view, cx), Some((1..=2, 1..=2)));
|
||||
|
||||
// 4. Extend to bottom edge -> bounding box (1..=9, 1..=2)
|
||||
dispatch(
|
||||
&view,
|
||||
&extend(NavigationDirection::Down, MoveUnit::Edge),
|
||||
cx,
|
||||
);
|
||||
assert_eq!(selection_cells(&view, cx), Some((cell(1, 1), cell(9, 2))));
|
||||
assert_eq!(selection_bounds(&view, cx), Some((1..=9, 1..=2)));
|
||||
|
||||
// 5. Clear selection
|
||||
dispatch(&view, &ClearSelection, cx);
|
||||
assert_eq!(selection_bounds(&view, cx), None);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,10 @@ mod table_data_engine;
|
||||
mod table_view;
|
||||
pub mod types;
|
||||
|
||||
actions!(tabular_data, [OpenPreview, OpenPreviewToTheSide]);
|
||||
actions!(
|
||||
tabular_data,
|
||||
[OpenPreview, OpenPreviewToTheSide, ClearSelection]
|
||||
);
|
||||
|
||||
#[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq, JsonSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
@@ -29,10 +32,32 @@ pub enum NavigationDirection {
|
||||
Right,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq, JsonSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum MoveUnit {
|
||||
/// Move one cell. Default when `unit` is omitted in JSON keybindings.
|
||||
#[default]
|
||||
Cell,
|
||||
/// Move by one visible page (vertical only; horizontal degrades to `Cell`).
|
||||
Page,
|
||||
/// Jump to the first or last cell on the axis.
|
||||
Edge,
|
||||
}
|
||||
|
||||
#[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
|
||||
#[action(namespace = tabular_data)]
|
||||
pub struct MoveFocusedCell {
|
||||
pub direction: NavigationDirection,
|
||||
#[serde(default)]
|
||||
pub unit: MoveUnit,
|
||||
}
|
||||
|
||||
#[derive(Clone, Deserialize, PartialEq, JsonSchema, Action)]
|
||||
#[action(namespace = tabular_data)]
|
||||
pub struct ExtendSelection {
|
||||
pub direction: NavigationDirection,
|
||||
#[serde(default)]
|
||||
pub unit: MoveUnit,
|
||||
}
|
||||
|
||||
/// Editor-backed adapter: watches an [`Editor`], parses its buffer into a [`crate::types::TableLikeContent`],
|
||||
|
||||
Reference in New Issue
Block a user