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

fix iOS back transition after hmr

Browse Source
This commit is contained in:
Manol Donev
2019-05-31 19:16:33 +03:00
parent 7c22ffed45
commit 30d06f2d7e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,10 +140,12 @@ class UIViewControllerImpl extends UIViewController {
if (!owner._presentedViewController && frame) { if (!owner._presentedViewController && frame) {
const newEntry: BackstackEntry = this[ENTRY]; const newEntry: BackstackEntry = this[ENTRY];
frame.setCurrent(newEntry); // frame.setCurrent(...) will reset executing context so retrieve it here
const navigationContext = frame._executingContext || { navigationType: NavigationType.unset }; const navigationContext = frame._executingContext || { navigationType: NavigationType.unset };
const isReplace = navigationContext.navigationType === NavigationType.replace; const isReplace = navigationContext.navigationType === NavigationType.replace;
frame.setCurrent(newEntry);
if (isReplace) { if (isReplace) {
let controller = newEntry.resolvedPage.ios; let controller = newEntry.resolvedPage.ios;
if (controller) { if (controller) {