[Tizen] Fix CollectionView layout issue (#13988)

* Add guard for invalid reference * Fix CollectionView re-layout issue * Fix adaptor for CollectionView
xamarin · May 18, 2021 · 713320f · 713320f
1 parent b85c28e
commit 713320f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CollectionView.cs b/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CollectionView.cs
@@ -476,6 +476,7 @@ void OnAdaptorChanging()
 				(Adaptor as INotifyCollectionChanged).CollectionChanged -= OnCollectionChanged;
 				Adaptor.CollectionView = null;
 			}
+			_innerLayout.UnPackAll();
 		}
 
 		void OnAdaptorChanged()
@@ -613,7 +614,8 @@ void OnLayout()
 				Scroller.HorizontalStepSize = _layoutManager.GetScrollBlockSize();
 				Scroller.VerticalStepSize = _layoutManager.GetScrollBlockSize();
 				UpdateSnapPointsType(SnapPointsType);
-				Device.BeginInvokeOnMainThread(SendScrolledEvent);
+				if (Geometry.Width > 0 && Geometry.Height > 0 )
+					Device.BeginInvokeOnMainThread(SendScrolledEvent);
 			}
 		}
 

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ItemsViewRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/ItemsViewRenderer.cs
@@ -51,6 +51,11 @@ protected override void Dispose(bool disposing)
 					Element.ScrollToRequested -= OnScrollToRequest;
 					ItemsLayout.PropertyChanged -= OnLayoutPropertyChanged;
 					Control.Scrolled -= OnScrolled;
+					// Remove all child that created by ItemTemplate
+					foreach (var child in Element.LogicalChildren.ToList())
+					{
+						Element.RemoveLogicalChild(child);
+					}
 				}
 				if (_observableSource != null)
 				{
@@ -163,6 +168,10 @@ protected void UpdateAdaptor(bool initialize)
 		{
 			if (!initialize)
 			{
+				if (Control.Adaptor != null)
+				{
+					Control.Adaptor.ItemSelected -= OnItemSelectedFromUI;
+				}
 				if (Element.ItemsSource == null || !Element.ItemsSource.Cast<object>().Any())
 				{
 					Control.Adaptor = EmptyItemAdaptor.Create(Element);