From 30d06f2d7ed23d36305657e461d349f4292a997e Mon Sep 17 00:00:00 2001 From: Manol Donev Date: Fri, 31 May 2019 19:16:33 +0300 Subject: [PATCH] fix iOS back transition after hmr --- tns-core-modules/ui/page/page.ios.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tns-core-modules/ui/page/page.ios.ts b/tns-core-modules/ui/page/page.ios.ts index 2c94dc37e..4e03a8ef9 100644 --- a/tns-core-modules/ui/page/page.ios.ts +++ b/tns-core-modules/ui/page/page.ios.ts @@ -140,10 +140,12 @@ class UIViewControllerImpl extends UIViewController { if (!owner._presentedViewController && frame) { 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 isReplace = navigationContext.navigationType === NavigationType.replace; + + frame.setCurrent(newEntry); + if (isReplace) { let controller = newEntry.resolvedPage.ios; if (controller) {