aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-11-02 22:50:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1068: Table › Convert Rows › To Header, To Body and To Footer

Browse Source 
crates/engine/src/cmd/table.rs: add the PR's three commands before the branch's select commands, which keep their target descriptions (#803).
docs/gaps.md: keep the branch's text; Convert Rows leaves the list of missing menu items.
This commit is contained in:
aiongg
2026-10-16 04:08:22 +00:00
parent 6e4f122b8c f65eb0fd42
commit 42eaf774e9
8 changed files with 193 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/table.rs
+49 -1
View File
@@ -9,7 +9,7 @@
use designcraft_compose as compose;
use designcraft_doc::story::floor_char_boundary;
use designcraft_doc::{
AltFills, CellAddr, CellRange, CellStroke, Document, RowHeightMode, Selection, StoryId, StrokeType, Table, TableSel, TextSel,
AltFills, CellAddr, CellRange, CellStroke, Document, RowHeightMode, RowKind, Selection, StoryId, StrokeType, Table, TableSel, TextSel,
VerticalJustification,
};
use serde_json::{Value, json};
@@ -364,6 +364,33 @@ fn table_specs() -> Vec<CommandSpec> {
in_table,
options
),
cmd!(
"table.convertRowsToHeader",
"To Header",
["Table", "Convert Rows"],
None,
"{rows?: [a,b]} — the target rows, at the top of the table or right after its header rows",
|s| can_convert_rows(s, RowKind::Header),
|s, p| convert_rows(s, p, RowKind::Header)
),
cmd!(
"table.convertRowsToBody",
"To Body",
["Table", "Convert Rows"],
None,
"{rows?: [a,b]} — the target header rows next to the body, footer rows next to it, or both",
|s| can_convert_rows(s, RowKind::Body),
|s, p| convert_rows(s, p, RowKind::Body)
),
cmd!(
"table.convertRowsToFooter",
"To Footer",
["Table", "Convert Rows"],
None,
"{rows?: [a,b]} — the target rows, at the bottom of the table or right before its footer rows",
|s| can_convert_rows(s, RowKind::Footer),
|s, p| convert_rows(s, p, RowKind::Footer)
),
cmd!(noundo "table.select", "Select Cells", [], None, "{story?, table?, rows?: [a,b] | row?, cols?: [a,b] | col?, what?: cell|row|column|table}", in_table_or_ids, select),
cmd!(noundo "table.selectTable", "Select Table", ["Table", "Select"], None, "{story?, table?, rows?: [a, b] | row?, cols?: [a, b] | col? (the target cells; default: the selection)}", in_table, |s, p| {
select(s, &super::with_param(p, "what", json!("table")))
@@ -1401,6 +1428,27 @@ fn options(s: &mut Session, p: &Value) -> Result<Value> {
})
}
/// Convert Rows is greyed out unless the selected cells (or the caret's cell) can change kind.
fn can_convert_rows(s: &Session, kind: RowKind) -> std::result::Result<(), String> {
let st = s.active().ok_or("no document open")?;
if st.selection.cells.is_none() {
in_cell(s)?;
}
let g = target(s, &Value::Null, "table.convertRows").map_err(|e| e.to_string())?;
let t = st.doc.story(g.story).and_then(|x| x.tables.get(&g.table)).ok_or("no table")?;
t.convert_rows_counts(g.range.r0, g.range.r1, kind).map(|_| ())
}
fn convert_rows(s: &mut Session, p: &Value, kind: RowKind) -> Result<Value> {
const ID: &str = "table.convertRows";
let g = target(s, p, ID)?;
edit_table(s, &g, ID, |t| {
let (h, f) = t.convert_rows_counts(g.range.r0, g.range.r1, kind).map_err(|e| bad(ID, e))?;
t.set_header_footer(h, f);
Ok(json!({"headerRows": h, "footerRows": f}))
})
}
// ---------- selection ----------
fn select(s: &mut Session, p: &Value) -> Result<Value> {