fixed #1857

PrismLibrary · Jul 26, 2019 · ef3d803 · ef3d803
1 parent 128328a
commit ef3d803
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Source/Xamarin/Prism.Forms/Navigation/PageNavigationService.cs b/Source/Xamarin/Prism.Forms/Navigation/PageNavigationService.cs
@@ -532,7 +532,7 @@ protected virtual async Task ProcessNavigationForNavigationPage(NavigationPage c
                 if (segments.Count > 0)
                     await UseReverseNavigation(topPage, segments.Dequeue(), segments, parameters, false, animated);
 
-                await DoNavigateAction(topPage, nextSegment, topPage, parameters, onNavigationActionCompleted: () =>
+                await DoNavigateAction(topPage, nextSegment, topPage, parameters, onNavigationActionCompleted: (p) =>
                 {
                     if (nextSegment.Contains(KnownNavigationParameters.SelectedTab))
                     {
@@ -584,7 +584,7 @@ protected virtual async Task ProcessNavigationForMasterDetailPage(MasterDetailPa
             {
                 var newDetail = CreatePageFromSegment(nextSegment);
                 await ProcessNavigation(newDetail, segments, parameters, useModalNavigation, animated);
-                await DoNavigateAction(null, nextSegment, newDetail, parameters, onNavigationActionCompleted: () =>
+                await DoNavigateAction(null, nextSegment, newDetail, parameters, onNavigationActionCompleted: (p) =>
                 {
                     currentPage.IsPresented = isPresented;
                     currentPage.Detail = newDetail;
@@ -636,7 +636,7 @@ protected virtual async Task ProcessNavigationForMasterDetailPage(MasterDetailPa
             if ((detailIsNavPage && reuseNavPage) || (!detailIsNavPage && detail.GetType() == nextSegmentType))
             {
                 await ProcessNavigation(detail, segments, parameters, useModalNavigation, animated);
-                await DoNavigateAction(null, nextSegment, detail, parameters, onNavigationActionCompleted: () =>
+                await DoNavigateAction(null, nextSegment, detail, parameters, onNavigationActionCompleted: (p) =>
                  {
                      if (detail is TabbedPage && nextSegment.Contains(KnownNavigationParameters.SelectedTab))
                      {
@@ -652,10 +652,10 @@ protected virtual async Task ProcessNavigationForMasterDetailPage(MasterDetailPa
             {
                 var newDetail = CreatePageFromSegment(nextSegment);
                 await ProcessNavigation(newDetail, segments, parameters, newDetail is NavigationPage ? false : true, animated);
-                await DoNavigateAction(detail, nextSegment, newDetail, parameters, onNavigationActionCompleted: () =>
+                await DoNavigateAction(detail, nextSegment, newDetail, parameters, onNavigationActionCompleted: (p) =>
                 {
                     if (detailIsNavPage)
-                        OnNavigatedFrom(((NavigationPage)detail).CurrentPage, parameters);
+                        OnNavigatedFrom(((NavigationPage)detail).CurrentPage, p);
 
                     currentPage.IsPresented = isPresented;
                     currentPage.Detail = newDetail;
@@ -687,7 +687,7 @@ protected static bool GetClearNavigationPageNavigationStack(NavigationPage page)
             return true;
         }
 
-        protected static async Task DoNavigateAction(Page fromPage, string toSegment, Page toPage, INavigationParameters parameters, Func<Task> navigationAction = null, Action onNavigationActionCompleted = null)
+        protected static async Task DoNavigateAction(Page fromPage, string toSegment, Page toPage, INavigationParameters parameters, Func<Task> navigationAction = null, Action<INavigationParameters> onNavigationActionCompleted = null)
         {
             var segmentParameters = UriParsingHelper.GetSegmentParameters(toSegment, parameters);
             segmentParameters.GetNavigationParametersInternal().Add(KnownInternalParameters.NavigationMode, NavigationMode.New);
@@ -703,7 +703,7 @@ protected static async Task DoNavigateAction(Page fromPage, string toSegment, Pa
 
             OnNavigatedFrom(fromPage, segmentParameters);
 
-            onNavigationActionCompleted?.Invoke();
+            onNavigationActionCompleted?.Invoke(segmentParameters);
 
             OnNavigatedTo(toPage, segmentParameters);
         }