-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Revert CollectionView, the footer moves to the bottom of the page when the empty view or empty view template is enabled #27288
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
Show all changes
7 commits
Select commit
Hold shift + click to select a range
248598b
Revert "CollectionView, the footer moves to the bottom of the page wh…
PureWeen 8007d0f
- update testing
PureWeen f5f5ef5
Pending snapshots
jsuarezruiz 862a736
Merge branch 'main' into revert_24997
jsuarezruiz dcd30d0
Windows snapshot
jsuarezruiz 8f5ac8b
Add conditional compilation for Windows tests
PureWeen 30a931c
- remove windows image
PureWeen 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
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
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
+12.4 KB
...Tests/snapshots/android/CollectionViewEmptyViewFillsAvailableSpaceByDefault.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 removed
BIN
-29.1 KB
...s/android/CollectionViewFooterMovestoBottomWithEmptyvieworEmptyviewTemplate.png
Binary file not shown.
58 changes: 0 additions & 58 deletions
58
src/Controls/tests/TestCases.HostApp/Issues/Issue24966.xaml
This file was deleted.
Oops, something went wrong.
73 changes: 0 additions & 73 deletions
73
src/Controls/tests/TestCases.HostApp/Issues/Issue24966.xaml.cs
This file was deleted.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
src/Controls/tests/TestCases.HostApp/Issues/Issue27229.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,31 @@ | ||
| <?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" | ||
| x:Class="Maui.Controls.Sample.Issues.Issue27229" | ||
| xmlns:cv1="clr-namespace:Maui.Controls.Sample" | ||
| xmlns:local="clr-namespace:Maui.Controls.Sample.Issues" | ||
| x:Name="ThisMainPage" | ||
| Title="Main Page"> | ||
| <CollectionView> | ||
| <CollectionView.EmptyView> | ||
| <ContentView> | ||
| <StackLayout HorizontalOptions="Center" VerticalOptions="Center"> | ||
| <Label | ||
| Margin="10,25,10,10" | ||
| FontAttributes="Bold" | ||
| FontSize="18" | ||
| HorizontalOptions="Fill" | ||
| HorizontalTextAlignment="Center" | ||
| AutomationId="ReadyToTest" | ||
| Text="No results matched your filter." /> | ||
| <Label | ||
| FontAttributes="Italic" | ||
| FontSize="12" | ||
| HorizontalOptions="Fill" | ||
| HorizontalTextAlignment="Center" | ||
| Text="Try a broader filter?" /> | ||
| </StackLayout> | ||
| </ContentView> | ||
| </CollectionView.EmptyView> | ||
| </CollectionView> | ||
| </ContentPage> |
20 changes: 20 additions & 0 deletions
20
src/Controls/tests/TestCases.HostApp/Issues/Issue27229.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,20 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Collections.ObjectModel; | ||
| using System.ComponentModel; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Windows.Input; | ||
| using System.Collections.Specialized; | ||
|
|
||
| namespace Maui.Controls.Sample.Issues | ||
| { | ||
| [XamlCompilation(XamlCompilationOptions.Compile)] | ||
| [Issue(IssueTracker.Github, 27229, "CollectionView, EmptyView Fills Available Space By Default")] | ||
| public partial class Issue27229 | ||
| { | ||
| public Issue27229() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } | ||
| } |
Binary file added
BIN
+47.6 KB
...Mac.Tests/snapshots/mac/CollectionViewEmptyViewFillsAvailableSpaceByDefault.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 removed
BIN
-50.1 KB
...shots/mac/CollectionViewFooterMovestoBottomWithEmptyvieworEmptyviewTemplate.png
Binary file not shown.
28 changes: 0 additions & 28 deletions
28
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24966.cs
This file was deleted.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue27229.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,23 @@ | ||
| #if TEST_FAILS_ON_WINDOWS | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues | ||
| { | ||
| internal class Issue27229 : _IssuesUITest | ||
| { | ||
| public Issue27229(TestDevice device) : base(device) { } | ||
|
|
||
| public override string Issue => "CollectionView, EmptyView Fills Available Space By Default"; | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.CollectionView)] | ||
| public void CollectionViewEmptyViewFillsAvailableSpaceByDefault() | ||
| { | ||
| App.WaitForElement("ReadyToTest"); | ||
| VerifyScreenshot(); | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
Binary file added
BIN
+18.2 KB
...iOS.Tests/snapshots/ios/CollectionViewEmptyViewFillsAvailableSpaceByDefault.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 removed
BIN
-30.8 KB
...shots/ios/CollectionViewFooterMovestoBottomWithEmptyvieworEmptyviewTemplate.png
Binary file not shown.
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.