From ff06a27a1237bc71febd6b4027449346c7c07ccd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 27 Apr 2021 18:33:39 +0900
Subject: [PATCH] Revert changes to `OnBlueprint` methods and handle
 select-on-addition locally

---
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs   | 2 +-
 .../Edit/Compose/Components/EditorBlueprintContainer.cs    | 7 -------
 .../Screens/Edit/Compose/Components/SelectionHandler.cs    | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 994e862946..f22404e77d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -251,7 +251,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         public virtual OverlaySelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject) => null;
 
-        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> item)
+        protected override void OnBlueprintAdded(HitObject item)
         {
             base.OnBlueprintAdded(item);
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
index 0cb9cf930c..d17892d6ba 100644
--- a/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/EditorBlueprintContainer.cs
@@ -108,13 +108,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(item);
         }
 
-        protected override void OnBlueprintAdded(SelectionBlueprint<HitObject> blueprint)
-        {
-            base.OnBlueprintAdded(blueprint);
-            if (Beatmap.SelectedHitObjects.Contains(blueprint.Item))
-                blueprint.Select();
-        }
-
         protected override void UpdateSelection()
         {
             base.UpdateSelection();
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index 4b99aa5da7..52c148f852 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         public IReadOnlyList<SelectionBlueprint<T>> SelectedBlueprints => selectedBlueprints;
 
-        protected BindableList<T> SelectedItems = new BindableList<T>();
+        public BindableList<T> SelectedItems = new BindableList<T>();
 
         private readonly List<SelectionBlueprint<T>> selectedBlueprints;