Skip to content

Commit 5bacfce

Browse files
committed
Phenome: remove parent look up for route/router. Allow to pass library
1 parent 2e351a8 commit 5bacfce

File tree

3 files changed

+6
-31
lines changed

3 files changed

+6
-31
lines changed

scripts/build-react.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function buildReact(cb) {
4444
.replace('// IMPORT_LIBRARY', 'import React from \'react\';')
4545
.replace('// IMPORT_COMPONENTS\n', '')
4646
.replace('// REGISTER_COMPONENTS\n', '')
47-
.replace(/EXTEND/g, 'React.Component')
47+
.replace(/EXTEND/g, 'params.React ? params.React.Component : React.Component')
4848
.replace(/COMPILER/, '\'react\'')
4949
.replace(/REFS_PROP/, '\'refs\'');
5050

@@ -91,7 +91,7 @@ function buildReact(cb) {
9191
.replace('// IMPORT_LIBRARY', 'import React from \'react\';')
9292
.replace('// IMPORT_COMPONENTS', `${componentImports.join('\n')}\n`)
9393
.replace('// REGISTER_COMPONENTS', registerComponents)
94-
.replace(/EXTEND/g, 'React.Component')
94+
.replace(/EXTEND/g, 'params.React ? params.React.Component : React.Component')
9595
.replace(/COMPILER/, '\'react\'')
9696
.replace(/REFS_PROP/, '\'refs\'');
9797

scripts/build-vue.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function buildVue(cb) {
3939
.replace('// IMPORT_LIBRARY', 'import Vue from \'vue\';')
4040
.replace('// IMPORT_COMPONENTS\n', '')
4141
.replace('// REGISTER_COMPONENTS\n', '')
42-
.replace(/EXTEND/g, 'Vue')
42+
.replace(/EXTEND/g, 'params.Vue || Vue')
4343
.replace(/COMPILER/, '\'vue\'')
4444
.replace(/REFS_PROP/, '\'$refs\'');
4545

@@ -86,7 +86,7 @@ function buildVue(cb) {
8686
.replace('// IMPORT_LIBRARY', 'import Vue from \'vue\';')
8787
.replace('// IMPORT_COMPONENTS', `${componentImports.join('\n')}\n`)
8888
.replace('// REGISTER_COMPONENTS', registerComponents)
89-
.replace(/EXTEND/g, 'Vue')
89+
.replace(/EXTEND/g, 'params.Vue || Vue')
9090
.replace(/COMPILER/, '\'vue\'')
9191
.replace(/REFS_PROP/, '\'$refs\'');
9292

src/phenome/utils/plugin.js

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,7 @@ const Plugin = {
5757
if (self.props && self.props.f7route) return self.props.f7route;
5858
if (self.f7route) return self.f7route;
5959
if (self._f7route) return self._f7route;
60-
let route;
61-
let parent = self;
62-
while (parent && !route) {
63-
if (parent._f7route) route = parent._f7route;
64-
if (compiler === 'vue') {
65-
parent = parent.$parent;
66-
} else {
67-
parent = parent._reactInternalFiber._debugOwner.stateNode;
68-
}
69-
}
70-
return route;
60+
return undefined;
7161
},
7262
set(value) {
7363
const self = this;
@@ -80,22 +70,7 @@ const Plugin = {
8070
if (self.props && self.props.f7router) return self.props.f7router;
8171
if (self.f7router) return self.f7router;
8272
if (self._f7router) return self._f7router;
83-
let router;
84-
let parent = self;
85-
while (parent && !router) {
86-
if (parent._f7router) router = parent._f7router;
87-
else if (parent.f7View) {
88-
router = parent.f7View.router;
89-
} else if (parent[refs] && parent[refs].el && parent[refs].el.f7View) {
90-
router = parent[refs].el.f7View.router;
91-
}
92-
if (compiler === 'vue') {
93-
parent = parent.$parent;
94-
} else {
95-
parent = parent._reactInternalFiber._debugOwner.stateNode;
96-
}
97-
}
98-
return router;
73+
return undefined;
9974
},
10075
set(value) {
10176
const self = this;

0 commit comments

Comments
 (0)