Merge pull request #6302 from smoogipoo/fix-dropdown-remove-on-change

Fix crash when dropdown is removed from hierarchy during select
ppy · May 27, 2024 · ea28ffb · ea28ffb
2 parents efb30d9 + 3b26686
commit ea28ffb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs
@@ -312,7 +312,6 @@ void checkOrder(int index, string item) => AddAssert($"item #{index + 1} is '{it
         }
 
         [Test]
-        [Solo]
         public void TestExternalManagement()
         {
             TestDropdown dropdown = null!;
@@ -483,6 +482,32 @@ public void TestSetNonExistentItem([Values] bool afterBdl)
             AddAssert("text is expected", () => dropdown.SelectedItem.Text.Value.ToString(), () => Is.EqualTo("loaded: non-existent item"));
         }
 
+        [Test]
+        public void TestRemoveDropdownOnSelect()
+        {
+            TestDropdown testDropdown = null!;
+            Bindable<TestModel?> bindable = null!;
+
+            AddStep("setup dropdown", () =>
+            {
+                bindable = new Bindable<TestModel?>();
+                bindable.ValueChanged += _ => createDropdown();
+
+                testDropdown = createDropdown();
+                testDropdown.Current = bindable;
+            });
+
+            toggleDropdownViaClick(() => testDropdown);
+
+            AddStep("click item 2", () =>
+            {
+                InputManager.MoveMouseTo(testDropdown.Menu.Children[2]);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddAssert("bindable value is item 2", () => bindable.Value?.Identifier == "test 2");
+        }
+
         #region Searching
 
         [Test]

diff --git a/osu.Framework/Graphics/UserInterface/Dropdown.cs b/osu.Framework/Graphics/UserInterface/Dropdown.cs
@@ -839,9 +839,9 @@ void IDropdown.CommitPreselection()
             SelectedItem = (DropdownMenuItem<T>)preselectedItem.Item;
         }
 
-        void IDropdown.TriggerFocusContention(Drawable triggerSource) => GetContainingFocusManager().TriggerFocusContention(triggerSource);
+        void IDropdown.TriggerFocusContention(Drawable triggerSource) => GetContainingFocusManager()?.TriggerFocusContention(triggerSource);
 
-        bool IDropdown.ChangeFocus(Drawable potentialFocusTarget) => GetContainingFocusManager().ChangeFocus(potentialFocusTarget);
+        bool IDropdown.ChangeFocus(Drawable potentialFocusTarget) => GetContainingFocusManager()?.ChangeFocus(potentialFocusTarget) ?? false;
 
         #endregion
     }