From 2bbf28e5c7a9052efffa040ada870a547b0e97ac Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Wed, 2 Mar 2022 19:04:35 +0100
Subject: [PATCH 1/4] fix: fallback frame when navigating

---
 .../nativescript/plugins/navigator-plugin.js  |  2 +-
 platform/nativescript/util/frame.js           | 18 ++++++-
 samples/app/entry.js                          |  2 +-
 samples/app/multiple-default-frames.js        | 54 +++++++++++++++++++
 .../Android/src/main/AndroidManifest.xml      |  2 +-
 samples/nativescript.config.ts                | 19 ++++---
 samples/package.json                          |  6 +--
 samples/webpack.config.js                     | 23 +++++---
 8 files changed, 103 insertions(+), 23 deletions(-)
 create mode 100644 samples/app/multiple-default-frames.js

diff --git a/platform/nativescript/plugins/navigator-plugin.js b/platform/nativescript/plugins/navigator-plugin.js
index 1be5076a..f6d3ee87 100644
--- a/platform/nativescript/plugins/navigator-plugin.js
+++ b/platform/nativescript/plugins/navigator-plugin.js
@@ -34,7 +34,7 @@ export function getFrameInstance(frame) {
     frame = frame.nativeView
   }
   // finally get the component instance for this frame
-  return getFrame(frame.id)
+  return getFrame(frame.id, frame)
 }
 
 export function findParentFrame(vm) {
diff --git a/platform/nativescript/util/frame.js b/platform/nativescript/util/frame.js
index 93300d0a..a7dc7291 100644
--- a/platform/nativescript/util/frame.js
+++ b/platform/nativescript/util/frame.js
@@ -1,11 +1,25 @@
+import { VUE_ELEMENT_REF } from '../renderer/ElementNode'
+
 const frames = new Map()
 
 export function setFrame(id, frame) {
   return frames.set(id, frame)
 }
 
-export function getFrame(id) {
-  return frames.get(id)
+export function getFrame(id, fallback) {
+  if (frames.has(id)) {
+    return frames.get(id)
+  }
+
+  // handle a fallback case where the frame with a same id might have been unmounted, but another one with the same id exists as a fallback...
+  if (fallback) {
+    const frameVM = fallback[VUE_ELEMENT_REF]['__vue__']
+    setFrame(id, frameVM)
+
+    return frameVM
+  }
+
+  return null
 }
 
 export function deleteFrame(id) {
diff --git a/samples/app/entry.js b/samples/app/entry.js
index 8420d3db..4feb67d2 100644
--- a/samples/app/entry.js
+++ b/samples/app/entry.js
@@ -1 +1 @@
-require('./app-to-check-hmr')
+require('./multiple-default-frames')
diff --git a/samples/app/multiple-default-frames.js b/samples/app/multiple-default-frames.js
new file mode 100644
index 00000000..c1e9f881
--- /dev/null
+++ b/samples/app/multiple-default-frames.js
@@ -0,0 +1,54 @@
+const Vue = require('nativescript-vue')
+
+Vue.config.silent = false
+
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms))
+
+const pageComponent = title => ({
+  template: `
+        <Page>
+            <Label text="${title}" />
+        </Page>
+    `
+})
+
+let app = new Vue({
+  data() {
+    return {
+      showSecondFrame: true
+    }
+  },
+  template: `
+    <GridLayout rows="*, auto, *">
+        <ContentView row="0">
+            <Frame>
+                ${pageComponent('[top frame] Page 1').template}
+            </Frame>
+        </ContentView>
+        <Label row="1" text="--- SEPARATOR ---" textAlignment="center" backgroundColor="#eee" />
+        <ContentView row="2" backgroundColor="rgba(255, 0, 0, 0.1)">
+            <Frame v-if="showSecondFrame">
+                ${pageComponent('[bottom frame] Page 2').template}
+            </Frame>
+            <Label v-else text="No more frame here..." color="red" verticalAlignment="center" textAlignment="center" />
+        </ContentView>
+    </GridLayout>
+  `,
+  mounted() {
+    this.testNavigations().catch(err => {
+      console.log(err)
+    })
+  },
+  methods: {
+    async testNavigations() {
+      await wait(3000)
+      this.$navigateTo(pageComponent('[bottom frame] Page 3'))
+      await wait(3000)
+      this.showSecondFrame = false
+      await wait(3000)
+      this.$navigateTo(pageComponent('[top frame] Page 4'))
+    }
+  }
+})
+
+app.$start()
diff --git a/samples/app_resources/Android/src/main/AndroidManifest.xml b/samples/app_resources/Android/src/main/AndroidManifest.xml
index 8133c17d..7fcd2e44 100644
--- a/samples/app_resources/Android/src/main/AndroidManifest.xml
+++ b/samples/app_resources/Android/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
                  android:icon="@drawable/icon"
                  android:label="@string/app_name"
                  android:theme="@style/AppTheme">
-        <activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/LaunchScreenTheme">
+        <activity android:exported="true" android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:configChanges="keyboardHidden|orientation|screenSize" android:theme="@style/LaunchScreenTheme">
             <meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/samples/nativescript.config.ts b/samples/nativescript.config.ts
index 02fe39af..aad794fb 100644
--- a/samples/nativescript.config.ts
+++ b/samples/nativescript.config.ts
@@ -1,12 +1,15 @@
-import { NativeScriptConfig } from "@nativescript/core";
+import { NativeScriptConfig } from '@nativescript/core'
 
 export default {
-	id: 'org.nativescript.application',
+  id: 'org.nativescript.application',
   appPath: 'app',
-	appResourcesPath: 'app_resources',
-	android: {
-		markingMode: 'none',
-		v8Flags: '--expose-gc',
-		maxLogcatObjectSize: 9999,
-	}
+  appResourcesPath: 'app_resources',
+  android: {
+    markingMode: 'none',
+    v8Flags: '--expose-gc',
+    maxLogcatObjectSize: 9999
+  },
+  cli: {
+    packageManager: 'yarn'
+  }
 } as NativeScriptConfig
diff --git a/samples/package.json b/samples/package.json
index 0c681440..51fe5679 100644
--- a/samples/package.json
+++ b/samples/package.json
@@ -7,13 +7,13 @@
   "license": "MIT",
   "readme": "NativeScriptVue Samples Application",
   "dependencies": {
-    "@nativescript/core": "~8.1.5",
+    "@nativescript/core": "^8.2.0-alpha.12",
     "lorem-ipsum": "2.0.4",
     "vuex": "3.6.2"
   },
   "devDependencies": {
-    "@nativescript/android": "8.1.1",
-    "@nativescript/ios": "8.1.0",
+    "@nativescript/android": "^8.2.0-alpha.11",
+    "@nativescript/ios": "^8.2.0-alpha.6",
     "@nativescript/webpack": "~5.0.0",
     "nativescript-vue-template-compiler": "file:../packages/nativescript-vue-template-compiler"
   }
diff --git a/samples/webpack.config.js b/samples/webpack.config.js
index 9c52fccf..80519c04 100644
--- a/samples/webpack.config.js
+++ b/samples/webpack.config.js
@@ -1,21 +1,30 @@
-const webpack = require("@nativescript/webpack");
+const webpack = require('@nativescript/webpack')
 const path = require('path')
 
-module.exports = (env) => {
-  webpack.init(env);
+module.exports = env => {
+  webpack.init(env)
 
   // force the vue config, since we don't have nativescript-vue in package.json
   webpack.useConfig('vue')
 
   webpack.chainWebpack(config => {
+    config.set('snapshot', {
+      managedPaths: []
+    })
+
     config.resolve.alias
       // resolve nativescript-vue to built version in parent folder
       .set('nativescript-vue', path.resolve(__dirname, '../dist/index.js'))
       // resolve nativescript-toasty to the updated version scoped under @triniwiz
       .set('nativescript-toasty', '@triniwiz/nativescript-toasty')
-  })
-
-  return webpack.resolveConfig();
-};
 
+    config.module
+      .rule('vue')
+      .use('vue-loader')
+      .options({
+        compiler: require('nativescript-vue-template-compiler')
+      })
+  })
 
+  return webpack.resolveConfig()
+}

From eaa7b8cce6996cb91fccdaee9ce3717e0038bec7 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Wed, 2 Mar 2022 21:43:57 +0100
Subject: [PATCH 2/4] build: 2.9.1-rc.0

---
 packages/nativescript-vue-template-compiler/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nativescript-vue-template-compiler/package.json b/packages/nativescript-vue-template-compiler/package.json
index 1627a31d..aae18806 100644
--- a/packages/nativescript-vue-template-compiler/package.json
+++ b/packages/nativescript-vue-template-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-vue-template-compiler",
-  "version": "2.9.0",
+  "version": "2.9.1-rc.0",
   "description": "template compiler for nativescript-vue",
   "main": "index.js",
   "repository": {

From d374df9d70d84ced4b99bed1d74b3995bb726db0 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Wed, 2 Mar 2022 21:43:57 +0100
Subject: [PATCH 3/4] release: 2.9.1-rc.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 07b80721..46c3fe72 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-vue",
-  "version": "2.9.0",
+  "version": "2.9.1-rc.0",
   "description": "NativeScript and Vue integration",
   "main": "dist/index.js",
   "files": [

From cd4df54967dfb92b2793797594d406df0040fb77 Mon Sep 17 00:00:00 2001
From: Igor Randjelovic <rigor789@gmail.com>
Date: Wed, 2 Mar 2022 21:44:04 +0100
Subject: [PATCH 4/4] chore: update changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3937f186..83564a28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [2.9.1-rc.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.9.0...v2.9.1-rc.0) (2022-03-02)
+
+
+### Bug Fixes
+
+* fallback frame when navigating ([2bbf28e](https://github.com/nativescript-vue/nativescript-vue/commit/2bbf28e5c7a9052efffa040ada870a547b0e97ac))
+
+
+
 # [2.9.0](https://github.com/nativescript-vue/nativescript-vue/compare/v2.8.4...v2.9.0) (2021-04-01)
 
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/nativescript-vue/nativescript-vue/pull/948.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/nativescript-vue/nativescript-vue/pull/948.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/nativescript-vue/nativescript-vue/pull/948.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/nativescript-vue/nativescript-vue/pull/948.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>