Fix 9939 [iOS][UWP] Dispose method not called when adding control ins…

…ide the NavigationPage.TitleView (#10152) * Add call for TitleView Cleanup() method when popping for UWP * Add TitleView Dispose() call for iOS Co-authored-by: Yuriy Holembyovskyy <[email protected]> fixes #9939
xamarin · Apr 3, 2020 · e4e3939 · e4e3939
1 parent da998ca
commit e4e3939
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Xamarin.Forms.Platform.UAP/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.UAP/NavigationPageRenderer.cs
@@ -453,7 +453,10 @@ void SetPage(Page page, bool isAnimated, bool isPopping)
 			if (_currentPage != null)
 			{
 				if (isPopping)
+				{
 					_currentPage.Cleanup();
+					_container.TitleView?.Cleanup();
+				}
 
 				_container.Content = null;
 				_currentPage.PropertyChanged -= OnCurrentPagePropertyChanged;

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
@@ -1082,6 +1082,12 @@ protected override void Dispose(bool disposing)
 					_tracker.CollectionChanged -= TrackerOnCollectionChanged;
 					_tracker = null;
 
+					if (NavigationItem.TitleView != null)
+					{
+						NavigationItem.TitleView.Dispose();
+						NavigationItem.TitleView = null;
+					}
+
 					if (NavigationItem.RightBarButtonItems != null)
 					{
 						for (var i = 0; i < NavigationItem.RightBarButtonItems.Length; i++)