fix(iOS): CommandBar updates on navigation #3017

unoplatform · Oct 17, 2020 · 48d1b0a · 48d1b0a
1 parent b0be2c9
commit 48d1b0a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Uno.UI/Controls/CommandBarHelper.iOS.cs b/src/Uno.UI/Controls/CommandBarHelper.iOS.cs
@@ -1,4 +1,4 @@
-#if __IOS__
+#if __IOS__
 using System;
 using System.Linq;
 using Windows.UI.Xaml;
@@ -102,6 +102,16 @@ public static void PageDidDisappear(UIViewController pageController)
 			}
 		}
 
+		public static void PageWillDisappear(UIViewController pageController)
+		{
+			var topCommandBar = pageController.FindTopCommandBar();
+			if (topCommandBar != null)
+			{
+				// Set the native navigation bar to null so it does not render when the page is not visible
+				SetNavigationBar(topCommandBar, null);
+			}
+		}
+
 		private static CommandBar FindTopCommandBar(this UIViewController controller)
 		{
 			return (controller.View as Page)?.TopAppBar as CommandBar

diff --git a/src/Uno.UI/Controls/NativeFramePresenter.iOS.cs b/src/Uno.UI/Controls/NativeFramePresenter.iOS.cs
@@ -704,6 +704,19 @@ public override void ViewWillAppear(bool animated)
 				}
 			}
 
+			public override void ViewWillDisappear(bool animated)
+			{
+				try
+				{
+					base.ViewWillDisappear(animated);
+					CommandBarHelper.PageWillDisappear(this);
+				}
+				catch (Exception e)
+				{
+					Application.Current.RaiseRecoverableUnhandledException(e);
+				}
+			}
+
 			public override void ViewDidDisappear(bool animated)
 			{
 				try