Skip to content

Commit

Permalink
fixed #1857
Browse files Browse the repository at this point in the history
  • Loading branch information
brianlagunas committed Jul 26, 2019
1 parent 128328a commit ef3d803
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Source/Xamarin/Prism.Forms/Navigation/PageNavigationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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))
{
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
}
Expand Down

0 comments on commit ef3d803

Please sign in to comment.