Skip to content
This repository has been archived by the owner on Oct 18, 2023. It is now read-only.

Commit

Permalink
fixing null INavigationParameters
Browse files Browse the repository at this point in the history
  • Loading branch information
dansiegel committed Jul 27, 2019
1 parent 4b906c4 commit d7eb301
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/Prism.Plugin.Popups/PopupPageNavigationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,14 @@ await DoNavigateAction(null, nextSegment, detail, parameters, onNavigationAction
else
{
var newDetail = CreatePageFromSegment(nextSegment);
await ProcessNavigation(newDetail, segments, parameters, newDetail is NavigationPage ? false : true, animated);
var segmentParameters = UriParsingHelper.GetSegmentParameters(nextSegment, parameters);
await ProcessNavigation(newDetail, segments, segmentParameters, newDetail is NavigationPage ? false : true, animated);

await ProcessNewDetailForMasterDetailPage(currentPage, newDetail, detail, detailIsNavPage, isPresented, animated, nextSegment, parameters);
await DoNavigationActionForNewDetail(currentPage, newDetail, detail, detailIsNavPage, isPresented, animated, nextSegment, segmentParameters);
}
}

private async Task ProcessNewDetailForMasterDetailPage(MasterDetailPage currentPage, Page newDetail, Page oldDetail, bool detailIsNavPage, bool isPresented, bool animated, string nextSegment, INavigationParameters parameters)
private async Task DoNavigationActionForNewDetail(MasterDetailPage currentPage, Page newDetail, Page oldDetail, bool detailIsNavPage, bool isPresented, bool animated, string nextSegment, INavigationParameters parameters)
{
if (newDetail is PopupPage)
{
Expand Down

0 comments on commit d7eb301

Please sign in to comment.