Skip to content

Commit 8f1455e

Browse files
farfromrefugfarfromrefug
authored
fix(ios): allow navigationFrom event for deep navigation within modal frame (#9187)
1 parent 4945702 commit 8f1455e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎packages/core/ui/page/index.ios.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class UIViewControllerImpl extends UIViewController {
214214
// or because we are closing a modal page,
215215
// or because we are in tab and another controller is selected.
216216
const tab = this.tabBarController;
217-
if (owner.onNavigatingFrom && !owner._presentedViewController && !this.presentingViewController && frame && frame.currentPage === owner) {
217+
if (owner.onNavigatingFrom && !owner._presentedViewController && frame && (!this.presentingViewController || frame.backStack.length > 0) && frame.currentPage === owner) {
218218
const willSelectViewController = tab && (<any>tab)._willSelectViewController;
219219
if (!willSelectViewController || willSelectViewController === tab.selectedViewController) {
220220
const isBack = isBackNavigationFrom(this, owner);

0 commit comments

Comments
 (0)