Skip to content

Commit

Permalink
fix: correct arg for useLink
Browse files Browse the repository at this point in the history
  • Loading branch information
posva committed Jul 7, 2022
1 parent 5d3c040 commit afdf147
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
14 changes: 9 additions & 5 deletions playground/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
RouteLocationResolved,
RouteLocation,
} from '@vue-router'
import { ref } from 'vue'
function test(
a: RouteLocationResolved<'/[name]'>,
Expand All @@ -21,11 +22,14 @@ if (route.name === '/deep/nesting/works/[[files]]+') {
const router = useRouter()
router.resolve('/:name')
router.resolve({ name: '/[name]' }).params.name
useLink('/:path(.*)')
useLink({ path: '/articles/:id' })
useLink({ name: '/[name]', params: { name: 'hey' } }).route.value.params.name
router.resolve({ name: '/[name]', params: { name: 'hello' } }).params.name
useLink({ to: '/articles/2' }).route.value.name
useLink({ to: { path: '/articles/:id' } })
useLink({ to: { name: '/[name]', params: { name: 2 } } }).route.value.params
.name
// useLink({ name: '/[name]', params: { name: 2 } }).route.value.params.name
useLink({ to: ref({ name: '/[name]', params: { name: 2 } }) }).route.value.name
const customRoute = useRoute('/deep/nesting/works/custom-path')
</script>
Expand Down
8 changes: 6 additions & 2 deletions src/typeExtensions/RouterLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import type {
VNode,
ComputedRef,
UnwrapRef,
Ref,
} from 'vue'
import type {
NavigationFailure,
RouteLocationRaw,
RouterLinkProps as _RouterLinkProps,
} from 'vue-router'
import type { _RouterTyped } from './router'
Expand Down Expand Up @@ -73,10 +75,12 @@ export interface _UseLinkReturnTyped<
* Typed version of `useLink()`.
*/
export interface UseLinkFnTyped<RouteMap extends _RouteMapGeneric> {
<Name extends keyof RouteMap = keyof RouteMap>(
<Name extends keyof RouteMap = keyof RouteMap>(props: {
to:
| RouteLocationAsString<RouteMap>
| RouteLocationAsRelativeTyped<RouteMap, Name>
| RouteLocationAsPathTyped<RouteMap, Name>
): _UseLinkReturnTyped<RouteMap, Name>
| Ref<RouteLocationRaw>
replace?: boolean | undefined | Ref<boolean | undefined>
}): _UseLinkReturnTyped<RouteMap, Name>
}

0 comments on commit afdf147

Please sign in to comment.