Phenome: pass f7route and f7router as props for router components

Author: nolimits4web

src/phenome/utils/components-router.js

@@ -26,7 +26,13 @@ export default {
       const pageData = {
         component,
         id,
-        props: Utils.extend({}, options.route.params),
+        props: Utils.extend(
+          {
+            f7route: options.route,
+            f7router: router,
+          },
+          options.route.params
+        ),
       };
       routerComponent.$f7router = router;
       routerComponent.$f7route = options.route;
@@ -99,7 +105,13 @@ export default {
       const tabContent = {
         id,
         component,
-        props: Utils.extend({}, options.route.params),
+        props: Utils.extend(
+          {
+            f7route: options.route,
+            f7router: router,
+          },
+          options.route.params
+        ),
       };
 
       tabsComponent.$f7router = router;
@@ -150,7 +162,13 @@ export default {
       const modalData = {
         component,
         id,
-        props: Utils.extend({}, options.route.params),
+        props: Utils.extend(
+          {
+            f7route: options.route,
+            f7router: router,
+          },
+          options.route.params
+        ),
       };
       modalsComponent.$f7router = router;
       modalsComponent.$f7route = options.route;

src/phenome/utils/plugin.js

@@ -54,9 +54,11 @@ const Plugin = {
     Object.defineProperty(Extend.prototype, '$f7route', {
       get() {
         const self = this;
+        if (self.props && self.props.f7route) return self.props.f7route;
+        if (self.f7route) return self.f7route;
+        if (self._f7route) return self._f7route;
         let route;
         let parent = self;
-        if (self._f7route) route = self._f7route;
         while (parent && !route) {
           if (parent._f7route) route = parent._f7route;
           if (compiler === 'vue') {
@@ -75,9 +77,11 @@ const Plugin = {
     Object.defineProperty(Extend.prototype, '$f7router', {
       get() {
         const self = this;
+        if (self.props && self.props.f7router) return self.props.f7router;
+        if (self.f7router) return self.f7router;
+        if (self._f7router) return self._f7router;
         let router;
         let parent = self;
-        if (self._f7router) router = self._f7router;
         while (parent && !router) {
           if (parent._f7router) router = parent._f7router;
           else if (parent.f7View) {