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-frame): do not update backstack when navigating the same page (#5426)

Browse Source
This commit is contained in:
Alexander Djenkov
2018-02-19 11:53:04 +02:00
committed by GitHub
parent b8e0beccdd
commit 714af6bb02
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tns-core-modules/ui/frame/frame.ios.ts
View File

@ -37,6 +37,14 @@ export class Frame extends FrameBase {
return this._ios; return this._ios;
} }
public setCurrent(entry: BackstackEntry, isBack: boolean): void {
if (entry !== this._currentEntry) {
this._updateBackstack(entry, isBack);
}
super.setCurrent(entry, isBack);
}
@profile @profile
public _navigateCore(backstackEntry: BackstackEntry) { public _navigateCore(backstackEntry: BackstackEntry) {
super._navigateCore(backstackEntry); super._navigateCore(backstackEntry);
@ -352,7 +360,7 @@ class UINavigationControllerImpl extends UINavigationController {
@profile @profile
public viewDidDisappear(animated: boolean): void { public viewDidDisappear(animated: boolean): void {
super.viewDidDisappear(animated); super.viewDidDisappear(animated);
const owner = this._owner.get(); const owner = this._owner.get();
if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) { if (owner && owner.isLoaded && !owner.parent && !this.presentedViewController) {
owner.callUnloaded(); owner.callUnloaded();

1
tns-core-modules/ui/page/page.ios.ts
View File

@ -138,7 +138,6 @@ class UIViewControllerImpl extends UIViewController {
isBack = isBackNavigationTo(owner, newEntry); isBack = isBackNavigationTo(owner, newEntry);
} }
frame._updateBackstack(newEntry, isBack);
frame.setCurrent(newEntry, isBack); frame.setCurrent(newEntry, isBack);
// If page was shown with custom animation - we need to set the navigationController.delegate to the animatedDelegate. // If page was shown with custom animation - we need to set the navigationController.delegate to the animatedDelegate.