From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 24 Mar 2020 15:09:14 +0000 (+0100)
Subject: feat(view): useView to customize router-view
X-Git-Tag: v4.0.0-alpha.4~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06b0c34ee5018aa9d76c0bfcd32ff2c12cd94277;p=thirdparty%2Fvuejs%2Frouter.git

feat(view): useView to customize router-view
---

diff --git a/playground/views/NotFound.vue b/playground/views/NotFound.vue
index f999958e..31e3bb02 100644
--- a/playground/views/NotFound.vue
+++ b/playground/views/NotFound.vue
@@ -4,11 +4,12 @@
 
 <script>
 import { defineComponent, inject } from 'vue'
+import { useRoute } from '../../src'
 
 export default defineComponent({
   name: 'NotFound',
   setup() {
-    const route = inject('route')
+    const route = useRoute()
     return { route }
   },
 })
diff --git a/src/components/Link.ts b/src/components/Link.ts
index 460d6d8e..0f2f916f 100644
--- a/src/components/Link.ts
+++ b/src/components/Link.ts
@@ -5,18 +5,18 @@ import {
   inject,
   computed,
   reactive,
-  Ref,
   unref,
 } from 'vue'
-import { RouteLocation, RouteLocationNormalized, Immutable } from '../types'
+import {
+  RouteLocation,
+  RouteLocationNormalized,
+  Immutable,
+  VueUseOptions,
+} from '../types'
 import { isSameLocationObject, isSameRouteRecord } from '../utils'
 import { routerKey } from '../utils/injectionSymbols'
 import { RouteRecordNormalized } from '../matcher/types'
 
-type VueUseOptions<T> = {
-  [k in keyof T]: Ref<T[k]> | T[k]
-}
-
 interface LinkProps {
   to: RouteLocation
   // TODO: refactor using extra options allowed in router.push
diff --git a/src/components/View.ts b/src/components/View.ts
index 07faee9e..dcb8180d 100644
--- a/src/components/View.ts
+++ b/src/components/View.ts
@@ -7,14 +7,73 @@ import {
   computed,
   ref,
   ComponentPublicInstance,
+  unref,
+  SetupContext,
 } from 'vue'
-import { RouteLocationMatched } from '../types'
+import {
+  RouteLocationMatched,
+  VueUseOptions,
+  RouteLocationNormalizedResolved,
+  Immutable,
+} from '../types'
 import {
   matchedRouteKey,
   viewDepthKey,
   routeLocationKey,
 } from '../utils/injectionSymbols'
 
+interface ViewProps {
+  route: Immutable<RouteLocationNormalizedResolved>
+  name: string
+}
+
+type UseViewOptions = VueUseOptions<ViewProps>
+
+export function useView(options: UseViewOptions) {
+  const depth: number = inject(viewDepthKey, 0)
+  provide(viewDepthKey, depth + 1)
+
+  const matchedRoute = computed(
+    () =>
+      unref(options.route).matched[depth] as RouteLocationMatched | undefined
+  )
+  const ViewComponent = computed(
+    () =>
+      matchedRoute.value && matchedRoute.value.components[unref(options.name)]
+  )
+
+  const propsData = computed(() => {
+    // propsData only gets called if ViewComponent.value exists and it depends on matchedRoute.value
+    const { props } = matchedRoute.value!
+    if (!props) return {}
+    const route = unref(options.route)
+    if (props === true) return route.params
+
+    return typeof props === 'object' ? props : props(route)
+  })
+
+  provide(matchedRouteKey, matchedRoute)
+
+  const viewRef = ref<ComponentPublicInstance>()
+
+  function onVnodeMounted() {
+    // if we mount, there is a matched record
+    matchedRoute.value!.instances[unref(options.name)] = viewRef.value
+    // TODO: trigger beforeRouteEnter hooks
+  }
+
+  return (attrs: SetupContext['attrs']) => {
+    return ViewComponent.value
+      ? h(ViewComponent.value as any, {
+          ...propsData.value,
+          ...attrs,
+          onVnodeMounted,
+          ref: viewRef,
+        })
+      : null
+  }
+}
+
 export const View = defineComponent({
   name: 'RouterView',
   props: {
@@ -26,44 +85,7 @@ export const View = defineComponent({
 
   setup(props, { attrs }) {
     const route = inject(routeLocationKey)!
-    const depth: number = inject(viewDepthKey, 0)
-    provide(viewDepthKey, depth + 1)
-
-    const matchedRoute = computed(
-      () => route.value.matched[depth] as RouteLocationMatched | undefined
-    )
-    const ViewComponent = computed(
-      () => matchedRoute.value && matchedRoute.value.components[props.name]
-    )
-
-    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
-
-      return typeof props === 'object' ? props : props(route.value)
-    })
-
-    provide(matchedRouteKey, matchedRoute)
-
-    const viewRef = ref<ComponentPublicInstance>()
-
-    function onVnodeMounted() {
-      // if we mount, there is a matched record
-      matchedRoute.value!.instances[props.name] = viewRef.value
-      // TODO: trigger beforeRouteEnter hooks
-    }
-
-    return () => {
-      return ViewComponent.value
-        ? h(ViewComponent.value as any, {
-            ...propsData.value,
-            ...attrs,
-            onVnodeMounted,
-            ref: viewRef,
-          })
-        : null
-    }
+    const renderView = useView({ route, name: props.name })
+    return () => renderView(attrs)
   },
 })
diff --git a/src/history/html5.ts b/src/history/html5.ts
index c523c998..a5249a07 100644
--- a/src/history/html5.ts
+++ b/src/history/html5.ts
@@ -223,8 +223,8 @@ function useHistoryStateNavigation(base: string) {
       ),
       ...history.state,
       ...data,
+      position: historyState.value.position,
     }
-    if (historyState) state.position = historyState.value.position
 
     changeLocation(normalized, state, true)
     location.value = normalized
diff --git a/src/types/index.ts b/src/types/index.ts
index 2e49b347..6d4ca2f3 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,6 +1,12 @@
 import { LocationQuery, LocationQueryRaw } from '../utils/query'
 import { PathParserOptions } from '../matcher/path-parser-ranker'
-import { markNonReactive, ComponentOptions, ComponentPublicInstance } from 'vue'
+import {
+  markNonReactive,
+  ComponentOptions,
+  ComponentPublicInstance,
+  Ref,
+  ComputedRef,
+} from 'vue'
 import { RouteRecordNormalized } from '../matcher/types'
 
 export type Lazy<T> = () => Promise<T>
@@ -10,6 +16,10 @@ export type Immutable<T> = {
   readonly [P in keyof T]: Immutable<T[P]>
 }
 
+export type VueUseOptions<T> = {
+  [k in keyof T]: Ref<T[k]> | T[k] | ComputedRef<T[k]>
+}
+
 export type TODO = any
 
 export type RouteParamValue = string