PR feedback

Author: brophdawg11

packages/react-router/index.ts

@@ -209,7 +209,11 @@ export {
 };
 
 function enhanceAgnosticRoute(route: RouteObject) {
-  let updates: Partial<RouteObject> = {};
+  let updates: Partial<RouteObject> & { hasErrorBoundary: boolean } = {
+    // Note: this check also occurs in createRoutesFromChildren so update
+    // there if you change this -- please and thank you!
+    hasErrorBoundary: route.ErrorBoundary != null || route.errorElement != null,
+  };
 
   if (route.Component) {
     if (__DEV__) {
@@ -243,12 +247,6 @@ function enhanceAgnosticRoute(route: RouteObject) {
     });
   }
 
-  // Note: this check also occurs in createRoutesFromChildren so update
-  // there if you change this -- please and thank you!
-  if (route.ErrorBoundary || route.errorElement) {
-    updates.hasErrorBoundary = true;
-  }
-
   return updates;
 }
 

packages/react-router/lib/hooks.tsx

@@ -637,21 +637,17 @@ export function _renderMatches(
     // Only data routers handle errors
     let errorElement: React.ReactNode | null = null;
     if (dataRouterState) {
-      if (match.route.ErrorBoundary) {
-        errorElement = <match.route.ErrorBoundary />;
-      } else {
-        errorElement = match.route.errorElement || defaultErrorElement;
-      }
+      errorElement = match.route.errorElement || defaultErrorElement;
     }
     let matches = parentMatches.concat(renderedMatches.slice(0, index + 1));
     let getChildren = () => {
-      let children: React.ReactNode = outlet;
+      let children: React.ReactNode;
       if (error) {
         children = errorElement;
-      } else if (match.route.Component) {
-        children = <match.route.Component />;
       } else if (match.route.element) {
         children = match.route.element;
+      } else {
+        children = outlet;
       }
       return (
         <RenderedRoute

packages/router/utils.ts

@@ -181,7 +181,9 @@ export interface DetectErrorBoundaryFunction {
  * properties from framework-agnostic properties
  */
 export interface EnhanceAgnosticRouteFunction {
-  (route: AgnosticRouteObject): Record<string, any>;
+  (route: AgnosticRouteObject): {
+    hasErrorBoundary: boolean;
+  } & Record<string, any>;
 }
 
 /**