From 826b35e031d7620d8dbd0e3aba800f7fef6458bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 22 Oct 2024 11:36:00 +0200
Subject: [PATCH] Use `SearchContainer` instead of manual search implementation

---
 .../Overlays/Chat/ChannelList/ChannelList.cs  | 26 +++---------------
 .../Chat/ChannelList/ChannelListItem.cs       | 27 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
index c674263bd1ae..b0db87cc643d 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelList.cs
@@ -37,7 +37,7 @@ public partial class ChannelList : Container
         private readonly Dictionary<Channel, ChannelListItem> channelMap = new Dictionary<Channel, ChannelListItem>();
 
         private OsuScrollContainer scroll = null!;
-        private FillFlowContainer groupFlow = null!;
+        private SearchContainer groupFlow = null!;
         private ChannelGroup announceChannelGroup = null!;
         private ChannelGroup publicChannelGroup = null!;
         private ChannelGroup privateChannelGroup = null!;
@@ -59,7 +59,7 @@ private void load(OverlayColourProvider colourProvider)
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarAnchor = Anchor.TopRight,
                     ScrollDistance = 35f,
-                    Child = groupFlow = new FillFlowContainer
+                    Child = groupFlow = new SearchContainer
                     {
                         Direction = FillDirection.Vertical,
                         RelativeSizeAxes = Axes.X,
@@ -87,10 +87,7 @@ private void load(OverlayColourProvider colourProvider)
                 },
             };
 
-            searchTextBox.OnUpdate += (newText) =>
-            {
-                privateChannelGroup.FilterChannels(searchTextBox.Text);
-            };
+            searchTextBox.Current.BindValueChanged(_ => groupFlow.SearchTerm = searchTextBox.Current.Value, true);
 
             selector.OnRequestSelect += chan => OnRequestSelect?.Invoke(chan);
         }
@@ -188,23 +185,6 @@ public ChannelGroup(LocalisableString label)
                     },
                 };
             }
-
-            public void FilterChannels(string searchTerm)
-            {
-                foreach (var item in ItemFlow.Children)
-                {
-                    if (string.IsNullOrEmpty(searchTerm))
-                    {
-                        item.Show();
-                        continue;
-                    }
-
-                    if (item.Channel.Name.Contains(searchTerm, StringComparison.OrdinalIgnoreCase))
-                        item.Show();
-                    else
-                        item.Hide();
-                }
-            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
index e8c251e7fd41..b197fe199d3a 100644
--- a/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelList/ChannelListItem.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -9,6 +10,7 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -19,7 +21,7 @@
 
 namespace osu.Game.Overlays.Chat.ChannelList
 {
-    public partial class ChannelListItem : OsuClickableContainer
+    public partial class ChannelListItem : OsuClickableContainer, IFilterable
     {
         public event Action<Channel>? OnRequestSelect;
         public event Action<Channel>? OnRequestLeave;
@@ -186,5 +188,28 @@ private void updateState()
         }
 
         private bool isSelector => Channel is ChannelListing.ChannelListingChannel;
+
+        #region Filtering support
+
+        public IEnumerable<LocalisableString> FilterTerms => isSelector ? Enumerable.Empty<LocalisableString>() : [Channel.Name];
+
+        private bool matchingFilter = true;
+
+        public bool MatchingFilter
+        {
+            get => matchingFilter;
+            set
+            {
+                if (matchingFilter == value)
+                    return;
+
+                matchingFilter = value;
+                Alpha = matchingFilter ? 1 : 0;
+            }
+        }
+
+        public bool FilteringActive { get; set; }
+
+        #endregion
     }
 }