From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 26 May 2020 13:47:14 +0000 (+0200)
Subject: feat: allow props for named views
X-Git-Tag: v4.0.0-alpha.13~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe2344af5fed39aa4aa8fbfe48b195580d9538b;p=thirdparty%2Fvuejs%2Frouter.git

feat: allow props for named views
---

diff --git a/__tests__/RouterView.spec.ts b/__tests__/RouterView.spec.ts
index b7e16391..cce62e4e 100644
--- a/__tests__/RouterView.spec.ts
+++ b/__tests__/RouterView.spec.ts
@@ -3,7 +3,10 @@
  */
 import { RouterView } from '../src/RouterView'
 import { components, RouteLocationNormalizedLoose } from './utils'
-import { START_LOCATION_NORMALIZED } from '../src/types'
+import {
+  START_LOCATION_NORMALIZED,
+  RouteLocationNormalized,
+} from '../src/types'
 import { markRaw } from 'vue'
 import { mount, createMockedRoute } from './mount'
 import { mockWarn } from 'jest-mock-warn'
@@ -21,6 +24,8 @@ function createRoutes<T extends Record<string, RouteLocationNormalizedLoose>>(
   return nonReactiveRoutes
 }
 
+const props = { default: false }
+
 const routes = createRoutes({
   root: {
     fullPath: '/',
@@ -31,7 +36,12 @@ const routes = createRoutes({
     hash: '',
     meta: {},
     matched: [
-      { components: { default: components.Home }, instances: {}, path: '/' },
+      {
+        components: { default: components.Home },
+        instances: {},
+        path: '/',
+        props,
+      },
     ],
   },
   foo: {
@@ -43,7 +53,12 @@ const routes = createRoutes({
     hash: '',
     meta: {},
     matched: [
-      { components: { default: components.Foo }, instances: {}, path: '/foo' },
+      {
+        components: { default: components.Foo },
+        instances: {},
+        path: '/foo',
+        props,
+      },
     ],
   },
   nested: {
@@ -55,8 +70,18 @@ const routes = createRoutes({
     hash: '',
     meta: {},
     matched: [
-      { components: { default: components.Nested }, instances: {}, path: '/' },
-      { components: { default: components.Foo }, instances: {}, path: 'a' },
+      {
+        components: { default: components.Nested },
+        instances: {},
+        path: '/',
+        props,
+      },
+      {
+        components: { default: components.Foo },
+        instances: {},
+        path: 'a',
+        props,
+      },
     ],
   },
   nestedNested: {
@@ -68,9 +93,24 @@ const routes = createRoutes({
     hash: '',
     meta: {},
     matched: [
-      { components: { default: components.Nested }, instances: {}, path: '/' },
-      { components: { default: components.Nested }, instances: {}, path: 'a' },
-      { components: { default: components.Foo }, instances: {}, path: 'b' },
+      {
+        components: { default: components.Nested },
+        instances: {},
+        path: '/',
+        props,
+      },
+      {
+        components: { default: components.Nested },
+        instances: {},
+        path: 'a',
+        props,
+      },
+      {
+        components: { default: components.Foo },
+        instances: {},
+        path: 'b',
+        props,
+      },
     ],
   },
   named: {
@@ -82,7 +122,7 @@ const routes = createRoutes({
     hash: '',
     meta: {},
     matched: [
-      { components: { foo: components.Foo }, instances: {}, path: '/' },
+      { components: { foo: components.Foo }, instances: {}, path: '/', props },
     ],
   },
   withParams: {
@@ -99,7 +139,7 @@ const routes = createRoutes({
 
         instances: {},
         path: '/users/:id',
-        props: true,
+        props: { default: true },
       },
     ],
   },
@@ -117,7 +157,7 @@ const routes = createRoutes({
 
         instances: {},
         path: '/props/:id',
-        props: { id: 'foo', other: 'fixed' },
+        props: { default: { id: 'foo', other: 'fixed' } },
       },
     ],
   },
@@ -136,7 +176,12 @@ const routes = createRoutes({
 
         instances: {},
         path: '/props/:id',
-        props: to => ({ id: Number(to.params.id) * 2, other: to.query.q }),
+        props: {
+          default: (to: RouteLocationNormalized) => ({
+            id: Number(to.params.id) * 2,
+            other: to.query.q,
+          }),
+        },
       },
     ],
   },
@@ -203,6 +248,7 @@ describe('RouterView', () => {
           components: { default: components.User },
           instances: {},
           path: '/users/:id',
+          props,
         },
       ],
     }
diff --git a/__tests__/matcher/records.spec.ts b/__tests__/matcher/records.spec.ts
index aa25b115..a49f9019 100644
--- a/__tests__/matcher/records.spec.ts
+++ b/__tests__/matcher/records.spec.ts
@@ -17,7 +17,7 @@ describe('normalizeRouteRecord', () => {
       meta: {},
       name: undefined,
       path: '/home',
-      props: false,
+      props: { default: false },
     })
   })
 
@@ -41,7 +41,7 @@ describe('normalizeRouteRecord', () => {
       meta: { foo: true },
       name: 'name',
       path: '/home',
-      props: false,
+      props: { default: false },
     })
   })
 
@@ -83,7 +83,7 @@ describe('normalizeRouteRecord', () => {
       meta: { foo: true },
       name: 'name',
       path: '/home',
-      props: false,
+      props: { one: false },
     })
   })
 })
diff --git a/__tests__/utils.ts b/__tests__/utils.ts
index 225eca37..d93270fc 100644
--- a/__tests__/utils.ts
+++ b/__tests__/utils.ts
@@ -8,6 +8,7 @@ import {
   RouteComponent,
   RouteRecordRaw,
   RouteRecordName,
+  _RouteRecordProps,
 } from '../src/types'
 import { h, ComponentOptions } from 'vue'
 import {
@@ -52,7 +53,7 @@ export interface RouteRecordViewLoose
   > {
   leaveGuards?: any
   instances: Record<string, any>
-  props?: _RouteRecordBase['props']
+  props: Record<string, _RouteRecordProps>
   aliasOf: RouteRecordViewLoose | undefined
 }
 
diff --git a/playground/router.ts b/playground/router.ts
index b2a89f4a..2b030a54 100644
--- a/playground/router.ts
+++ b/playground/router.ts
@@ -25,7 +25,7 @@ export const router = createRouter({
     {
       path: '/',
       components: { default: Home, other: component },
-      props: to => ({ waited: to.meta.waitedFor }),
+      props: { default: to => ({ waited: to.meta.waitedFor }) },
     },
     {
       path: '/always-redirect',
@@ -60,18 +60,18 @@ export const router = createRouter({
     {
       path: '/children',
       name: 'WithChildren',
-      component,
+      component: Nested,
       children: [
-        { path: '', alias: 'alias', name: 'default-child', component },
-        { path: 'a', name: 'a-child', component },
+        { path: '', alias: 'alias', name: 'default-child', component: Nested },
+        { path: 'a', name: 'a-child', component: Nested },
         {
           path: 'b',
           name: 'b-child',
-          component,
+          component: Nested,
           children: [
-            { path: '', component },
-            { path: 'a2', component },
-            { path: 'b2', component },
+            { path: '', component: Nested },
+            { path: 'a2', component: Nested },
+            { path: 'b2', component: Nested },
           ],
         },
       ],
diff --git a/playground/views/Nested.vue b/playground/views/Nested.vue
index 654a8388..d1a337a3 100644
--- a/playground/views/Nested.vue
+++ b/playground/views/Nested.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <p>Nested level {{ level }}</p>
-    <ul v-if="level === 1">
+    <ul v-if="level === 1 && $route.name === 'Nested'">
       <li>
         <router-link to="/nested/nested">/nested/nested</router-link>
       </li>
diff --git a/src/RouterView.ts b/src/RouterView.ts
index 91ddcb09..fb7fda9c 100644
--- a/src/RouterView.ts
+++ b/src/RouterView.ts
@@ -52,11 +52,14 @@ export const RouterViewImpl = defineComponent({
     const propsData = computed(() => {
       // propsData only gets called if ViewComponent.value exists and it depends
       // on matchedRoute.value
-      const { props } = matchedRoute.value!
-      if (!props) return {}
-      if (props === true) return route.value.params
+      const componentProps = matchedRoute.value!.props[props.name]
+      if (!componentProps) return {}
+      // TODO: only add props declared in the component. all if no props
+      if (componentProps === true) return route.value.params
 
-      return typeof props === 'object' ? props : props(route.value)
+      return typeof componentProps === 'object'
+        ? componentProps
+        : componentProps(route.value)
     })
 
     provide(matchedRouteKey, matchedRoute)
diff --git a/src/matcher/index.ts b/src/matcher/index.ts
index de894a29..dae90ca3 100644
--- a/src/matcher/index.ts
+++ b/src/matcher/index.ts
@@ -4,6 +4,9 @@ import {
   MatcherLocation,
   isRouteName,
   RouteRecordName,
+  _RouteRecordProps,
+  RouteRecordSingleView,
+  RouteRecordMultipleViews,
 } from '../types'
 import { createRouterError, ErrorTypes, MatcherError } from '../errors'
 import { createRouteRecordMatcher, RouteRecordMatcher } from './pathMatcher'
@@ -321,22 +324,43 @@ export function normalizeRouteRecord(
       redirect: record.redirect,
     }
   } else {
+    const components =
+      'components' in record ? record.components : { default: record.component }
     return {
       ...commonInitialValues,
       beforeEnter: record.beforeEnter,
-      props: record.props || false,
+      props: normalizeRecordProps(record),
       children: record.children || [],
       instances: {},
       leaveGuards: [],
       updateGuards: [],
-      components:
-        'components' in record
-          ? record.components
-          : { default: record.component },
+      components,
     }
   }
 }
 
+/**
+ * Normalize the optional `props` in a record to always be an object similar to
+ * components. Also accept a boolean for components.
+ * @param record
+ */
+function normalizeRecordProps(
+  record: RouteRecordSingleView | RouteRecordMultipleViews
+): Record<string, _RouteRecordProps> {
+  const propsObject = {} as Record<string, _RouteRecordProps>
+  const props = record.props || false
+  if ('component' in record) {
+    propsObject.default = props
+  } else {
+    // NOTE: we could also allow a function to be applied to every component.
+    // Would need user feedback for use cases
+    for (let name in record.components)
+      propsObject[name] = typeof props === 'boolean' ? props : props[name]
+  }
+
+  return propsObject
+}
+
 /**
  * Checks if a record or any of its parent is an alias
  * @param record
diff --git a/src/matcher/types.ts b/src/matcher/types.ts
index 8ce537a1..67b8e980 100644
--- a/src/matcher/types.ts
+++ b/src/matcher/types.ts
@@ -3,6 +3,7 @@ import {
   NavigationGuard,
   _RouteRecordBase,
   RouteRecordRedirectRaw,
+  _RouteRecordProps,
 } from '../types'
 import { ComponentPublicInstance } from 'vue'
 
@@ -13,7 +14,10 @@ export interface RouteRecordNormalized {
   components: RouteRecordMultipleViews['components']
   children: Exclude<RouteRecordMultipleViews['children'], void>
   meta: Exclude<RouteRecordMultipleViews['meta'], void>
-  props: Exclude<_RouteRecordBase['props'], void>
+  /**
+   * Object of props options with the same keys as `components`
+   */
+  props: Record<string, _RouteRecordProps>
   beforeEnter: RouteRecordMultipleViews['beforeEnter']
   leaveGuards: NavigationGuard[]
   updateGuards: NavigationGuard[]
diff --git a/src/types/index.ts b/src/types/index.ts
index ca62b34d..1f091184 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -140,6 +140,14 @@ export type RawRouteComponent = RouteComponent | Lazy<RouteComponent>
 
 export type RouteRecordName = string | symbol
 
+/**
+ * @internal
+ */
+export type _RouteRecordProps =
+  | boolean
+  | Record<string, any>
+  | ((to: RouteLocationNormalized) => Record<string, any>)
+
 // TODO: could this be moved to matcher?
 /**
  * Common properties among all kind of {@link RouteRecordRaw}
@@ -160,13 +168,6 @@ export interface _RouteRecordBase extends PathParserOptions {
    * Name for the route record.
    */
   name?: RouteRecordName
-  /**
-   * Allow passing down params as props to the component rendered by `router-view`.
-   */
-  props?:
-    | boolean
-    | Record<string, any>
-    | ((to: RouteLocationNormalized) => Record<string, any>)
   /**
    * Before Enter guard specific to this record. Note `beforeEnter` has no
    * effect if the record has a `redirect` property.
@@ -193,11 +194,21 @@ export interface RouteRecordRedirectRaw extends _RouteRecordBase {
 export interface RouteRecordSingleView extends _RouteRecordBase {
   component: RawRouteComponent
   children?: RouteRecordRaw[]
+  /**
+   * Allow passing down params as props to the component rendered by `router-view`.
+   */
+  props?: _RouteRecordProps
 }
 
 export interface RouteRecordMultipleViews extends _RouteRecordBase {
   components: Record<string, RawRouteComponent>
   children?: RouteRecordRaw[]
+  /**
+   * Allow passing down params as props to the component rendered by
+   * `router-view`. Should be an object with the same keys as `components` or a
+   * boolean to be applied to every component.
+   */
+  props?: Record<string, _RouteRecordProps> | boolean
 }
 
 export type RouteRecordRaw =