[release/10.0.1xx-preview7] Update release with latest fixes from net10.0 (#30912) (#30998)

Author: rmarinho

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

@@ -977,16 +977,27 @@ internal static void SetFlyoutLeftBarButton(UIViewController containerController
 			{
 				var icon = result?.Value;
 				var originalImageSize = icon?.Size ?? CGSize.Empty;
-				// Referred from the default hamburger size 
-				var defaultIconHeight = 23f;
-				var defaultIconWidth = 23f;
+
+				// The largest height you can use for navigation bar icons in iOS.
+				// Per Apple's Human Interface Guidelines, the navigation bar height is 44 points,
+				// so using the full height ensures maximum visual clarity and maintains consistency
+				// with iOS design standards. This allows icons to utilize the entire available
+				// vertical space within the navigation bar container.
+				var defaultIconHeight = 44f;
 				var buffer = 0.1;
+				// We only check height because the navigation bar constrains vertical space (44pt height),
+				// but allows horizontal flexibility. Width can vary based on icon design and content,
+				// while height must fit within the fixed navigation bar bounds to avoid clipping.
+				
 				// if the image is bigger than the default available size, resize it
 				if (icon is not null)
 				{
-					if (originalImageSize.Height - defaultIconHeight > buffer || originalImageSize.Width - defaultIconWidth > buffer)
+					if (originalImageSize.Height - defaultIconHeight > buffer)
 					{
-						icon = icon.ResizeImageSource(defaultIconWidth, defaultIconHeight, originalImageSize);
+						if (FlyoutPage.Flyout.IconImageSource is not FontImageSource fontImageSource || !fontImageSource.IsSet(FontImageSource.SizeProperty))
+						{
+							icon = icon.ResizeImageSource(originalImageSize.Width, defaultIconHeight, originalImageSize);
+						}
 					}
 					try
 					{

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs

@@ -465,15 +465,26 @@ void UpdateLeftToolbarItems()
 				{
 					icon = result?.Value;
 					var originalImageSize = icon?.Size ?? CGSize.Empty;
-					// Referred from the default hamburger size 
-					var defaultIconHeight = 23f;
-					var defaultIconWidth = 23f;
+
+					// The largest height you can use for navigation bar icons in iOS.
+					// Per Apple's Human Interface Guidelines, the navigation bar height is 44 points,
+					// so using the full height ensures maximum visual clarity and maintains consistency
+					// with iOS design standards. This allows icons to utilize the entire available
+					// vertical space within the navigation bar container.
+					var defaultIconHeight = 44f;
 					var buffer = 0.1;
+					// We only check height because the navigation bar constrains vertical space (44pt height),
+					// but allows horizontal flexibility. Width can vary based on icon design and content,
+					// while height must fit within the fixed navigation bar bounds to avoid clipping.
+					
 					// if the image is bigger than the default available size, resize it
 
-					if (icon is not null && originalImageSize.Height - defaultIconHeight > buffer || originalImageSize.Width - defaultIconWidth > buffer)
+					if (icon is not null && originalImageSize.Height - defaultIconHeight > buffer)
 					{
-						icon = icon.ResizeImageSource(defaultIconWidth, defaultIconHeight, originalImageSize);
+						if (image is not FontImageSource fontImageSource || !fontImageSource.IsSet(FontImageSource.SizeProperty))
+						{
+							icon = icon.ResizeImageSource(originalImageSize.Width, defaultIconHeight, originalImageSize);
+						}
 					}
 				}
 				else if (String.IsNullOrWhiteSpace(text) && IsRootPage && _flyoutBehavior == FlyoutBehavior.Flyout)

src/Controls/src/Core/FlyoutPage/FlyoutPage.cs

@@ -53,24 +53,44 @@ public Page Detail
 					throw new InvalidOperationException("Detail must not already have a parent.");
 
 				var previousDetail = _detail;
-				// TODO MAUI refine this to fire earlier
-				_detail?.SendNavigatingFrom(new NavigatingFromEventArgs());
 
+				// Get the actual pages for navigation events (unwrap NavigationPages)
+				var destinationPage =
+					value is NavigationPage destinationNavPage ? destinationNavPage.CurrentPage : value;
+				var previousPage = previousDetail is NavigationPage previousNavPage
+					? previousNavPage.CurrentPage
+					: previousDetail;
+
+				// Send NavigatingFrom event to the previous detail (if any)
+				if (previousDetail is not null)
+				{
+					previousDetail.SendNavigatingFrom(new NavigatingFromEventArgs(destinationPage,
+						NavigationType.Replace));
+				}
+
+				// Update the detail property
 				OnPropertyChanging();
-				if (_detail != null)
+				if (_detail is not null)
 					InternalChildren.Remove(_detail);
 				_detail = value;
 				InternalChildren.Add(_detail);
 				OnPropertyChanged();
 
-				if (this.HasAppeared)
+				// Handle Appearing/Disappearing events if the FlyoutPage has appeared
+				if (HasAppeared)
 				{
 					previousDetail?.SendDisappearing();
 					_detail?.SendAppearing();
 				}
 
-				previousDetail?.SendNavigatedFrom(new NavigatedFromEventArgs(_detail, NavigationType.PageSwap));
-				_detail?.SendNavigatedTo(new NavigatedToEventArgs(previousDetail));
+				// Send NavigatedFrom and NavigatedTo events
+				if (previousDetail is not null)
+				{
+					previousDetail.SendNavigatedFrom(
+						new NavigatedFromEventArgs(destinationPage, NavigationType.Replace));
+				}
+
+				_detail.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
 		}
 
@@ -108,8 +128,9 @@ public Page Flyout
 
 				// TODO MAUI refine this to fire earlier
 				var previousFlyout = _flyout;
+				
 				// TODO MAUI refine this to fire earlier
-				_flyout?.SendNavigatingFrom(new NavigatingFromEventArgs());
+				previousFlyout?.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
 
 				OnPropertyChanging();
 				if (_flyout != null)
@@ -123,9 +144,9 @@ public Page Flyout
 					previousFlyout?.SendDisappearing();
 					_flyout?.SendAppearing();
 				}
-
-				previousFlyout?.SendNavigatedFrom(new NavigatedFromEventArgs(_flyout, NavigationType.PageSwap));
-				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout));
+				
+				previousFlyout?.SendNavigatedFrom(new NavigatedFromEventArgs(_flyout, NavigationType.Replace));
+				_flyout?.SendNavigatedTo(new NavigatedToEventArgs(previousFlyout, NavigationType.Replace));
 			}
 		}
 

src/Controls/src/Core/MultiPage.cs

@@ -83,10 +83,15 @@ public T CurrentPage
 
 				var previousPage = _current;
 				OnPropertyChanging();
-
+ 				
 				// TODO: MAUI refine this to fire earlier
-				_current?.SendNavigatingFrom(new NavigatingFromEventArgs());
-
+				
+				// Send NavigatingFrom to the previous page or to the new page if no previous page exists
+				if (_current is not null)
+				{
+					_current.SendNavigatingFrom(new NavigatingFromEventArgs(value, NavigationType.Replace));
+				}
+				
 				_current = value;
 
 				previousPage?.SendDisappearing();
@@ -96,9 +101,10 @@ public T CurrentPage
 
 				if (HasAppeared)
 					_current?.SendAppearing();
-
-				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(_current, NavigationType.PageSwap));
-				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage));
+				
+				
+				previousPage?.SendNavigatedFrom(new NavigatedFromEventArgs(_current, NavigationType.Replace));
+				_current?.SendNavigatedTo(new NavigatedToEventArgs(previousPage, NavigationType.Replace));
 			}
 		}
 
@@ -377,4 +383,4 @@ void UpdateCurrentPage()
 				CurrentPage = (T)SelectedItem;
 		}
 	}
-}
+}

src/Controls/src/Core/NavigationModel.cs

@@ -113,7 +113,7 @@ public Page PopModal()
 				_navTree[0].Count > 0 &&
 				_navTree[0][0] is not Shell)
 			{
-				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs());
+				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs(CurrentPage, NavigationType.Pop));
 				previousPage.SendDisappearing();
 				CurrentPage.SendAppearing();
 			}
@@ -201,7 +201,7 @@ public void PushModal(Page page)
 				_navTree[0].Count > 0 &&
 				_navTree[0][0] is not Shell)
 			{
-				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs());
+				previousPage.SendNavigatingFrom(new NavigatingFromEventArgs(page, NavigationType.Push));
 				previousPage.SendDisappearing();
 				page.SendAppearing();
 			}

src/Controls/src/Core/NavigationPage/NavigationPage.Legacy.cs

@@ -25,7 +25,7 @@ async Task<Page> PopAsyncInner(
 
 			var page = (Page)InternalChildren.Last();
 			var previousPage = CurrentPage;
-			SendNavigating();
+			SendNavigating(NavigationType.Pop, previousPage);
 			var removedPage = await RemoveAsyncInner(page, animated, fast);
 			SendNavigated(previousPage, NavigationType.Pop);
 			return removedPage;
@@ -150,7 +150,7 @@ async Task PopToRootAsyncInner(bool animated)
 				return;
 
 			var previousPage = CurrentPage;
-			SendNavigating();
+			SendNavigating(NavigationType.PopToRoot, previousPage);
 			FireDisappearing(CurrentPage);
 			FireAppearing((Page)InternalChildren[0]);
 
@@ -183,7 +183,9 @@ async Task PushAsyncInner(Page page, bool animated)
 				return;
 
 			var previousPage = CurrentPage;
-			SendNavigating();
+			var navigationType = DetermineNavigationType();
+			
+			SendNavigating(navigationType, previousPage);
 			FireDisappearing(CurrentPage);
 			FireAppearing(page);
 
@@ -198,9 +200,9 @@ async Task PushAsyncInner(Page page, bool animated)
 
 				if (args.Task != null)
 					await args.Task;
-			}
-
-			SendNavigated(previousPage, NavigationType.Push);
+			} 
+			
+			SendNavigated(previousPage, navigationType);
 			Pushed?.Invoke(this, args);
 		}