Enable modal and animate

PrismLibrary · Dec 18, 2022 · 9113b7d · 9113b7d
1 parent 28f0e91
commit 9113b7d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Prism.Maui/Navigation/PageNavigationService.cs b/src/Prism.Maui/Navigation/PageNavigationService.cs
@@ -331,9 +331,14 @@ protected virtual async Task ProcessNavigation(Page currentPage, Queue<string> s
         var nextSegment = segments.Dequeue();
 
         var pageParameters = UriParsingHelper.GetSegmentParameters(nextSegment);
-        //var useModalNavigation = pageParameters.ContainsKey(KnownNavigationParameters.UseModalNavigation) ? pageParameters.GetValue<bool>(KnownNavigationParameters.UseModalNavigation) : false;
 
-        //var animated = pageParameters.ContainsKey(KnownNavigationParameters.Animated) ? pageParameters.GetValue<bool>(KnownNavigationParameters.Animated) : true;
+        useModalNavigation =  pageParameters.ContainsKey(KnownNavigationParameters.UseModalNavigation) ? pageParameters.GetValue<bool>(KnownNavigationParameters.UseModalNavigation) : false;        
+        if (!useModalNavigation.Value && !MvvmHelpers.HasNavigationPageParent(currentPage))
+            useModalNavigation = true;
+
+        animated = parameters.ContainsKey(KnownNavigationParameters.Animated) ?
+            parameters.GetValue<bool>(KnownNavigationParameters.Animated) :
+                pageParameters.ContainsKey(KnownNavigationParameters.Animated) ? pageParameters.GetValue<bool>(KnownNavigationParameters.Animated) : true;        
 
         if (nextSegment == RemovePageSegment)
         {