mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-14 18:12:09 +08:00
fix(ios): frame navigatingTo event (#10096)
This commit is contained in:
@ -307,7 +307,7 @@ export class Frame extends FrameBase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public _onNavigatingTo(backstackEntry: BackstackEntry, isBack: boolean) {
|
public _onNavigatingTo(backstackEntry: BackstackEntry, isBack: boolean) {
|
||||||
//
|
super._onNavigatingTo(backstackEntry, isBack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,13 +118,6 @@ class UIViewControllerImpl extends UIViewController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const frame = this.navigationController ? (<any>this.navigationController).owner : null;
|
const frame = this.navigationController ? (<any>this.navigationController).owner : null;
|
||||||
const newEntry = this[ENTRY];
|
|
||||||
|
|
||||||
// Don't raise event if currentPage was showing modal page.
|
|
||||||
if (!owner._presentedViewController && newEntry && (!frame || frame.currentPage !== owner)) {
|
|
||||||
const isBack = isBackNavigationTo(owner, newEntry);
|
|
||||||
owner.onNavigatingTo(newEntry.entry.context, isBack, newEntry.entry.bindingContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (frame) {
|
if (frame) {
|
||||||
if (!owner.parent) {
|
if (!owner.parent) {
|
||||||
|
Reference in New Issue
Block a user