addressed AI review summary

devanathan-vaithiyanathan · devanathan-vaithiyanathan · commit 59cbf013c7fa · 2026-03-24T14:02:09.000+05:30
diff --git a/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs b/src/Controls/src/Core/FlyoutPage/FlyoutPage.Mapper.cs
@@ -45,10 +45,12 @@ internal static void MapCollapseStyle(IFlyoutViewHandler handler, IFlyoutView vi
 				switch (collapseStyle)
 				{
 					case PlatformConfiguration.WindowsSpecific.CollapseStyle.Partial:
+						navigationView.FlyoutPaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftCompact;
 						navigationView.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftCompact;
 						break;
 					case PlatformConfiguration.WindowsSpecific.CollapseStyle.Full:
 					default:
+						navigationView.FlyoutPaneDisplayMode = null;
 						navigationView.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftMinimal;
 						break;
 				}
diff --git a/src/Core/src/Platform/Windows/MauiNavigationView.cs b/src/Core/src/Platform/Windows/MauiNavigationView.cs
@@ -182,13 +182,14 @@ internal void UpdatePaneDisplayModeFromFlyoutBehavior(FlyoutBehavior flyoutBehav
 			{
 				case FlyoutBehavior.Flyout:
 					IsPaneToggleButtonVisible = true;
+					var flyoutMode = FlyoutPaneDisplayMode ?? NavigationViewPaneDisplayMode.LeftMinimal;
 					// WinUI bug: Setting PaneDisplayMode to the same value and updating SelectedItem during navigation
 					// causes the selection and selected item indicator to not update correctly.
 					// Workaround: Only set PaneDisplayMode when the value actually changes.
 					// Related: https://github.com/microsoft/microsoft-ui-xaml/issues/9812
-					if (PaneDisplayMode != NavigationViewPaneDisplayMode.LeftMinimal)
+					if (PaneDisplayMode != flyoutMode)
 					{
-						PaneDisplayMode = NavigationViewPaneDisplayMode.LeftMinimal;
+						PaneDisplayMode = flyoutMode;
 					}
 					break;
 				case FlyoutBehavior.Locked:
@@ -371,6 +372,11 @@ internal static readonly DependencyProperty PaneToggleButtonWidthProperty
 				new PropertyMetadata(DefaultPaneToggleButtonWidth, OnPaneToggleButtonSizeChanged));
 		private NavigationViewPaneDisplayMode? _pinPaneDisplayModeTo;
 
+		// Stores the preferred pane display mode for FlyoutBehavior.Flyout, set by CollapseStyle on Windows.
+		// When null, the default LeftMinimal is used. This ensures CollapseStyle.Partial (LeftCompact) survives
+		// layout-driven FlyoutBehavior re-evaluations (e.g. size/orientation changes).
+		internal NavigationViewPaneDisplayMode? FlyoutPaneDisplayMode { get; set; }
+
 		internal double PaneToggleButtonWidth
 		{
 			get => (double)GetValue(PaneToggleButtonWidthProperty);

Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,12 @@ internal static void MapCollapseStyle(IFlyoutViewHandler handler, IFlyoutView vi`
`45`	`45`	`switch (collapseStyle)`
`46`	`46`	`{`
`47`	`47`	`case PlatformConfiguration.WindowsSpecific.CollapseStyle.Partial:`
	`48`	`+ navigationView.FlyoutPaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftCompact;`
`48`	`49`	`navigationView.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftCompact;`
`49`	`50`	`break;`
`50`	`51`	`case PlatformConfiguration.WindowsSpecific.CollapseStyle.Full:`
`51`	`52`	`default:`
	`53`	`+ navigationView.FlyoutPaneDisplayMode = null;`
`52`	`54`	`navigationView.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftMinimal;`
`53`	`55`	`break;`
`54`	`56`	`}`