CR comments resolved

dotnet · Jul 6, 2024 · ca6ae6b · ca6ae6b
1 parent 91c8ea9
commit ca6ae6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs
@@ -322,6 +322,12 @@ void UpdateLeftToolbarItems()
 				image = _context.Shell.FlyoutIcon;
 			}
 
+			if (!IsRootPage)
+			{
+				NavigationItem.HidesBackButton = !backButtonVisible;
+				image = backButtonVisible ? image : null;
+			}
+
 			image.LoadImage(MauiContext, result =>
 			{
 				UIImage icon = null;
@@ -368,13 +374,6 @@ void UpdateLeftToolbarItems()
 				}
 			});
 
-			if (!IsRootPage)
-			{
-				NavigationItem.HidesBackButton = !backButtonVisible;
-				if(!backButtonVisible)
-					NavigationItem.LeftBarButtonItem = null;
-			}
-
 			UpdateBackButtonTitle();
 		}
 

diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue23424.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue23424.xaml.cs
@@ -7,8 +7,7 @@ public partial class Issue23424 : Shell
 	public Issue23424()
 	{
 		Items.Add(new ContentPage());
-		Routing.RegisterRoute(nameof(DetailPage),typeof(DetailPage));
-		GoToAsync(nameof(DetailPage));
+		Navigation.PushAsync(new DetailPage());
 	}
 
 	public class DetailPage : ContentPage