From 94fa5e2ef20ab519484638d34be6bbb5238a256c Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Sat, 2 Apr 2022 21:58:54 +0100
Subject: [PATCH] Use `Action<string>` for event `OnChatMessageCommitted` &
 clear textbox internally

---
 osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs | 5 ++---
 osu.Game/Overlays/Chat/ChatTextBar.cs                | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs b/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs
index 42d4a8efbd..e5dd492183 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatTextBox.cs
@@ -88,11 +88,10 @@ namespace osu.Game.Tests.Visual.Online
                     },
                 };
 
-                bar.OnChatMessageCommit += (sender, newText) =>
+                bar.OnChatMessageCommitted += text =>
                 {
-                    commitText.Text = $"OnChatMessageCommit: {sender.Text}";
+                    commitText.Text = $"OnChatMessageCommitted: {text}";
                     commitText.FadeOutFromOne(1000, Easing.InQuint);
-                    sender.Text = string.Empty;
                 };
 
                 bar.OnSearchTermsChanged += text =>
diff --git a/osu.Game/Overlays/Chat/ChatTextBar.cs b/osu.Game/Overlays/Chat/ChatTextBar.cs
index 0eb8056d76..531c417abc 100644
--- a/osu.Game/Overlays/Chat/ChatTextBar.cs
+++ b/osu.Game/Overlays/Chat/ChatTextBar.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Chat
     {
         public readonly BindableBool ShowSearch = new BindableBool();
 
-        public event TextBox.OnCommitHandler? OnChatMessageCommit;
+        public event Action<string>? OnChatMessageCommitted;
 
         public event Action<string>? OnSearchTermsChanged;
 
@@ -154,7 +154,9 @@ namespace osu.Game.Overlays.Chat
         private void chatTextBoxCommit(TextBox sender, bool newText)
         {
             if (!ShowSearch.Value)
-                OnChatMessageCommit?.Invoke(sender, newText);
+                OnChatMessageCommitted?.Invoke(sender.Text);
+
+            sender.Text = string.Empty;
         }
     }
 }