fix(router): correctly bypass route.tab.options.props to tab component

framework7io · May 31, 2021 · f3326e2 · f3326e2
1 parent ab6b101
commit f3326e2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 3 deletions.
diff --git a/src/react/components/tab.jsx b/src/react/components/tab.jsx
@@ -38,13 +38,14 @@ const Tab = forwardRef((props, ref) => {
     routerContext.route.route.tab &&
     routerContext.route.route.tab.id === id
   ) {
-    const { component, asyncComponent } = routerContext.route.route.tab;
+    const { component, asyncComponent, options: tabRouteOptions } = routerContext.route.route.tab;
     if (component || asyncComponent) {
       initialTabContent = {
         id: getComponentId(),
         component: component || asyncComponent,
         isAsync: !!asyncComponent,
         props: {
+          ...((tabRouteOptions && tabRouteOptions.props) || {}),
           f7router: routerContext.router,
           f7route: routerContext.route,
           ...routerContext.route.params,

diff --git a/src/react/shared/components-router.js b/src/react/shared/components-router.js
@@ -109,6 +109,7 @@ export default {
       }
 
       const id = getComponentId();
+
       const tabContent = {
         id,
         component,
@@ -117,6 +118,11 @@ export default {
             f7route: options.route,
             f7router: router,
           },
+          (options.route.route &&
+            options.route.route.tab &&
+            options.route.route.tab.options &&
+            options.route.route.tab.options.props) ||
+            {},
           options.route.params,
           options.props || {},
         ),

diff --git a/src/svelte/components/tab.svelte b/src/svelte/components/tab.svelte
@@ -28,13 +28,14 @@
     RouterContext.route.route.tab &&
     RouterContext.route.route.tab.id === id
   ) {
-    const { component, asyncComponent } = RouterContext.route.route.tab;
+    const { component, asyncComponent, options: tabRouteOptions } = RouterContext.route.route.tab;
     if (component || asyncComponent) {
       initialTabContent = {
         id: getComponentId(),
         component: component || asyncComponent,
         isAsync: !!asyncComponent,
         props: {
+          ...((tabRouteOptions && tabRouteOptions.props) || {}),
           f7router: RouterContext.router,
           f7route: RouterContext.route,
           ...RouterContext.route.params,

diff --git a/src/svelte/shared/components-router.js b/src/svelte/shared/components-router.js
@@ -117,6 +117,11 @@ export default {
             f7route: options.route,
             f7router: router,
           },
+          (options.route.route &&
+            options.route.route.tab &&
+            options.route.route.tab.options &&
+            options.route.route.tab.options.props) ||
+            {},
           options.route.params,
           options.props || {},
         ),

diff --git a/src/vue/components/tab.vue b/src/vue/components/tab.vue
@@ -38,13 +38,14 @@ export default {
       route.route.tab &&
       route.route.tab.id === props.id
     ) {
-      const { component, asyncComponent } = route.route.tab;
+      const { component, asyncComponent, options: tabRouteOptions } = route.route.tab;
       if (component || asyncComponent) {
         initialTabContent = {
           id: getComponentId(),
           component: component || asyncComponent,
           isAsync: !!asyncComponent,
           props: {
+            ...((tabRouteOptions && tabRouteOptions.props) || {}),
             f7router: router,
             f7route: route,
             ...route.params,

diff --git a/src/vue/shared/components-router.js b/src/vue/shared/components-router.js
@@ -117,6 +117,11 @@ export default {
             f7route: options.route,
             f7router: router,
           },
+          (options.route.route &&
+            options.route.route.tab &&
+            options.route.route.tab.options &&
+            options.route.route.tab.options.props) ||
+            {},
           options.route.params,
           options.props || {},
         ),