Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Table keys: the selection helpers by their paths on main's split modules

moppeeere96baa7f7f33
diff --git a/crates/engine/src/cmd/table.rs b/crates/engine/src/cmd/table.rs
index 2a124e7a9..7c2f182ea 100644
--- a/crates/engine/src/cmd/table.rs
+++ b/crates/engine/src/cmd/table.rs
@@ -28,4 +28,4 @@ mod styles;
mod target;
pub use registry::specs;
-pub(crate) use selection::step_cell;
+pub(crate) use selection::{one_selected_cell_to_text, step_cell};
diff --git a/crates/engine/src/cmd/table/registry.rs b/crates/engine/src/cmd/table/registry.rs
index 19cad9907..ee782609c 100644
--- a/crates/engine/src/cmd/table/registry.rs
+++ b/crates/engine/src/cmd/table/registry.rs
@@ -1,7 +1,7 @@
use super::cell::{get_cell_stroke, set_cell};
use super::content::{drop_cells, place_graphic, sort_rows};
use super::options::{get, options};
-use super::selection::{move_rc, select, step_cell};
+use super::selection::{move_rc, select, step_cell, toggle_selection};
use super::sizing::{distribute_cols, distribute_rows, resize_border, set_col_width, set_row_height};
use super::structure::{
can_convert_rows, convert_from_text, convert_rows, convert_to_text, delete_cols, delete_rows, delete_table, insert, insert_col, insert_row,
diff --git a/crates/engine/src/cmd/table/selection.rs b/crates/engine/src/cmd/table/selection.rs
index 00582fb4d..656dfdd78 100644
--- a/crates/engine/src/cmd/table/selection.rs
+++ b/crates/engine/src/cmd/table/selection.rs
@@ -84,7 +84,7 @@ pub(crate) fn one_selected_cell_to_text(s: &mut Session) -> Result<()> {
/// Esc in a table: text in a cell becomes that cell's selection, and selected cells the text of
/// the first one (InDesign toggles between the two).
-fn toggle_selection(s: &mut Session) -> Result<Value> {
+pub(super) fn toggle_selection(s: &mut Session) -> Result<Value> {
const ID: &str = "table.toggleSelection";
let st = s.doc_mut()?;
let t = st.selection.text.ok_or_else(|| bad(ID, "no caret"))?;
diff --git a/crates/engine/src/cmd/text/edit.rs b/crates/engine/src/cmd/text/edit.rs
index 7d896c999..21888cb22 100644
--- a/crates/engine/src/cmd/text/edit.rs
+++ b/crates/engine/src/cmd/text/edit.rs
@@ -18,7 +18,7 @@ pub(super) fn insert(s: &mut Session, p: &Value) -> Result<Value> {
return crate::cmd::table::step_cell(s, true);
}
// Typing with one cell selected replaces its text, as InDesign.
- super::table::one_selected_cell_to_text(s)?;
+ crate::cmd::table::one_selected_cell_to_text(s)?;
let raw = p.get("raw").and_then(Value::as_bool).unwrap_or(false);
let text = if s.prefs.typographers_quotes && !raw { smart_quotes(s, &text) } else { text };
let tracking = s.doc()?.doc.settings.track_changes;