Skip to content

[iOS][CV2] Fix CollectionView renders large empty space at bottom of view #31215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubaflo merged 8 commits into from
Mar 5, 2026
+34 −3
Merged

[iOS][CV2] Fix CollectionView renders large empty space at bottom of view #31215

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9712268
fix added
devanathan-vaithiyanathan Jun 23, 2025
73d327c
Revert "fix added"
devanathan-vaithiyanathan Jun 23, 2025
88bb1b0
fix added
devanathan-vaithiyanathan Aug 13, 2025
64e0618
fix updated
devanathan-vaithiyanathan Aug 18, 2025
489c0c2
modifed the fix
devanathan-vaithiyanathan Sep 1, 2025
83feedd
Update LayoutFactory2.cs
devanathan-vaithiyanathan Sep 10, 2025
075d3fb
Update LayoutFactory2.cs
devanathan-vaithiyanathan Oct 10, 2025
9700f57
Update LayoutFactory2.cs
devanathan-vaithiyanathan Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions src/Controls/src/Core/Handlers/Items2/iOS/LayoutFactory2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static UICollectionViewLayout CreateListLayout(UICollectionViewScrollDirection s
//create global header and footer
layoutConfiguration.BoundarySupplementaryItems = CreateSupplementaryItems(null, layoutHeaderFooterInfo, scrollDirection, groupWidth, groupHeight);

var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, (sectionIndex, environment) =>
var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, groupingInfo, layoutHeaderFooterInfo, (sectionIndex, environment) =>
{
// Each item has a size
var itemSize = NSCollectionLayoutSize.Create(itemWidth, itemHeight);
Expand Down Expand Up @@ -151,7 +151,7 @@ static UICollectionViewLayout CreateGridLayout(UICollectionViewScrollDirection s
var layoutConfiguration = new UICollectionViewCompositionalLayoutConfiguration();
layoutConfiguration.ScrollDirection = scrollDirection;

var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, (sectionIndex, environment) =>
var layout = new CustomUICollectionViewCompositionalLayout(snapInfo, groupingInfo, headerFooterInfo, (sectionIndex, environment) =>
{
// Each item has a size
var itemSize = NSCollectionLayoutSize.Create(itemWidth, itemHeight);
Expand Down Expand Up @@ -450,11 +450,15 @@ class CustomUICollectionViewCompositionalLayout : UICollectionViewCompositionalL
{
LayoutSnapInfo _snapInfo;
ItemsUpdatingScrollMode _itemsUpdatingScrollMode;
LayoutGroupingInfo? _groupingInfo;
LayoutHeaderFooterInfo? _headerFooterInfo;

public CustomUICollectionViewCompositionalLayout(LayoutSnapInfo snapInfo, UICollectionViewCompositionalLayoutSectionProvider sectionProvider, UICollectionViewCompositionalLayoutConfiguration configuration, ItemsUpdatingScrollMode itemsUpdatingScrollMode) : base(sectionProvider, configuration)
public CustomUICollectionViewCompositionalLayout(LayoutSnapInfo snapInfo, LayoutGroupingInfo? groupingInfo, LayoutHeaderFooterInfo? headerFooterInfo, UICollectionViewCompositionalLayoutSectionProvider sectionProvider, UICollectionViewCompositionalLayoutConfiguration configuration, ItemsUpdatingScrollMode itemsUpdatingScrollMode) : base(sectionProvider, configuration)
{
_snapInfo = snapInfo;
_itemsUpdatingScrollMode = itemsUpdatingScrollMode;
_groupingInfo = groupingInfo;
_headerFooterInfo = headerFooterInfo;
}

public override void FinalizeCollectionViewUpdates()
Expand Down Expand Up @@ -558,6 +562,33 @@ public override CGPoint TargetContentOffset(CGPoint proposedContentOffset, CGPoi
Configuration.ScrollDirection);
}

public override CGSize CollectionViewContentSize
{
get
{
if (CollectionView != null)
{
bool hasGlobalHeaders = _headerFooterInfo?.HasHeader == true || _headerFooterInfo?.HasFooter == true;
bool hasGroupHeaders = _groupingInfo?.HasHeader == true || _groupingInfo?.HasFooter == true;

if (hasGlobalHeaders || hasGroupHeaders)
{
return base.CollectionViewContentSize;
}

if (CollectionView.NumberOfSections() > 0 &&
CollectionView.NumberOfItemsInSection(0) > 0)
{
return base.CollectionViewContentSize;
}

return CGSize.Empty;
}

return base.CollectionViewContentSize;
}
}

CGPoint ScrollSingle(SnapPointsAlignment alignment, CGPoint proposedContentOffset, CGPoint scrollingVelocity)
{
// Get the viewport of the UICollectionView at the current content offset
Expand Down
Loading