Skip to content
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

Fixed NavigationPage TitleBar visibility issue when set to the parent page #25000

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,19 @@ void UpdateNavigationBarVisibility(bool animated)
if (current == null || NavigationController == null)
return;

var hasNavBar = NavigationPage.GetHasNavigationBar(current);
bool hasNavBar;

if (current.Parent is not null)
{
hasNavBar = NavigationPage.GetHasNavigationBar(current.Parent)
&& NavigationPage.GetHasNavigationBar(current);
}
else
{
hasNavBar = NavigationPage.GetHasNavigationBar(current);
}


if (!_navigation.TryGetTarget(out NavigationRenderer navigationRenderer))
{
navigationRenderer._hasNavigationBar = hasNavBar;
Expand Down
13 changes: 12 additions & 1 deletion src/Controls/src/Core/NavigationPage/NavigationPageToolbar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,18 @@ void ApplyChanges(NavigationPage navigationPage)
previousPage = stack[stack.Count - 1];

ToolbarItems = _toolbarTracker.ToolbarItems;
IsVisible = NavigationPage.GetHasNavigationBar(currentPage) && _hasAppeared;

if (currentPage.Parent is not null)
{
IsVisible = NavigationPage.GetHasNavigationBar(currentPage.Parent)
&& NavigationPage.GetHasNavigationBar(currentPage)
&& _hasAppeared;
}
else
{
IsVisible = NavigationPage.GetHasNavigationBar(currentPage) && _hasAppeared;
}


UpdateBackButton();

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue13807.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8" ?>
<TabbedPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Maui.Controls.Sample.Issues.Issue13807">

<NavigationPage Title="Navigation Page"
HasNavigationBar="False" BarBackgroundColor="Red" BarBackground="Green">
<x:Arguments>
<ContentPage Title="Content Page">
<ScrollView>
<VerticalStackLayout Padding="30,0" Spacing="25">
<Label AutomationId="label" Text="Hello, World!"/>
</VerticalStackLayout>
</ScrollView>
</ContentPage>
</x:Arguments>
</NavigationPage>

</TabbedPage>
12 changes: 12 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue13807.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace Maui.Controls.Sample.Issues
{
[XamlCompilation(XamlCompilationOptions.Compile)]
[Issue(IssueTracker.Github, 13807, "NavigationPage TitleBar Persists if child pages have a title", PlatformAffected.All)]
public partial class Issue13807 : TabbedPage
{
public Issue13807()
{
InitializeComponent();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#if !MACCATALYST
using NUnit.Framework;
using UITest.Appium;
using UITest.Core;

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

public override string Issue => "NavigationPage TitleBar Persists if child pages have a title";

[Test]
[Category(UITestCategories.Navigation)]
public void NavigationBarVisibility()
{
App.WaitForElement("label");
VerifyScreenshot();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Triggered the build, it should generate the reference snapshot for this test.

}
}
}
#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.
Loading