javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): allow navigationFrom event for deep navigation within modal frame (#9187)

Browse Source
This commit is contained in:
Martin Guillon
2021-02-05 20:26:59 +01:00
committed by GitHub
parent 4945702620
commit 8f1455eef7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/ui/page/index.ios.ts
View File

@ -214,7 +214,7 @@ class UIViewControllerImpl extends UIViewController {
// or because we are closing a modal page, // or because we are closing a modal page,
// or because we are in tab and another controller is selected. // or because we are in tab and another controller is selected.
const tab = this.tabBarController; const tab = this.tabBarController;
if (owner.onNavigatingFrom && !owner._presentedViewController && !this.presentingViewController && frame && frame.currentPage === owner) { if (owner.onNavigatingFrom && !owner._presentedViewController && frame && (!this.presentingViewController || frame.backStack.length > 0) && frame.currentPage === owner) {
const willSelectViewController = tab && (<any>tab)._willSelectViewController; const willSelectViewController = tab && (<any>tab)._willSelectViewController;
if (!willSelectViewController || willSelectViewController === tab.selectedViewController) { if (!willSelectViewController || willSelectViewController === tab.selectedViewController) {
const isBack = isBackNavigationFrom(this, owner); const isBack = isBackNavigationFrom(this, owner);