fix: re-exported relevant history types

- Also upgraded history dependency
- Changed `location.state` types to `any` to match the new history types

packages/react-router-dom/index.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import type { BrowserHistory, HashHistory, State, To } from "history";
+import type { BrowserHistory, HashHistory } from "history";
 import { createBrowserHistory, createHashHistory, createPath } from "history";
 import {
   MemoryRouter,
@@ -25,6 +25,7 @@ import {
   useResolvedPath,
   useRoutes
 } from "react-router";
+import type { To } from "react-router";
 
 function warning(cond: boolean, message: string): void {
   if (!cond) {
@@ -74,6 +75,10 @@ export {
 };
 
 export type {
+  Location,
+  Path,
+  To,
+  NavigationType,
   MemoryRouterProps,
   NavigateFunction,
   NavigateOptions,
@@ -196,7 +201,7 @@ function isModifiedEvent(event: React.MouseEvent) {
 export interface LinkProps
   extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> {
   replace?: boolean;
-  state?: State;
+  state?: any;
   to: To;
 }
 
@@ -322,10 +327,7 @@ if (__DEV__) {
  * you need to create custom `<Link>` compoments with the same click behavior we
  * use in our exported `<Link>`.
  */
-export function useLinkClickHandler<
-  E extends Element = HTMLAnchorElement,
-  S extends State = State
->(
+export function useLinkClickHandler<E extends Element = HTMLAnchorElement>(
   to: To,
   {
     target,
@@ -334,7 +336,7 @@ export function useLinkClickHandler<
   }: {
     target?: React.HTMLAttributeAnchorTarget;
     replace?: boolean;
-    state?: S;
+    state?: any;
   } = {}
 ): (event: React.MouseEvent<E, MouseEvent>) => void {
   let navigate = useNavigate();
@@ -400,7 +402,7 @@ export function useSearchParams(defaultInit?: URLSearchParamsInit) {
   let setSearchParams = React.useCallback(
     (
       nextInit: URLSearchParamsInit,
-      navigateOptions?: { replace?: boolean; state?: State }
+      navigateOptions?: { replace?: boolean; state?: any }
     ) => {
       navigate("?" + createSearchParams(nextInit), navigateOptions);
     },

packages/react-router-native/index.tsx

@@ -1,5 +1,4 @@
 import * as React from "react";
-import type { State, To } from "history";
 import {
   BackHandler,
   GestureResponderEvent,
@@ -27,11 +26,14 @@ import {
   useLocation,
   useMatch,
   useNavigate,
+  useNavigationType,
   useOutlet,
   useParams,
   useResolvedPath,
   useRoutes
 } from "react-router";
+import type { To } from "react-router";
+
 import URLSearchParams from "@ungap/url-search-params";
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -57,29 +59,34 @@ export {
   useLocation,
   useMatch,
   useNavigate,
+  useNavigationType,
   useOutlet,
   useParams,
   useResolvedPath,
   useRoutes
 };
 
 export type {
+  IndexRouteProps,
+  LayoutRouteProps,
+  Location,
   MemoryRouterProps,
   NavigateFunction,
   NavigateOptions,
   NavigateProps,
+  NavigationType,
   Navigator,
   OutletProps,
   Params,
+  Path,
   PathMatch,
+  PathRouteProps,
   RouteMatch,
   RouteObject,
   RouteProps,
-  PathRouteProps,
-  LayoutRouteProps,
-  IndexRouteProps,
   RouterProps,
-  RoutesProps
+  RoutesProps,
+  To
 } from "react-router";
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -119,7 +126,7 @@ export interface LinkProps extends TouchableHighlightProps {
   children?: React.ReactNode;
   onPress?: (event: GestureResponderEvent) => void;
   replace?: boolean;
-  state?: State;
+  state?: any;
   to: To;
 }
 
@@ -156,14 +163,14 @@ const URLEventType = "url";
  * you need to create custom `<Link>` compoments with the same press behavior we
  * use in our exported `<Link>`.
  */
-export function useLinkPressHandler<S extends State = State>(
+export function useLinkPressHandler(
   to: To,
   {
     replace,
     state
   }: {
     replace?: boolean;
-    state?: S;
+    state?: any;
   } = {}
 ): (event: GestureResponderEvent) => void {
   let navigate = useNavigate();

packages/react-router/index.tsx

@@ -5,7 +5,6 @@ import type {
   Location,
   MemoryHistory,
   Path,
-  State,
   To
 } from "history";
 import {
@@ -14,6 +13,8 @@ import {
   parsePath
 } from "history";
 
+export type { Location, Path, To, NavigationType };
+
 function invariant(cond: any, message: string): asserts cond {
   if (!cond) throw new Error(message);
 }
@@ -147,7 +148,7 @@ export function MemoryRouter({
 export interface NavigateProps {
   to: To;
   replace?: boolean;
-  state?: State;
+  state?: any;
 }
 
 /**
@@ -443,7 +444,7 @@ export interface NavigateFunction {
 
 export interface NavigateOptions {
   replace?: boolean;
-  state?: State;
+  state?: any;
 }
 
 /**
@@ -474,7 +475,7 @@ export function useNavigate(): NavigateFunction {
   });
 
   let navigate: NavigateFunction = React.useCallback(
-    (to: To | number, options: { replace?: boolean; state?: State } = {}) => {
+    (to: To | number, options: { replace?: boolean; state?: any } = {}) => {
       warning(
         activeRef.current,
         `You should call navigate() in a React.useEffect(), not when ` +

packages/react-router/package.json

@@ -17,7 +17,7 @@
     "react": ">=16.8"
   },
   "dependencies": {
-    "history": "^5.0.1"
+    "history": "^5.0.3"
   },
   "sideEffects": false,
   "keywords": [