From c7404f44bc6b5db832ae656db917be130841c4e2 Mon Sep 17 00:00:00 2001
From: mtlcl410 <2368091+mtlcl410@users.noreply.github.com>
Date: Mon, 2 Nov 2026 08:41:35 +0800
Subject: [PATCH] M7: reverting forgets a signature placed since the last save
 (#2149)

File > Revert discards a signature placed since the last save, but its marker stayed, so the
next save asked to lock a signature that was gone whenever the saved file held an earlier
Fill & Sign mark. A successful revert now clears the marker.

Review on #2348 (CodeRabbit).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Pq7HyCfwzyRXj4VfQAVVdv
---
 crates/ui-egui/src/editing/close.rs  |  3 +++
 crates/ui-egui/tests/it/fill_sign.rs | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/crates/ui-egui/src/editing/close.rs b/crates/ui-egui/src/editing/close.rs
index 55d884cd9a..53f5b04eec 100644
--- a/crates/ui-egui/src/editing/close.rs
+++ b/crates/ui-egui/src/editing/close.rs
@@ -55,6 +55,9 @@ impl PdfCraftApp {
                     view.forms.unbaked.clear();
                     view.pending_edit = None;
                 }
+                // A signature placed since the last save is gone with the rest: the next save
+                // doesn't ask to lock it (#2149).
+                self.placed_signatures.remove(&id);
                 self.notify_tr("Reverted to the last saved version");
             }
             Err(e) => self.notify_error(e),
diff --git a/crates/ui-egui/tests/it/fill_sign.rs b/crates/ui-egui/tests/it/fill_sign.rs
index 4498f7cd16..ff1bcbcdb4 100644
--- a/crates/ui-egui/tests/it/fill_sign.rs
+++ b/crates/ui-egui/tests/it/fill_sign.rs
@@ -1814,6 +1814,34 @@ fn the_first_save_after_placing_a_signature_asks_to_lock_it() {
     let _ = std::fs::remove_file(&out);
 }
 
+/// #2348 review (CodeRabbit): File ▸ Revert discards a signature just placed, so the save after it
+/// doesn't ask to lock one, even when the saved file holds an earlier Fill & Sign signature.
+#[test]
+fn reverting_forgets_a_signature_just_placed() {
+    let out = std::env::temp_dir().join(format!("pdfcraft-lock-revert-{}.pdf", std::process::id()));
+    let mut h = harness();
+    h.state_mut().save_override = Some(out.to_string_lossy().into_owned());
+    h.state_mut().signature = Some(SavedSig::Typed("Ada Lovelace".into()));
+    // An earlier signature, saved as a comment: the file keeps a Fill & Sign mark.
+    h.state_mut().execute("sign.fill.signature");
+    h.run_steps(2);
+    click(&mut h, 40.0, 300.0);
+    assert!(!h.state_mut().save_active(SaveTarget::InPlace), "asks first");
+    h.run_steps(2);
+    h.get_by_label("Keep editable").click();
+    h.run_steps(3);
+    // A new signature, then Revert: the new one is gone, the saved one stays.
+    h.state_mut().execute("sign.fill.signature");
+    h.run_steps(2);
+    click(&mut h, 40.0, 200.0);
+    h.state_mut().revert_active();
+    h.run_steps(3);
+    let marks = h.state().session.get(h.state().views[0].id).unwrap().info.annotations.iter().filter(|a| a.fill_sign).count();
+    assert_eq!(marks, 1, "the saved signature is back, the new one is gone");
+    assert!(h.state_mut().save_active(SaveTarget::InPlace), "no signature was placed since the last save: no question");
+    let _ = std::fs::remove_file(&out);
+}
+
 /// #2348 review (benandez): right after a signature is placed, a notice offers to lock it into
 /// the page now. Lock now flattens it (undoable) without saving, so the save that follows doesn't
 /// ask; undoing the lock brings back both the notice and the question. Dismiss hides the notice