[iOS] CollectionView footer sizing when source is empty - fix #28610

kubaflo · 2025-03-25T17:23:45Z

Issues Fixed

Works fine with CV2

Before	After

rmarinho · 2025-03-25T18:18:01Z

/azp run

azure-pipelines · 2025-03-25T18:18:26Z

Azure Pipelines successfully started running 3 pipeline(s).

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28580.cs

rmarinho

small comment related with Header, I know the test already has a header so it seems the same issue doesn t apply to the header but do we know why?

rmarinho · 2025-03-28T10:05:36Z

src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs

@@ -218,7 +218,7 @@ void UpdateHeaderFooterPosition()
 					height = ItemsViewLayout.CollectionViewContentSize.Height;
 				}

-				if (_footerUIView != null && (_footerUIView.Frame.Y != height || emptyHeight > 0 || _footerUIView.Frame.Height != footerHeight))
+				if (_footerUIView != null && (_footerUIView.Frame.Y != height || emptyHeight > 0 || _footerUIView.Frame.Height != footerHeight || _footerUIView.Frame.Width != CollectionView.Frame.Width))


Don t we need to do something like this for the Header too on line 209 ?

Yea, we should. I pushed a commit

Is there a test we can add for the code that was added?

It turned out that the headerView has always been reframed because of this wrong condition _headerUIView.Frame.Y != headerHeight, but it should be _headerUIView.Frame.Y != -headerHeight based on this

_headerUIView.Frame = new CoreGraphics.CGRect(0, -headerHeight, CollectionView.Frame.Width, headerHeight);

right?

PureWeen · 2025-03-29T16:34:35Z

/azp run

azure-pipelines · 2025-03-29T16:34:55Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2025-03-29T18:51:04Z

/azp run

azure-pipelines · 2025-03-29T18:51:26Z

Azure Pipelines successfully started running 3 pipeline(s).

PureWeen · 2025-04-02T19:14:36Z

failing test is unrelated

PureWeen · 2025-04-02T19:15:48Z

/backport to release/9.0.1xx-sr4

PureWeen · 2025-04-02T19:15:57Z

/backport to rrelease/9.0.1xx-sr5

github-actions · 2025-04-02T19:16:00Z

Started backporting to release/9.0.1xx-sr4: https://github.com/dotnet/maui/actions/runs/14227718037

github-actions · 2025-04-02T19:16:07Z

Started backporting to rrelease/9.0.1xx-sr5: https://github.com/dotnet/maui/actions/runs/14227720878

github-actions · 2025-04-02T19:16:21Z

@PureWeen backporting to "release/9.0.1xx-sr4" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: [iOS] CollectionView footer sizing fix
.git/rebase-apply/patch:87: trailing whitespace.
</ContentPage> 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 [iOS] CollectionView footer sizing fix
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions · 2025-04-02T19:16:24Z

@PureWeen an error occurred while backporting to "rrelease/9.0.1xx-sr5", please check the run log for details!

Error: The specified backport target branch "rrelease/9.0.1xx-sr5" wasn't found in the repo.

PureWeen · 2025-04-03T14:31:33Z

/backport to release/9.0.1xx-sr4

PureWeen · 2025-04-03T14:31:43Z

/backport to release/9.0.1xx-sr5

github-actions · 2025-04-03T14:31:43Z

Started backporting to release/9.0.1xx-sr4: https://github.com/dotnet/maui/actions/runs/14245620125

github-actions · 2025-04-03T14:31:55Z

Started backporting to release/9.0.1xx-sr5: https://github.com/dotnet/maui/actions/runs/14245624630

github-actions · 2025-04-03T14:32:03Z

@PureWeen backporting to "release/9.0.1xx-sr4" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: [iOS] CollectionView footer sizing fix
.git/rebase-apply/patch:87: trailing whitespace.
</ContentPage> 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 [iOS] CollectionView footer sizing fix
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

kubaflo requested a review from a team as a code owner March 25, 2025 17:23

kubaflo requested review from rmarinho and tj-devel709 March 25, 2025 17:23

kubaflo self-assigned this Mar 25, 2025

kubaflo added area-controls-collectionview CollectionView, CarouselView, IndicatorView platform/ios community ✨ Community Contribution labels Mar 25, 2025

[iOS] CollectionView footer sizing fix

b8b660f

kubaflo force-pushed the issue28580 branch from 63ef566 to b8b660f Compare March 25, 2025 17:27

rmarinho previously approved these changes Mar 25, 2025

View reviewed changes

rmarinho added this to the .NET 9 SR6 milestone Mar 25, 2025

rmarinho added this to MAUI SDK Ongoing Mar 25, 2025

github-project-automation bot moved this to Todo in MAUI SDK Ongoing Mar 25, 2025

rmarinho moved this from Todo to Approved in MAUI SDK Ongoing Mar 25, 2025

Added snapshots

33591fa

kubaflo dismissed rmarinho’s stale review via 33591fa March 25, 2025 23:33

jsuarezruiz requested changes Mar 26, 2025

View reviewed changes

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28580.cs Show resolved Hide resolved

github-project-automation bot moved this from Approved to Changes Requested in MAUI SDK Ongoing Mar 26, 2025

Added Macos snapshot

3a2f20a

dotnet deleted a comment from azure-pipelines bot Mar 26, 2025

dotnet deleted a comment from PureWeen Mar 26, 2025

rmarinho previously approved these changes Mar 26, 2025

View reviewed changes

dotnet deleted a comment from azure-pipelines bot Mar 28, 2025

rmarinho reviewed Mar 28, 2025

View reviewed changes

rmarinho requested a review from jsuarezruiz March 28, 2025 10:09

rmarinho moved this from Changes Requested to Ready To Review in MAUI SDK Ongoing Mar 28, 2025

Update StructuredItemsViewController.cs

c85d249

kubaflo dismissed rmarinho’s stale review via c85d249 March 29, 2025 00:27

Update StructuredItemsViewController.cs

86c900d

PureWeen modified the milestones: .NET 9 SR6, .NET 9 SR5.1 Apr 1, 2025

PureWeen approved these changes Apr 2, 2025

View reviewed changes

PureWeen merged commit 05999a1 into dotnet:main Apr 2, 2025
127 of 129 checks passed

github-project-automation bot moved this from Ready To Review to Done in MAUI SDK Ongoing Apr 2, 2025

github-actions bot mentioned this pull request Apr 3, 2025

[release/9.0.1xx-sr5] [iOS] CollectionView footer sizing when source is empty - fix #28793

Merged

PureWeen mentioned this pull request Apr 3, 2025

[release/9.0.1xx-sr4] [iOS] CollectionView footer sizing when source is empty - fix #28794

Merged

HarishKumarSF4517 mentioned this pull request Apr 14, 2025

[iOS] CollectionView footer sizing when source is empty in SR5 #28971

Merged

github-actions bot locked and limited conversation to collaborators May 4, 2025

[iOS] CollectionView footer sizing when source is empty - fix #28610

[iOS] CollectionView footer sizing when source is empty - fix #28610

Uh oh!

Conversation

kubaflo commented Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issues Fixed

Uh oh!

rmarinho commented Mar 25, 2025

Uh oh!

azure-pipelines bot commented Mar 25, 2025

Uh oh!

Uh oh!

rmarinho left a comment

Choose a reason for hiding this comment

Uh oh!

rmarinho Mar 28, 2025

Choose a reason for hiding this comment

Uh oh!

kubaflo Mar 29, 2025

Choose a reason for hiding this comment

Uh oh!

PureWeen Mar 29, 2025

Choose a reason for hiding this comment

Uh oh!

kubaflo Mar 29, 2025

Choose a reason for hiding this comment

Uh oh!

PureWeen commented Mar 29, 2025

Uh oh!

azure-pipelines bot commented Mar 29, 2025

Uh oh!

PureWeen commented Mar 29, 2025

Uh oh!

azure-pipelines bot commented Mar 29, 2025

Uh oh!

PureWeen commented Apr 2, 2025

Uh oh!

Uh oh!

PureWeen commented Apr 2, 2025

Uh oh!

PureWeen commented Apr 2, 2025

Uh oh!

github-actions bot commented Apr 2, 2025

Uh oh!

github-actions bot commented Apr 2, 2025

Uh oh!

github-actions bot commented Apr 2, 2025

Uh oh!

github-actions bot commented Apr 2, 2025

Uh oh!

PureWeen commented Apr 3, 2025

Uh oh!

PureWeen commented Apr 3, 2025

Uh oh!

github-actions bot commented Apr 3, 2025

Uh oh!

github-actions bot commented Apr 3, 2025

Uh oh!

github-actions bot commented Apr 3, 2025

Uh oh!

Uh oh!

kubaflo commented Mar 25, 2025 •

edited

Loading