Update Route, Link, NavLink contracts (#609)

JetBrains · Aug 10, 2021 · 9cf5582 · 9cf5582
1 parent aad053e
commit 9cf5582
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/kotlin-react-router-dom/src/main/kotlin/react/router/dom/routing.kt b/kotlin-react-router-dom/src/main/kotlin/react/router/dom/routing.kt
@@ -40,29 +40,29 @@ external interface HashRouterProps : RouterProps {
     var hashType: String
 }
 
-external interface RouteProps<T : RProps> : RProps {
+external interface RouteProps<T : Props> : Props {
     var path: Array<out String>
     var exact: Boolean
     var strict: Boolean
-    var component: ComponentType<RProps>
+    var component: ComponentType<*>
     var render: (props: RouteResultProps<T>) -> ReactElement?
 }
 
-external interface LinkProps : RProps {
+external interface LinkProps : PropsWithChildren {
     var to: String
     var replace: Boolean
     var className: String?
 }
 
-external interface NavLinkProps<T : RProps> : LinkProps {
+external interface NavLinkProps<T : Props> : LinkProps {
     var activeClassName: String
     var exact: Boolean
     var strict: Boolean
     var isActive: ((match: Match<T>?, location: Location) -> Boolean)?
     var location: Location
 }
 
-external interface RouteResultProps<T : RProps> : RProps {
+external interface RouteResultProps<T : Props> : Props {
     var history: History
     var location: Location
     var match: Match<T>
@@ -86,14 +86,14 @@ external interface Location {
     var search: String
 }
 
-external interface Match<T : RProps> {
+external interface Match<T : Props> {
     var isExact: Boolean
     var url: String
     var path: String
     var params: T
 }
 
-external interface RedirectProps : RProps {
+external interface RedirectProps : Props {
     var from: String?
     var to: String
     var push: Boolean

diff --git a/kotlin-react-router-dom/src/main/kotlin/react/router/dom/routingDsl.kt b/kotlin-react-router-dom/src/main/kotlin/react/router/dom/routingDsl.kt
@@ -53,7 +53,7 @@ fun RBuilder.switch(
 
 fun RBuilder.route(
     vararg path: String,
-    component: ComponentType<RProps>,
+    component: ComponentType<*>,
     exact: Boolean = false,
     strict: Boolean = false,
 ) {