Remove extra layer of caching from iOS datasource

Redth · Jul 26, 2023 · 8730ff6 · 8730ff6
1 parent 06d1e8d
commit 8730ff6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 59 deletions.
diff --git a/Sample/VirtualListViewSample/SectionedAdapterPage.xaml b/Sample/VirtualListViewSample/SectionedAdapterPage.xaml
@@ -13,6 +13,9 @@
 			x:Name="vlv"
 			SelectedItemsChanged="vlv_SelectedItemsChanged"
 			SelectionMode="Single">
+			<vlv:VirtualListView.EmptyView>
+				<Label Text="Empty!" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" />
+			</vlv:VirtualListView.EmptyView>
 			<vlv:VirtualListView.SectionHeaderTemplate>
 				<DataTemplate>
 					<Border

diff --git a/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs b/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs
@@ -20,24 +20,8 @@ public CvDataSource(VirtualListViewHandler handler)
 	readonly ReusableIdManager sectionHeaderIdManager = new ReusableIdManager("SectionHeader", new NSString("SectionHeader"));
 	readonly ReusableIdManager sectionFooterIdManager = new ReusableIdManager("SectionFooter", new NSString("SectionFooter"));
 
-	int? cachedNumberOfSections;
-	internal int CachedNumberOfSections
-	{
-		get
-		{
-			if (!cachedNumberOfSections.HasValue)
-			{
-				var n = Handler?.PositionalViewSelector?.Adapter?.Sections ?? -1;
-				if (n >= 0)
-					cachedNumberOfSections = n;
-			}
-
-			return cachedNumberOfSections ?? 0;
-		}
-	}
-
 	public override nint NumberOfSections(UICollectionView collectionView)
-		=> CachedNumberOfSections;
+		=> Handler?.PositionalViewSelector?.GetNumberOfSections() ?? 0;
 
 	public override UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath)
 	{
@@ -105,39 +89,6 @@ void TapCellHandler(CvCell cell)
 
 	public override nint GetItemsCount(UICollectionView collectionView, nint section)
 	{
-		var realSection = section;
-
-		if (Handler?.PositionalViewSelector?.HasGlobalHeader ?? false)
-		{
-			if (section == 0)
-				return 1;
-
-			realSection--;
-		}
-
-		if (Handler?.PositionalViewSelector?.HasGlobalFooter ?? false)
-		{
-			if (section >= CachedNumberOfSections - 1)
-				return 1;
-		}
-
-		var itemsCount = Handler?.PositionalViewSelector?.Adapter?.ItemsForSection((int)realSection) ?? 0;
-
-		if (Handler?.PositionalViewSelector?.ViewSelector?.SectionHasHeader((int)realSection) ?? false)
-			itemsCount++;
-
-		if (Handler?.PositionalViewSelector?.ViewSelector?.SectionHasFooter((int)realSection) ?? false)
-			itemsCount++;
-
-		return (nint)itemsCount;
-	}
-
-	public void Reset(UICollectionView collectionView)
-	{
-		//itemIdManager.ResetTemplates(collectionView);
-		//sectionHeaderIdManager.ResetTemplates(collectionView);
-		//sectionFooterIdManager.ResetTemplates(collectionView);
-
-		cachedNumberOfSections = null;
+		return Handler?.PositionalViewSelector?.GetNumberOfItemsForSection(section.ToInt32()) ?? 0;
 	}
 }
diff --git a/VirtualListView/Apple/CvDelegate.ios.maccatalyst.cs b/VirtualListView/Apple/CvDelegate.ios.maccatalyst.cs
@@ -42,14 +42,6 @@ void HandleSelection(UICollectionView collectionView, NSIndexPath indexPath, boo
 			else
 				Handler?.VirtualView?.DeselectItems(itemPos);
 		}
-
-		//var updatedVisibleRect = collectionView.ConvertRectToView(collectionView.Bounds, selectedCell);
-
-		//var contentOffset = collectionView.ContentOffset;
-		//contentOffset.X = contentOffset.X + (visibleRect.X - updatedVisibleRect.X);
-		//collectionView.ContentOffset = contentOffset;
-
-		//UIView.AnimationsEnabled = true;
 	}
 
 	public override void Scrolled(UIScrollView scrollView)