fix (hmr): Change for fixing both HMR issues nativescript-vue#461 and nativescript-vue#470 in NS 5.2 and 5.3

msaelices · msaelices · commit 7dbdd0b48156 · 2019-04-06T02:22:30.000+02:00
diff --git a/platform/nativescript/runtime/components/frame.js b/platform/nativescript/runtime/components/frame.js
@@ -2,6 +2,7 @@ import { setFrame, getFrame, deleteFrame } from '../../util/frame'
 import { isHMRChecking, resetHMRChecking } from '../../util/hmr'
 import { isAndroid, isIOS } from 'tns-core-modules/platform'
 import { ios as iosUtils } from 'tns-core-modules/utils/utils'
+import { _setAndroidFragmentTransitions } from 'tns-core-modules/ui/frame/fragment.transitions'
 
 let idCounter = 1
 
diff --git a/platform/nativescript/runtime/components/list-view.js b/platform/nativescript/runtime/components/list-view.js
@@ -51,7 +51,7 @@ export default {
 
   mounted() {
     if (!this.$templates) {
-        return;
+      return
     }
 
     this.$refs.listView.setAttribute(
@@ -69,9 +69,9 @@ export default {
     },
     onItemLoading(args) {
       if (!this.$templates) {
-        return;
+        return
       }
- 
+
       const index = args.index
       const items = args.object.items
 
diff --git a/platform/nativescript/runtime/components/page.js b/platform/nativescript/runtime/components/page.js
@@ -1,3 +1,4 @@
+import { isAndroid } from 'tns-core-modules/platform'
 import {
   findParentNavigationEntry,
   getFrameInstance
@@ -22,7 +23,7 @@ export default {
 
     let frame = null
 
-    if (isHMRChecking()) {
+    if (isHMRChecking() && !isAndroid) {
       const navEntry = findParentNavigationEntry(this)
       const options = {
         frame: navEntry ? navEntry.$options.frame : 'default'
diff --git a/platform/nativescript/runtime/modules/transition.js b/platform/nativescript/runtime/modules/transition.js
@@ -76,7 +76,9 @@ export function enter(vnode, toggleDisplay) {
 
   const beforeEnterHook = isAppear ? beforeAppear || beforeEnter : beforeEnter
   const enterHook = isAppear
-    ? typeof appear === 'function' ? appear : enter
+    ? typeof appear === 'function'
+      ? appear
+      : enter
     : enter
   const afterEnterHook = isAppear ? afterAppear || afterEnter : afterEnter
   const enterCancelledHook = isAppear
