From c0d117182fc4c20f750c28345967e64855265227 Mon Sep 17 00:00:00 2001 From: Remco Smits Date: Thu, 4 Apr 2024 08:36:27 +0200 Subject: [PATCH] Fix clear reply to message and edit message state when you switch state (#10044) This pull request fixes the following issue #10042. Release Notes: - Fixed clear chat state when switching edit/reply message state. ([#10042](https://github.com/zed-industries/zed/issues/10042)). --- crates/collab_ui/src/chat_panel.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs index 39dfb46c655c7..f1e3cab3524e9 100644 --- a/crates/collab_ui/src/chat_panel.rs +++ b/crates/collab_ui/src/chat_panel.rs @@ -615,6 +615,8 @@ impl ChatPanel { .child( IconButton::new(("reply", message_id), IconName::ReplyArrowRight) .on_click(cx.listener(move |this, _, cx| { + this.cancel_edit_message(cx); + this.message_editor.update(cx, |editor, cx| { editor.set_reply_to_message_id(message_id); editor.focus_handle(cx).focus(cx); @@ -636,6 +638,8 @@ impl ChatPanel { IconButton::new(("edit", message_id), IconName::Pencil) .on_click(cx.listener(move |this, _, cx| { this.message_editor.update(cx, |editor, cx| { + editor.clear_reply_to_message_id(); + let message = this .active_chat() .and_then(|active_chat| {