react-router 6.16.0-pre.0 → 6.16.0-pre.1

package/dist/lib/hooks.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import type { Blocker, BlockerFunction, Location, ParamParseKey, Params, Path, PathMatch, PathPattern, RelativeRoutingType, Router as RemixRouter, RevalidationState, To } from "@remix-run/router";
+import type { Blocker, BlockerFunction, Location, ParamParseKey, Params, Path, PathMatch, PathPattern, RelativeRoutingType, Router as RemixRouter, RevalidationState, To, UIMatch } from "@remix-run/router";
 import { Action as NavigationType } from "@remix-run/router";
 import type { NavigateOptions, RouteContextObject, RouteMatch, RouteObject } from "./context";
 /**
@@ -116,7 +116,7 @@ export declare class RenderErrorBoundary extends React.Component<RenderErrorBoun
     };
     static getDerivedStateFromProps(props: RenderErrorBoundaryProps, state: RenderErrorBoundaryState): {
         error: any;
-        location: Location;
+        location: Location<any>;
         revalidation: RevalidationState;
     };
     componentDidCatch(error: any, errorInfo: any): void;
@@ -144,13 +144,7 @@ export declare function useRevalidator(): {
  * Returns the active route matches, useful for accessing loaderData for
  * parent/child routes or the route "handle" property
  */
-export declare function useMatches(): {
-    id: string;
-    pathname: string;
-    params: Params<string>;
-    data: unknown;
-    handle: unknown;
-}[];
+export declare function useMatches(): UIMatch[];
 /**
  * Returns the loader data for the nearest ancestor Route loader
  */

package/dist/main.js

@@ -1,5 +1,5 @@
 /**
- * React Router v6.16.0-pre.0
+ * React Router v6.16.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/react-router.development.js

@@ -1,5 +1,5 @@
 /**
- * React Router v6.16.0-pre.0
+ * React Router v6.16.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,7 +9,7 @@
  * @license MIT
  */
 import * as React from 'react';
-import { UNSAFE_invariant, joinPaths, matchPath, UNSAFE_getPathContributingMatches, UNSAFE_warning, resolveTo, parsePath, matchRoutes, Action, stripBasename, IDLE_BLOCKER, isRouteErrorResponse, createMemoryHistory, AbortedDeferredError, createRouter } from '@remix-run/router';
+import { UNSAFE_invariant, joinPaths, matchPath, UNSAFE_getPathContributingMatches, UNSAFE_warning, resolveTo, parsePath, matchRoutes, Action, UNSAFE_convertRouteMatchToUiMatch, stripBasename, IDLE_BLOCKER, isRouteErrorResponse, createMemoryHistory, AbortedDeferredError, createRouter } from '@remix-run/router';
 export { AbortedDeferredError, Action as NavigationType, createPath, defer, generatePath, isRouteErrorResponse, json, matchPath, matchRoutes, parsePath, redirect, redirectDocument, resolvePath } from '@remix-run/router';
 
 const DataRouterContext = /*#__PURE__*/React.createContext(null);
@@ -603,22 +603,7 @@ function useMatches() {
     matches,
     loaderData
   } = useDataRouterState(DataRouterStateHook.UseMatches);
-  return React.useMemo(() => matches.map(match => {
-    let {
-      pathname,
-      params
-    } = match;
-    // Note: This structure matches that created by createUseMatchesMatch
-    // in the @remix-run/router , so if you change this please also change
-    // that :)  Eventually we'll DRY this up
-    return {
-      id: match.route.id,
-      pathname,
-      params,
-      data: loaderData[match.route.id],
-      handle: match.route.handle
-    };
-  }), [matches, loaderData]);
+  return React.useMemo(() => matches.map(m => UNSAFE_convertRouteMatchToUiMatch(m, loaderData)), [matches, loaderData]);
 }
 /**
  * Returns the loader data for the nearest ancestor Route loader