From bf3fc3cc6e8f181d3a7a19d2cf0a5efae43a7bbb Mon Sep 17 00:00:00 2001
From: YarilaFox <102650794+YarilaFox@users.noreply.github.com>
Date: Tue, 20 Oct 2026 16:23:47 +0500
Subject: [PATCH] M7: dismiss comment draft when switching tools

---
 crates/ui-egui/src/comments_tests.rs | 14 +++++++++++++-
 crates/ui-egui/src/lib.rs            |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/crates/ui-egui/src/comments_tests.rs b/crates/ui-egui/src/comments_tests.rs
index 696ff322..f1b32a4b 100644
--- a/crates/ui-egui/src/comments_tests.rs
+++ b/crates/ui-egui/src/comments_tests.rs
@@ -7,7 +7,7 @@ use egui::{Event, Key, Modifiers, Pos2, pos2, vec2};
 use figcraft_engine::Session;
 use serde_json::{Value, json};
 
-use crate::comments::{cluster, insert_mention, mention_matches, mention_query};
+use crate::comments::{cluster, insert_mention, mention_matches, mention_query, start_draft};
 use crate::present_tests::{Ui, id};
 
 fn add(s: &mut Session, x: f64, y: f64, text: &str, author: &str) -> u64 {
@@ -41,6 +41,18 @@ fn comments(u: &Ui) -> Value {
     u.app.inspect()["comments"].clone()
 }
 
+#[test]
+fn switching_from_comment_to_move_closes_the_unposted_composer() {
+    let mut u = Ui::new(Session::new());
+    u.app.run("tool.set", json!({"tool": "comment"}));
+    start_draft(&mut u.app, 100.0, 80.0);
+    assert!(comments(&u)["draft"].is_array());
+
+    u.app.run("tool.set", json!({"tool": "move"}));
+    u.frame(vec![]);
+    assert!(comments(&u)["draft"].is_null());
+}
+
 #[test]
 fn mention_helpers() {
     // The `@query` before the cursor.
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 072aec62..06114286 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -834,6 +834,9 @@ impl FigApp {
     /// Run a command, surfacing errors as a toast. Returns the result.
     pub fn run(&mut self, id: &str, params: Value) -> Option<Value> {
         let r = self.session.execute(id, &params);
+        if id == "tool.set" && r.is_ok() && self.session.tool.tool != figcraft_engine::tools::ToolId::Comment {
+            self.ui.comments.draft = None;
+        }
         self.handle_ui_requests();
         r.map_err(|e| self.failed(id, &e)).ok()
     }