chore: Adjustments for CI

unoplatform · Sep 26, 2024 · 94a2fbb · 94a2fbb
1 parent eb0d211
commit 94a2fbb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/src/Uno.UI.RuntimeTests/IntegrationTests/dxaml/controls/combobox/ComboBoxIntegrationTests.cs b/src/Uno.UI.RuntimeTests/IntegrationTests/dxaml/controls/combobox/ComboBoxIntegrationTests.cs
@@ -2883,8 +2883,6 @@ public async Task ValidateFocusStateOfClosedComboBoxWhenOpenedWithMouseAndClosed
 
 	private async Task ValidateFocusStateOfClosedComboBoxWorker(ComboBoxHelper.OpenMethod openMethod, ComboBoxHelper.CloseMethod closeMethod, FocusState expectedFocusState)
 	{
-
-
 		ComboBox comboBox = await SetupBasicComboBoxTest();
 
 		await RunOnUIThread(() =>

diff --git a/src/Uno.UI/UI/Xaml/Controls/ComboBox/ComboBox.partial.h.mux.cs b/src/Uno.UI/UI/Xaml/Controls/ComboBox/ComboBox.partial.h.mux.cs
@@ -12,12 +12,13 @@ partial class ComboBox
 	private const char VK_ESCAPE = (char)0x1B;
 
 	// TODO MZ: These disablings should not be required
-#pragma warning disable CS0067 // Unused only in reference API.
-#pragma warning disable CS0649 // Unused only in reference API.
-#pragma warning disable CS0169 // Unused only in reference API.
-#pragma warning disable CS0168 // Unused only in reference API.
-#pragma warning disable CS0414 // Unused only in reference API.
-#pragma warning disable IDE0055 // Unused only in reference API.
+#pragma warning disable CS0067 // Unused
+#pragma warning disable CS0649 // Unused
+#pragma warning disable CS0169 // Unused
+#pragma warning disable CS0168 // Unused
+#pragma warning disable CS0414 // Unused
+#pragma warning disable IDE0051 // Unused
+#pragma warning disable IDE0055 // Unused
 	internal bool IsSearchResultIndexSet() => m_searchResultIndexSet;
 
 	internal int GetSearchResultIndex() => m_searchResultIndex;

diff --git a/src/Uno.UI/UI/Xaml/Controls/Control/Control.mux.cs b/src/Uno.UI/UI/Xaml/Controls/Control/Control.mux.cs
@@ -236,7 +236,7 @@ internal bool TryGetValueFromBuiltInStyle(DependencyProperty dp, out object? val
 			value = null;
 			return false;
 		}
-		
+
 		private protected void EnsureValidationVisuals()
 		{
 			// TODO Uno: Not supported yet #4839

diff --git a/src/Uno.UI/UI/Xaml/Controls/Popup/Popup.Base.cs b/src/Uno.UI/UI/Xaml/Controls/Popup/Popup.Base.cs
@@ -122,7 +122,10 @@ partial void OnIsOpenChangedPartial(bool oldIsOpen, bool newIsOpen)
 			_openPopupRegistration?.Dispose();
 			if (IsLightDismissEnabled)
 			{
-				if (_lastFocusedElement != null && _lastFocusedElement.Target is UIElement target)
+				var focusManager = VisualTree.GetFocusManagerForElement(this);
+				var focusedElement = focusManager?.FocusedElement as UIElement;
+
+				if (_lastFocusedElement != null && _lastFocusedElement.Target is UIElement target && focusedElement != target)
 				{
 					target.Focus(_lastFocusState);
 					_lastFocusedElement = null;