fix(FrameworkTemplatePool): Detach native view from parent when recyc…

…ling
jeromelaban · Jan 9, 2024 · b0c96b3 · b0c96b3
1 parent 2c29bdf
commit b0c96b3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Uno.UI/UI/Xaml/FrameworkTemplatePool.cs b/src/Uno.UI/UI/Xaml/FrameworkTemplatePool.cs
@@ -23,6 +23,7 @@
 using Font = Android.Graphics.Typeface;
 using Android.Graphics;
 using DependencyObject = System.Object;
+using Uno.UI.Controls;
 #elif __IOS__
 using View = UIKit.UIView;
 using ViewGroup = UIKit.UIView;
@@ -324,6 +325,13 @@ private void Recycle()
 			{
 				for (var x = 0; x < count; x++)
 				{
+#if __ANDROID__
+					if (((View)array[x]).Parent is BindableView bindableView)
+					{
+						bindableView.RemoveView((View)array[x]);
+					}
+#endif
+
 					array[x].SetParent(null);
 				}
 			}