Skip to content

Commit

Permalink
Shell BackButtonBehavior improvement (#23466)
Browse files Browse the repository at this point in the history
* Shell BackButtonBehavior improvement (#23424)

* Update ShellPageRendererTracker.cs

* CR comments resolved

* - snapshots

---------

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
  • Loading branch information
kubaflo and PureWeen authored Jul 6, 2024
1 parent 654c113 commit 30562b6
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ void UpdateLeftToolbarItems()
if (!IsRootPage)
{
NavigationItem.HidesBackButton = !backButtonVisible;
image = backButtonVisible ? image : null;
}

image.LoadImage(MauiContext, result =>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue23424.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
namespace Maui.Controls.Sample.Issues;

[XamlCompilation(XamlCompilationOptions.Compile)]
[Issue(IssueTracker.Github, "23424", "BackButtonBehavior IsVisible=False does not hide the back button", PlatformAffected.All)]
public partial class Issue23424 : Shell
{
public Issue23424()
{
Items.Add(new ContentPage());
Navigation.PushAsync(new DetailPage());
}

public class DetailPage : ContentPage
{
public DetailPage()
{
Title = "Detail page";
BackButtonBehavior backButtonBehavior = new BackButtonBehavior
{
IconOverride = "small_dotnet_bot.png"
};

SetBackButtonBehavior(this, backButtonBehavior);
Content = new VerticalStackLayout()
{
new Button()
{
AutomationId = "button",
Text = "Click to hide the back button",
Command = new Command(()=>backButtonBehavior.IsVisible =! backButtonBehavior.IsVisible)
}
};
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#if !MACCATALYST
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

namespace Microsoft.Maui.TestCases.Tests.Issues
{
public class Issue23424: _IssuesUITest
{
public Issue23424(TestDevice device) : base(device)
{
}

public override string Issue => "BackButtonBehavior IsVisible=False does not hide the back button";

[Test]
[Category(UITestCategories.Shell)]
public void BackButtonBehaviorIsVisibleWorksWithCustomIcon()
{
App.WaitForElement("button");
App.Click("button");

// The test passes if the back button is not visible
VerifyScreenshot();
}
}
}
#endif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 30562b6

Please sign in to comment.