DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Merge pull request #1780 from dotCooCoo/fix/note-delete-keeps-caret
Brandon Thomas94bf1bf7f9db
diff --cc crates/engine/src/cmd/notes.rsindex 1a16c4bf6,fd08e9314..008f0a98f--- a/crates/engine/src/cmd/notes.rs+++ b/crates/engine/src/cmd/notes.rs@@@ -145,20 -157,16 +159,21 @@@ fn set_text(s: &mut Session, p: &Valuefn delete(s: &mut Session, p: &Value) -> Result<Value> {let sid = story_id(p, "footnote.delete")?;let id = note_id(p, "footnote.delete")?;- s.edit(|d, sel| {+ let moved = s.edit(|d, sel| {let st = d.story_mut(sid).ok_or(designcraft_doc::DocError::NoStory(sid))?;let at = st.note_anchor(id).ok_or_else(|| bad("footnote.delete", format!("no footnote {id}")))?;+ follow_delete(sel, sid, at..at + designcraft_doc::FOOTNOTE_REF.len_utf8());st.delete(at..at + designcraft_doc::FOOTNOTE_REF.len_utf8());- if sel.text.is_some_and(|t| t.story == sid && t.cell == Some(CellAddr::footnote(id))) {+ let moved = sel.text.is_some_and(|t| t.story == sid && t.cell == Some(CellAddr::footnote(id)));+ if moved {sel.text = Some(TextSel::caret(sid, at));}- Ok(Value::Null)- })+ Ok(moved)+ })?;+ if moved {+ s.typing_format = None;+ }+ Ok(Value::Null)}fn go_to_reference(s: &mut Session, _: &Value) -> Result<Value> {