perf: Avoid native call to get parent while bubbling events

unoplatform · Apr 17, 2023 · 50cc2a3 · 50cc2a3
1 parent 18a2b47
commit 50cc2a3
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Uno.UI/UI/Xaml/UIElement.RoutedEvents.cs b/src/Uno.UI/UI/Xaml/UIElement.RoutedEvents.cs
@@ -719,11 +719,13 @@ internal bool RaiseEvent(RoutedEvent routedEvent, RoutedEventArgs args, Bubbling
 				args.CanBubbleNatively = false;
 			}
 
-#if __IOS__ || __ANDROID__
-			var parent = this.FindFirstParent<UIElement>();
-#else
 			var parent = this.GetParent() as UIElement;
+#if __IOS__ || __ANDROID__
+			// This is for safety (legacy support) and should be removed.
+			// A common issue is the managed parent being cleared before unload event raised.
+			parent ??= this.FindFirstParent<UIElement>();
 #endif
+
 			// [11] A parent is defined?
 			if (parent == null)
 			{