-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[iOS] CollectionView footer sizing when source is empty - fix #28610
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.
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
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b8b660f
[iOS] CollectionView footer sizing fix
kubaflo 33591fa
Added snapshots
kubaflo 3a2f20a
Added Macos snapshot
kubaflo c85d249
Update StructuredItemsViewController.cs
kubaflo 86c900d
Update StructuredItemsViewController.cs
kubaflo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+8.47 KB
...ases.Android.Tests/snapshots/android/FooterWithEmptyCVShouldHaveCorrectSize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 58 additions & 0 deletions
58
src/Controls/tests/TestCases.HostApp/Issues/Issue28580.xaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||
| xmlns:local="clr-namespace:Maui.Controls.Sample.Issues" | ||
| x:Class="Maui.Controls.Sample.Issues.Issue28580"> | ||
| <Grid Padding="30"> | ||
| <CollectionView> | ||
| <CollectionView.Header> | ||
| <Border | ||
| Stroke="Black" | ||
| Margin="0"> | ||
| <Grid | ||
| ColumnDefinitions="*,Auto" | ||
| ColumnSpacing="5"> | ||
| <Label | ||
| Grid.Column="1" | ||
| Text="add new" | ||
| HorizontalOptions="Center" | ||
| VerticalOptions="Center" | ||
| VerticalTextAlignment="Center"/> | ||
|
|
||
| <Label | ||
| Grid.Column="0" | ||
| Text="+" | ||
| HorizontalOptions="End" | ||
| VerticalOptions="Center" | ||
| VerticalTextAlignment="Center"/> | ||
| </Grid> | ||
| </Border> | ||
| </CollectionView.Header> | ||
|
|
||
| <CollectionView.Footer> | ||
| <Border | ||
| Stroke="Black" | ||
| Margin="0"> | ||
| <Grid | ||
| ColumnDefinitions="*,Auto" | ||
| ColumnSpacing="5"> | ||
| <Label | ||
| Grid.Column="1" | ||
| Text="add new" | ||
| AutomationId="labelInFooter" | ||
| HorizontalOptions="Center" | ||
| VerticalOptions="Center" | ||
| VerticalTextAlignment="Center"/> | ||
|
|
||
| <Label | ||
| Grid.Column="0" | ||
| Text="+" | ||
| HorizontalOptions="End" | ||
| VerticalOptions="Center" | ||
| VerticalTextAlignment="Center"/> | ||
| </Grid> | ||
| </Border> | ||
| </CollectionView.Footer> | ||
| </CollectionView> | ||
| </Grid> | ||
| </ContentPage> |
10 changes: 10 additions & 0 deletions
10
src/Controls/tests/TestCases.HostApp/Issues/Issue28580.xaml.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 28580, "CollectionView footer sizing when source is empty")] | ||
| public partial class Issue28580 : ContentPage | ||
| { | ||
| public Issue28580() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } |
Binary file added
BIN
+4.1 KB
...ts/TestCases.Mac.Tests/snapshots/mac/FooterWithEmptyCVShouldHaveCorrectSize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28580.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
| public class Issue28580 : _IssuesUITest | ||
| { | ||
| public Issue28580(TestDevice testDevice) : base(testDevice) | ||
| { | ||
| } | ||
|
|
||
| public override string Issue => "CollectionView footer sizing when source is empty"; | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.CollectionView)] | ||
| public void FooterWithEmptyCVShouldHaveCorrectSize() | ||
| { | ||
| App.WaitForElement("labelInFooter"); | ||
| VerifyScreenshot(); | ||
kubaflo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
Binary file added
BIN
+6.17 KB
...tCases.WinUI.Tests/snapshots/windows/FooterWithEmptyCVShouldHaveCorrectSize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+11.4 KB
...ts/TestCases.iOS.Tests/snapshots/ios/FooterWithEmptyCVShouldHaveCorrectSize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don t we need to do something like this for the Header too on line 209 ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yea, we should. I pushed a commit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a test we can add for the code that was added?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 != -headerHeightbased on this_headerUIView.Frame = new CoreGraphics.CGRect(0, -headerHeight, CollectionView.Frame.Width, headerHeight);right?