fix: ios Frame, and replace ... operator

rigor789 · rigor789 · commit 8f0d4c2c0a84 · 2018-07-21T16:50:10.000+02:00
diff --git a/samples/app/app-with-ns-router.js b/samples/app/app-with-ns-router.js
@@ -4,9 +4,9 @@ Vue.config.silent = false
 Vue.config.debug = true
 
 const FrameRouter = function install(Vue, options) {
-  const navigatorLog = (...args) => {
+  const navigatorLog = args => {
     if (options.debug) {
-      console.log(...args)
+      console.log(args)
     }
   }
 
@@ -62,7 +62,8 @@ const FrameRouter = function install(Vue, options) {
         this._setPending(path, false, data)
         const route = this._getMatched(path)
         this.$navigateTo(route.component, {
-          frame: '__navigator_frame__'
+          frame: '__navigator_frame__',
+          path
         })
       },
       replace(path, data) {
@@ -74,7 +75,8 @@ const FrameRouter = function install(Vue, options) {
         const route = this._getMatched(path)
         this.$navigateTo(route.component, {
           frame: '__navigator_frame__',
-          clearHistory: true
+          clearHistory: true,
+          path
         })
       },
       back(notify = false) {
@@ -105,10 +107,8 @@ const FrameRouter = function install(Vue, options) {
   })
 
   Vue.component('FrameRouter', {
-    data() {
-      return {
-        rendered: false
-      }
+    created() {
+      this.rendered = false
     },
     render(h) {
       if (!this.rendered) {
@@ -118,20 +118,24 @@ const FrameRouter = function install(Vue, options) {
       return h(
         'Frame',
         {
-          attrs: {
-            id: '__navigator_frame__',
-            ...this.$attrs,
-            ...this.$props
-          },
-          on: {
-            back() {
-              navigator.back(true)
+          attrs: Object.assign(
+            {
+              id: '__navigator_frame__'
             },
-            navigated() {
-              navigator._confirmPathChange()
+            this.$attrs,
+            this.$props
+          ),
+          on: Object.assign(
+            {
+              back() {
+                navigator.back(true)
+              },
+              navigated() {
+                navigator._confirmPathChange()
+              }
             },
-            ...this.$listeners
-          }
+            this.$listeners
+          )
         },
         [this.rendered]
       )
@@ -144,6 +148,7 @@ const HomePage = {
     <Page>
       <ActionBar title="Navigator Demo"/>
       <GridLayout>
+        <!--<Button @tap="$navigator.push('/details')" text="Go to details" />-->
         <ListView for="item in ['one', 'two', 'three']" @itemTap="$navigator.push('/details', { selected: $event.index })">
             <v-template>
                 <Label :text="item" padding="20"/>
@@ -157,6 +162,7 @@ const HomePage = {
 const DetailsPage = {
   template: `
     <Page>
+      <ActionBar title="Details Page"/>
       <StackLayout>
         <Label text="DetailsPage" />
         <Label :text="JSON.stringify($navigator.data, null, 2)" textWrap="true" />
@@ -179,8 +185,8 @@ Vue.use(FrameRouter, {
 
 new Vue({
   template: `
-    <GridLayout rows="*, auto, *">
-        <FrameRouter :transition="{ name: 'slide', duration: 1000 }" row="0"/>
+    <GridLayout rows="*, auto, auto">
+        <FrameRouter row="0"/>
         <label :text="$navigator.$data.path" row="1" />
         <label :text="JSON.stringify($navigator.$data.stack, null, 2)" textWrap="true" row="2" />
     </GridLayout>
diff --git a/samples/package.json b/samples/package.json
@@ -5,19 +5,19 @@
   "repository": "<fill-your-repository-here>",
   "nativescript": {
     "id": "org.nativescript.vuesample",
-    "tns-ios": {
-      "version": "4.0.1"
-    },
     "tns-android": {
-      "version": "4.0.1"
+      "version": "4.2.0-2018-07-20-02"
+    },
+    "tns-ios": {
+      "version": "4.2.0-2018-07-17-01"
     }
   },
   "dependencies": {
     "nativescript-gradient": "^2.0.1",
     "nativescript-pager": "^7.1.3",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-ui-sidedrawer": "^4.1.1",
-    "tns-core-modules": "4.0.0",
+    "tns-core-modules": "4.1.1",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },
@@ -28,4 +28,4 @@
     "lazy": "^1.0.11",
     "nativescript-dev-android-snapshot": "^0.0.11"
   }
-}
+}
