From 4eb498fb0411097414b36a72775d25b7c0f7262d Mon Sep 17 00:00:00 2001 From: redth Date: Fri, 7 Jun 2024 16:05:45 -0400 Subject: [PATCH] Fix bad merge reverting a data check for header/footer --- .../Apple/CvDataSource.ios.maccatalyst.cs | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs b/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs index 015893b..fadafa0 100644 --- a/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs +++ b/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs @@ -33,21 +33,18 @@ public override UICollectionViewCell GetCell(UICollectionView collectionView, NS if (info is not null) { data = Handler?.PositionalViewSelector?.Adapter?.DataFor(info.Kind, info.SectionIndex, info.ItemIndex); + + var reuseId = Handler?.PositionalViewSelector?.ViewSelector?.GetReuseId(info, data); - if (data is not null) + nativeReuseId = info.Kind switch { - var reuseId = Handler?.PositionalViewSelector?.ViewSelector?.GetReuseId(info, data); - - nativeReuseId = info.Kind switch - { - PositionKind.Item => itemIdManager.GetReuseId(collectionView, reuseId), - PositionKind.SectionHeader => sectionHeaderIdManager.GetReuseId(collectionView, reuseId), - PositionKind.SectionFooter => sectionFooterIdManager.GetReuseId(collectionView, reuseId), - PositionKind.Header => globalIdManager.GetReuseId(collectionView, reuseId), - PositionKind.Footer => globalIdManager.GetReuseId(collectionView, reuseId), - _ => CvCell.ReuseIdUnknown, - }; - } + PositionKind.Item => itemIdManager.GetReuseId(collectionView, reuseId), + PositionKind.SectionHeader => sectionHeaderIdManager.GetReuseId(collectionView, reuseId), + PositionKind.SectionFooter => sectionFooterIdManager.GetReuseId(collectionView, reuseId), + PositionKind.Header => globalIdManager.GetReuseId(collectionView, reuseId), + PositionKind.Footer => globalIdManager.GetReuseId(collectionView, reuseId), + _ => CvCell.ReuseIdUnknown, + }; } var nativeCell = collectionView.DequeueReusableCell(nativeReuseId, indexPath);