@tanstack/react-router 1.47.4 → 1.48.0

package/src/Match.tsx

@@ -111,75 +111,27 @@ export const MatchInner = React.memo(function MatchInnerImpl({
   matchId: string
 }): any {
   const router = useRouter()
-  const routeId = useRouterState({
-    select: (s) => s.matches.find((d) => d.id === matchId)?.routeId as string,
-  })
-
-  const route = router.routesById[routeId]!
-
-  const matchIndex = useRouterState({
-    select: (s) => {
-      return s.matches.findIndex((d) => d.id === matchId)
-    },
-  })
 
-  const match = useRouterState({
+  const { match, matchIndex, routeId } = useRouterState({
     select: (s) => {
+      const matchIndex = s.matches.findIndex((d) => d.id === matchId)
       const match = s.matches[matchIndex]!
-      return pick(match, [
-        'id',
-        'status',
-        'error',
-        'loadPromise',
-        'minPendingPromise',
-      ])
+      const routeId = match.routeId as string
+      return {
+        routeId,
+        matchIndex,
+        match: pick(match, ['id', 'status', 'error', 'loadPromise']),
+      }
     },
   })
 
+  const route = router.routesById[routeId]!
+
   const out = React.useMemo(() => {
     const Comp = route.options.component ?? router.options.defaultComponent
     return Comp ? <Comp key={routeId} /> : <Outlet />
   }, [routeId, route.options.component, router.options.defaultComponent])
 
-  React.useEffect(() => {
-    if (match.status === 'pending') {
-      // We're pending, and if we have a minPendingMs, we need to wait for it
-      const pendingMinMs =
-        route.options.pendingMinMs ?? router.options.defaultPendingMinMs
-
-      if (pendingMinMs && !match.minPendingPromise) {
-        // Create a promise that will resolve after the minPendingMs
-        if (!router.isServer) {
-          const minPendingPromise = createControlledPromise<void>()
-
-          router.updateMatch(match.id, (prev) => ({
-            ...prev,
-            minPendingPromise,
-          }))
-
-          const id = setTimeout(() => {
-            minPendingPromise.resolve()
-
-            // We've handled the minPendingPromise, so we can delete it
-            router.updateMatch(match.id, (prev) => ({
-              ...prev,
-              minPendingPromise: undefined,
-            }))
-          }, pendingMinMs)
-          return () => clearTimeout(id)
-        }
-      }
-    }
-    return undefined
-  }, [
-    match.id,
-    match.loadPromise,
-    match.minPendingPromise,
-    match.status,
-    route.options.pendingMinMs,
-    router,
-  ])
-
   // function useChangedDiff(value: any) {
   //   const ref = React.useRef(value)
   //   const changed = ref.current !== value
@@ -258,6 +210,33 @@ export const MatchInner = React.memo(function MatchInnerImpl({
   }
 
   if (match.status === 'pending') {
+    // We're pending, and if we have a minPendingMs, we need to wait for it
+    const pendingMinMs =
+      route.options.pendingMinMs ?? router.options.defaultPendingMinMs
+
+    if (pendingMinMs && !router.getMatch(match.id)?.minPendingPromise) {
+      // Create a promise that will resolve after the minPendingMs
+      if (!router.isServer) {
+        const minPendingPromise = createControlledPromise<void>()
+
+        Promise.resolve().then(() => {
+          router.updateMatch(match.id, (prev) => ({
+            ...prev,
+            minPendingPromise,
+          }))
+        })
+
+        setTimeout(() => {
+          minPendingPromise.resolve()
+
+          // We've handled the minPendingPromise, so we can delete it
+          router.updateMatch(match.id, (prev) => ({
+            ...prev,
+            minPendingPromise: undefined,
+          }))
+        }, pendingMinMs)
+      }
+    }
     throw match.loadPromise
   }
 

package/src/fileRoute.ts

@@ -12,16 +12,14 @@ import type {
   AnyContext,
   AnyPathParams,
   AnyRoute,
-  AnySearchSchema,
+  AnySearchValidator,
+  DefaultSearchValidator,
   FileBaseRouteOptions,
   InferAllContext,
   ResolveAllContext,
   ResolveAllParamsFromParent,
-  ResolveFullSearchSchema,
-  ResolveFullSearchSchemaInput,
   ResolveLoaderData,
   ResolveRouteContext,
-  ResolveSearchSchemaUsed,
   Route,
   RouteConstraints,
   RouteContext,
@@ -75,17 +73,7 @@ export class FileRoute<
   }
 
   createRoute = <
-    TSearchSchemaInput = Record<string, unknown>,
-    TSearchSchema = {},
-    TSearchSchemaUsed = ResolveSearchSchemaUsed<
-      TSearchSchemaInput,
-      TSearchSchema
-    >,
-    TFullSearchSchemaInput = ResolveFullSearchSchemaInput<
-      TParentRoute,
-      TSearchSchemaUsed
-    >,
-    TFullSearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>,
+    TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
     TParams = Record<ParsePathParams<TPath>, string>,
     TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>,
     TRouteContextReturn = RouteContext,
@@ -97,10 +85,9 @@ export class FileRoute<
     TChildren = unknown,
   >(
     options?: FileBaseRouteOptions<
+      TParentRoute,
       TPath,
-      TSearchSchemaInput,
-      TSearchSchema,
-      TFullSearchSchema,
+      TSearchValidator,
       TParams,
       TAllParams,
       TRouteContextReturn,
@@ -110,9 +97,10 @@ export class FileRoute<
       TLoaderDataReturn
     > &
       UpdatableRouteOptions<
+        TParentRoute,
         TId,
         TAllParams,
-        TFullSearchSchema,
+        TSearchValidator,
         TLoaderData,
         TAllContext,
         TRouteContext,
@@ -124,11 +112,7 @@ export class FileRoute<
     TFullPath,
     TFilePath,
     TId,
-    TSearchSchemaInput,
-    TSearchSchema,
-    TSearchSchemaUsed,
-    TFullSearchSchemaInput,
-    TFullSearchSchema,
+    TSearchValidator,
     TParams,
     TAllParams,
     TRouteContextReturn,
@@ -181,9 +165,10 @@ export function FileRouteLoader<
 
 export type LazyRouteOptions = Pick<
   UpdatableRouteOptions<
+    AnyRoute,
     string,
     AnyPathParams,
-    AnySearchSchema,
+    AnySearchValidator,
     {},
     AnyContext,
     AnyContext,

package/src/index.tsx

@@ -139,6 +139,7 @@ export {
 export type {
   AnyPathParams,
   SearchSchemaInput,
+  SearchValidatorAdapter,
   AnySearchSchema,
   AnyContext,
   RouteContext,
@@ -154,9 +155,6 @@ export type {
   MetaDescriptor,
   RouteLinkEntry,
   ParseParamsFn,
-  SearchSchemaValidator,
-  SearchSchemaValidatorObj,
-  SearchSchemaValidatorFn,
   RouteLoaderFn,
   LoaderFnContext,
   SearchFilter,