10000 Allow navigating to existing Pages closes #79 · rdlauer/nativescript-vue@f644ae5 · GitHub
[go: up one dir, main page]

Skip to content

Commit f644ae5

Browse files
committed
Allow navigating to existing Pages closes nativescript-vue#79
1 parent 69fa75b commit f644ae5

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

platform/nativescript/plugins/navigator-plugin.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,21 @@ export default {
1818
pageCb = () => {}
1919
) {
2020
return new Promise(resolve => {
21+
const frame = topmost()
22+
const navigate = frame ? frame.navigate : start
23+
24+
if (isPage(component)) {
25+
return navigate({
26+
create() {
27+
return component
28+
}
29+
})
30+
}
31+
2132
const placeholder = Vue.$document.createComment('placeholder')
2233

23-
let vm
24-
if (component.__is_root__) {
25-
vm = component
26-
} else {
34+
let vm = component
35+
if (!component.__is_root__) {
2736
const contentComponent = Vue.extend(component)
2837
vm = new contentComponent(options.context)
2938
vm.$mount(placeholder)
@@ -37,11 +46,6 @@ export default {
3746

3847
toPage[VUE_VM_REF] = vm
3948

40-
const frame = topmost()
41-
const navigate = frame ? frame.navigate : start
42-
43-
pageCb(toPage)
44-
4549
navigate.call(
4650
frame,
4751
Object.assign(
@@ -57,6 +61,7 @@ export default {
5761
)
5862
}
5963

64+
pageCb(toPage)
6065
resolve(toPage)
6166
return toPage
6267
}

0 commit comments

Comments
 (0)
0