-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
[Windows] Fixed Margin Not Applied to Shell Flyout Template Items on First Display #27060
Open
prakashKannanSf3972
wants to merge
5
commits into
dotnet:main
Choose a base branch
from
prakashKannanSf3972:fix-18423
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
534b265
Fixed-Shell-TemplateView-Initial-Margin
prakashKannanSf3972 290749b
Fixed-Shell-TemplateView-Initial-Margin
prakashKannanSf3972 eb87725
Added-Snapshot-Modified-Testcase
prakashKannanSf3972 ca4cbf0
Merge branch 'fix-18423' of https://github.com/prakashKannanSf3972/ma…
prakashKannanSf3972 d481b68
Updated-Pending-Snapshot
prakashKannanSf3972 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 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
+13.6 KB
...es.Android.Tests/snapshots/android/VerifyTemplateViewMarginOnInitialDisplay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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,40 @@ | ||
namespace Maui.Controls.Sample.Issues | ||
{ | ||
|
||
[Issue(IssueTracker.Github, 18423, "[Windows] Shell flyout template items do not have a margin applied on first show", PlatformAffected.UWP)] | ||
public partial class Issue18423Shell : Shell | ||
{ | ||
public Issue18423Shell() | ||
{ | ||
FlyoutBehavior = FlyoutBehavior.Flyout; | ||
|
||
ItemTemplate = new DataTemplate(() => | ||
{ | ||
return new Label | ||
{ | ||
AutomationId = "LabelWithMargin", | ||
Margin = new Thickness(20), | ||
Text = "Title" | ||
}; | ||
}); | ||
|
||
ShellContent shellContent = new ShellContent | ||
{ | ||
Title = "Home", | ||
ContentTemplate = new DataTemplate(typeof(Issue18423Page)), | ||
Route = "MainPage" | ||
}; | ||
|
||
Items.Add(shellContent); | ||
} | ||
} | ||
|
||
public partial class Issue18423Page : ContentPage | ||
{ | ||
public Issue18423Page() | ||
{ | ||
BackgroundColor = Colors.HotPink; | ||
this.Content = new Label() { AutomationId = "MainPageLabel", Text = "Content" }; | ||
} | ||
} | ||
} |
Binary file added
BIN
+49.1 KB
.../TestCases.Mac.Tests/snapshots/mac/VerifyTemplateViewMarginOnInitialDisplay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions
24
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs
This file contains 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,24 @@ | ||
using NUnit.Framework; | ||
using UITest.Appium; | ||
using UITest.Core; | ||
|
||
namespace Microsoft.Maui.TestCases.Tests.Issues | ||
{ | ||
public class Issue18423 : _IssuesUITest | ||
{ | ||
public Issue18423(TestDevice testDevice) : base(testDevice) | ||
{ | ||
} | ||
|
||
public override string Issue => "[Windows] Shell flyout template items do not have a margin applied on first show"; | ||
|
||
[Test] | ||
[Category(UITestCategories.Shell)] | ||
public void VerifyTemplateViewMarginOnInitialDisplay() | ||
{ | ||
App.WaitForElement("MainPageLabel"); | ||
App.TapShellFlyoutIcon(); | ||
VerifyScreenshot(); | ||
} | ||
} | ||
} |
Binary file added
BIN
+13.3 KB
.../TestCases.iOS.Tests/snapshots/ios/VerifyTemplateViewMarginOnInitialDisplay.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.
The test is failing on Windows:
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.
@jsuarezruiz , Thank you for pointing this out. Addressed the issue by updating the test logic and believe it will not fail in the next CI run.
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.
Nice, thanks. The Windows snapshot is pending, could you commit it? Available in the latest build.
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.
@jsuarezruiz Thanks! The pending Windows snapshot has been added.