From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Sun, 23 Aug 2020 11:01:32 +0000 (+0200)
Subject: refactor(types): jsx attrs types
X-Git-Tag: v4.0.0-beta.8~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d047a0b155b8086691d0abb184ff30eac4e1a3b6;p=thirdparty%2Fvuejs%2Frouter.git

refactor(types): jsx attrs types
---

diff --git a/src/RouterLink.ts b/src/RouterLink.ts
index 6fa1a59e..68b77786 100644
--- a/src/RouterLink.ts
+++ b/src/RouterLink.ts
@@ -7,7 +7,8 @@ import {
   reactive,
   unref,
   VNodeProps,
-  HTMLAttributes,
+  AllowedComponentProps,
+  ComponentCustomProps,
 } from 'vue'
 import { RouteLocationRaw, VueUseOptions, RouteLocation } from './types'
 import { isSameRouteLocationParams, isSameRouteRecord } from './location'
@@ -187,7 +188,10 @@ export const RouterLinkImpl = defineComponent({
 // also to avoid inline import() in generated d.ts files
 export const RouterLink = (RouterLinkImpl as any) as {
   new (): {
-    $props: HTMLAttributes & VNodeProps & RouterLinkProps
+    $props: AllowedComponentProps &
+      ComponentCustomProps &
+      VNodeProps &
+      RouterLinkProps
   }
 }
 
diff --git a/src/RouterView.ts b/src/RouterView.ts
index 0a50a4cf..f68cc658 100644
--- a/src/RouterView.ts
+++ b/src/RouterView.ts
@@ -9,7 +9,8 @@ import {
   VNodeProps,
   getCurrentInstance,
   computed,
-  HTMLAttributes,
+  AllowedComponentProps,
+  ComponentCustomProps,
 } from 'vue'
 import { RouteLocationNormalized, RouteLocationNormalizedLoaded } from './types'
 import {
@@ -109,7 +110,10 @@ export const RouterViewImpl = defineComponent({
 // also to avoid inline import() in generated d.ts files
 export const RouterView = (RouterViewImpl as any) as {
   new (): {
-    $props: HTMLAttributes & VNodeProps & RouterViewProps
+    $props: AllowedComponentProps &
+      ComponentCustomProps &
+      VNodeProps &
+      RouterViewProps
   }
 }