Merge pull request #1267 from unoplatform/mergify/bp/release/stable/6…

….3/pr-1266 fix: Adjust `NativeFramePresenter` to work with new `TemplatedParent` (backport #1266)
unoplatform · Oct 15, 2024 · b83c0bc · b83c0bc
2 parents fedf139 + 665f94d
commit b83c0bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeFramePresenter.Android.cs b/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeFramePresenter.Android.cs
@@ -45,12 +45,13 @@ public partial class NativeFramePresenter : Grid // Inheriting from Grid is a ha
 		public NativeFramePresenter()
 		{
 			_pageStack = this;
+
+			this.Loaded += OnLoaded;
 		}
 
-		protected override void OnTemplatedParentChanged(DependencyPropertyChangedEventArgs e)
+		private void OnLoaded(object sender, RoutedEventArgs e)
 		{
-			base.OnTemplatedParentChanged(e);
-			Initialize(TemplatedParent as Frame);
+			Initialize(this.FindFirstParent<Frame>());
 		}
 
 		private void Initialize(Frame? frame)

diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeFramePresenter.iOS.cs b/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeFramePresenter.iOS.cs
@@ -107,12 +107,12 @@ public NativeFramePresenter()
 			SizeChanged += NativeFramePresenter_SizeChanged;
 			// Hide the NavigationBar by default. Only show if navigating to a Page that contains a NavigationBar.
 			NavigationController.NavigationBarHidden = true;
+			this.Loaded += OnLoaded;
 		}
 
-		protected override void OnTemplatedParentChanged(DependencyPropertyChangedEventArgs e)
+		private void OnLoaded(object sender, RoutedEventArgs e)
 		{
-			base.OnTemplatedParentChanged(e);
-			InitializeController(TemplatedParent as Frame);
+			InitializeController(this.FindFirstParent<Frame>());
 		}
 
 		/// <summary>