File tree Expand file tree Collapse file tree 1 file changed +14
-9
lines changed
platform/nativescript/plugins Expand file tree Collapse file tree 1 file changed +14
-9
lines changed Original file line number Diff line number Diff line change @@ -18,12 +18,21 @@ export default {
18
18
pageCb = ( ) => { }
19
19
) {
20
20
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
+
21
32
const placeholder = Vue . $document . createComment ( 'placeholder' )
22
33
23
- let vm
24
- if ( component . __is_root__ ) {
25
- vm = component
26
- } else {
34
+ let vm = component
35
+ if ( ! component . __is_root__ ) {
27
36
const contentComponent = Vue . extend ( component )
28
37
vm = new contentComponent ( options . context )
29
38
vm . $mount ( placeholder )
@@ -37,11 +46,6 @@ export default {
37
46
38
47
toPage [ VUE_VM_REF ] = vm
39
48
40
- const frame = topmost ( )
41
- const navigate = frame ? frame . navigate : start
42
-
43
- pageCb ( toPage )
44
-
45
49
navigate . call (
46
50
frame ,
47
51
Object . assign (
@@ -57,6 +61,7 @@ export default {
57
61
)
58
62
}
59
63
64
+ pageCb ( toPage )
60
65
resolve ( toPage )
61
66
return toPage
62
67
}
You can’t perform that action at this time.
0 commit comments