Merge pull request #1342 from unoplatform/dev/nr/flyoutfix

fix: Correct flyout behaviour with navigation
unoplatform · Mar 30, 2023 · 68b1506 · 68b1506
2 parents d64f0f1 + 0320e5d
commit 68b1506
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Uno.Extensions.Navigation.UI/Controls/NavigationFlyout.xaml b/src/Uno.Extensions.Navigation.UI/Controls/NavigationFlyout.xaml
@@ -3,8 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:uen="using:Uno.Extensions.Navigation.UI"
-        Placement="Full"
-        FlyoutPresenterStyle="{StaticResource MaterialFlyoutPresenterStyle}">
+        Placement="Full">
 
     <Grid>
         <Frame uen:Region.Attached="True"

diff --git a/src/Uno.Extensions.Navigation.UI/ServiceCollectionExtensions.cs b/src/Uno.Extensions.Navigation.UI/ServiceCollectionExtensions.cs
@@ -18,6 +18,9 @@ public static IServiceCollection AddNavigation(
 		var routes = createRouteRegistry?.Invoke(services) ?? new RouteRegistry(services);
 		routeBuilder?.Invoke(views, routes);
 
+		// Only fall back to the navigation flyout if one hasn't already been registered
+		services.AddTransient<Flyout, NavigationFlyout>();
+
 		return services
 					.AddSingleton<NavigationConfig>(sp =>
 					{
@@ -41,7 +44,6 @@ public static IServiceCollection AddNavigation(
 					.AddHostedService<BrowserAddressBarService>()
 					.AddScoped<Navigator>()
 
-					.AddTransient<Flyout, NavigationFlyout>()
 
 					// Register the region for each control type
 					.AddRegion<Frame, FrameNavigator>()