-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[Android] Fix CollectionView sizing when wrapped in RefreshView #34387
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 all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| namespace Maui.Controls.Sample.Issues | ||
| { | ||
| [Issue(IssueTracker.Github, 12131, "RefreshView - CollectionView sizing not working correctly inside VerticalStackLayout", PlatformAffected.Android)] | ||
| public class Issue12131 : ContentPage | ||
| { | ||
| public Issue12131() | ||
| { | ||
| var items = Enumerable.Range(1, 20).Select(i => $"Item {i}").ToList(); | ||
|
|
||
| var collectionView = new CollectionView | ||
| { | ||
| AutomationId = "CollectionView12131", | ||
| ItemTemplate = new DataTemplate(() => | ||
| { | ||
| var label = new Label(); | ||
| label.SetBinding(Label.TextProperty, "."); | ||
| return label; | ||
| }), | ||
| ItemsSource = items | ||
| }; | ||
|
|
||
| var refreshView = new RefreshView | ||
| { | ||
| AutomationId = "RefreshView12131", | ||
| Content = collectionView | ||
| }; | ||
|
|
||
| var sizeLabel = new Label | ||
| { | ||
| AutomationId = "SizeLabel12131", | ||
| Text = "Waiting..." | ||
| }; | ||
|
|
||
| refreshView.SizeChanged += (s, e) => | ||
| { | ||
| sizeLabel.Text = $"Height={refreshView.Height:F0}"; | ||
| }; | ||
|
|
||
| Content = new VerticalStackLayout | ||
| { | ||
| Padding = 10, | ||
| Children = | ||
| { | ||
| new Label { Text = "CollectionView wrapped within RefreshView." }, | ||
| sizeLabel, | ||
| refreshView | ||
| } | ||
| }; | ||
| } | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue12131.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,32 @@ | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues | ||
| { | ||
| public class Issue12131 : _IssuesUITest | ||
| { | ||
| public Issue12131(TestDevice testDevice) : base(testDevice) { } | ||
|
|
||
| public override string Issue => "RefreshView - CollectionView sizing not working correctly inside VerticalStackLayout"; | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.RefreshView)] | ||
| public void RefreshViewHasNonZeroHeightInVerticalStackLayout() | ||
| { | ||
| App.WaitForElement("RefreshView12131"); | ||
| var rect = App.FindElement("RefreshView12131").GetRect(); | ||
| Assert.That(rect.Height, Is.GreaterThan(0), "RefreshView should have a non-zero height when placed inside a VerticalStackLayout"); | ||
| } | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.RefreshView)] | ||
| public void CollectionViewDoesNotExceedAvailableWidth() | ||
| { | ||
| App.WaitForElement("CollectionView12131"); | ||
| var refreshRect = App.FindElement("RefreshView12131").GetRect(); | ||
| var collectionRect = App.FindElement("CollectionView12131").GetRect(); | ||
| Assert.That(collectionRect.Width, Is.LessThanOrEqualTo(refreshRect.Width + 1), "CollectionView width should not exceed RefreshView width"); | ||
| } | ||
| } | ||
| } |
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
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.
Uh oh!
There was an error while loading. Please reload this page.