-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Fix ShellItems and MenuItems not displaying on Android when Flyout is presented, for both custom and default templates #30512
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
Open
SuthiYuvaraj
wants to merge
8
commits into
dotnet:main
Choose a base branch
from
SuthiYuvaraj:fix-21963
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.
+156
−1
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
7abfbb1
commit for FlyoutIsPresented with Template
SuthiYuvaraj b77d55e
TestCases updated
SuthiYuvaraj 3294ea1
Update Issue21963.cs
SuthiYuvaraj 2ee1fda
testcases changes
SuthiYuvaraj bae0769
testcase changes
SuthiYuvaraj 6ac06a5
Update ShellFlyoutTemplatedContentRenderer.cs
SuthiYuvaraj b2de686
Update src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21…
SuthiYuvaraj acdce88
TestCase changes
SuthiYuvaraj 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
127 changes: 127 additions & 0 deletions
127
src/Controls/tests/TestCases.HostApp/Issues/Issue21963.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,127 @@ | ||
namespace Maui.Controls.Sample.Issues; | ||
|
||
[Issue(IssueTracker.Github, 21963, "ShellMenuItemTemplate Sometime Does Not Work", PlatformAffected.Android)] | ||
public partial class Issue21963 : TestShell | ||
{ | ||
|
||
protected override void Init() | ||
{ | ||
this.FlyoutIsPresented = true; | ||
this.ItemTemplate = new DataTemplate(() => | ||
{ | ||
var content = new ContentView(); | ||
var label = new Label(); | ||
label.SetBinding(Label.TextProperty, "Title"); | ||
content.Content = label; | ||
|
||
return content; | ||
}); | ||
|
||
// MenuItemTemplate | ||
this.MenuItemTemplate = new DataTemplate(() => | ||
{ | ||
var content = new ContentView(); | ||
var label = new Label(); | ||
label.SetBinding(Label.TextProperty, "Title"); | ||
content.Content = label; | ||
|
||
return content; | ||
}); | ||
|
||
// ShellContent 1 | ||
var shellContent1 = new ShellContent | ||
{ | ||
Title = "ShellContent 1", | ||
AutomationId = "Issue21963ShellContent1", | ||
ContentTemplate = new DataTemplate(typeof(Issues.Issue21963InnerPage)) | ||
}; | ||
|
||
// ShellContent 2 | ||
var shellContent2 = new ShellContent | ||
{ | ||
Title = "ShellContent 2", | ||
AutomationId = "Issue21963ShellContent2", | ||
ContentTemplate = new DataTemplate(typeof(Issues.Issue21963MenuPage)) | ||
}; | ||
|
||
// ShellContent 3 | ||
var shellContent3 = new ShellContent | ||
{ | ||
Title = "ShellContent 3", | ||
AutomationId = "Issue21963ShellContent3", | ||
ContentTemplate = new DataTemplate(typeof(Issues.Issue21963FlyoutPage)) | ||
}; | ||
|
||
// MenuItems | ||
var menuItem1 = new MenuItem | ||
{ | ||
Text = "MenuItem 1", | ||
AutomationId = "Issue21963MenuItem1" | ||
}; | ||
|
||
var menuItem2 = new MenuItem | ||
{ | ||
Text = "MenuItem 2", | ||
AutomationId = "Issue21963MenuItem2" | ||
}; | ||
|
||
// Add items to Shell | ||
Items.Add(shellContent1); | ||
Items.Add(shellContent2); | ||
Items.Add(shellContent3); | ||
|
||
Items.Add(menuItem1); | ||
Items.Add(menuItem2); | ||
} | ||
} | ||
|
||
public class Issue21963InnerPage : ContentPage | ||
{ | ||
public Issue21963InnerPage() | ||
{ | ||
Content = new VerticalStackLayout | ||
{ | ||
Children = | ||
{ | ||
new Button | ||
{ | ||
Text = "Click Me" | ||
} | ||
} | ||
}; | ||
} | ||
} | ||
|
||
public class Issue21963MenuPage : ContentPage | ||
{ | ||
public Issue21963MenuPage() | ||
{ | ||
Content = new VerticalStackLayout | ||
{ | ||
Children = | ||
{ | ||
new Button | ||
{ | ||
Text = "Click Me" | ||
} | ||
} | ||
}; | ||
} | ||
} | ||
public class Issue21963FlyoutPage : ContentPage | ||
{ | ||
public Issue21963FlyoutPage() | ||
{ | ||
Content = new VerticalStackLayout | ||
{ | ||
Children = | ||
{ | ||
new Button | ||
{ | ||
Text = "Click Me" | ||
} | ||
} | ||
}; | ||
} | ||
} | ||
|
28 changes: 28 additions & 0 deletions
28
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21963.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,28 @@ | ||
#if TEST_FAILS_ON_WINDOWS// This test fails on Windows: Shell.MenuItemTemplate behaves correctly,AutomationId does not work as expected on the Windows platform. | ||
using NUnit.Framework; | ||
using UITest.Appium; | ||
using UITest.Core; | ||
|
||
namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
||
public class Issue21963 : _IssuesUITest | ||
{ | ||
public Issue21963(TestDevice testDevice) : base(testDevice) | ||
{ | ||
} | ||
|
||
public override string Issue => "ShellMenuItemTemplate Sometime Does Not Work"; | ||
|
||
[Test] | ||
[Category(UITestCategories.Shell)] | ||
public void VerifyFlyoutAndTemplatesPresentInitially() | ||
{ | ||
App.WaitForElement("ShellContent 1"); | ||
App.WaitForElement("ShellContent 2"); | ||
App.WaitForElement("MenuItem 1"); | ||
App.WaitForElement("MenuItem 2"); | ||
App.WaitForElement("ShellContent 3"); | ||
|
||
} | ||
} | ||
#endif |
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.