Skip to content

Commit 8e5bcdd

Browse files
authored
fix(ios): revert regression from PR #10096
#10096 The changes in `ui/page/index.ios.ts` where not meant to be there.
1 parent 4723114 commit 8e5bcdd

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,14 @@ class UIViewControllerImpl extends UIViewController {
118118
}
119119

120120
const frame = this.navigationController ? (<any>this.navigationController).owner : null;
121+
const newEntry = this[ENTRY];
121122

123+
// Don't raise event if currentPage was showing modal page.
124+
if (!owner._presentedViewController && newEntry && (!frame || frame.currentPage !== owner)) {
125+
const isBack = isBackNavigationTo(owner, newEntry);
126+
owner.onNavigatingTo(newEntry.entry.context, isBack, newEntry.entry.bindingContext);
127+
}
128+
122129
if (frame) {
123130
if (!owner.parent) {
124131
owner._frame = frame;

0 commit comments

Comments
 (0)