fix: update <Await> to accept ReactNode as result (#9896)

remix-run · Jan 13, 2023 · 44c03c6 · 44c03c6
1 parent 7049c41
commit 44c03c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.changeset/light-pandas-confess.md b/.changeset/light-pandas-confess.md
@@ -0,0 +1,5 @@
+---
+"react-router": patch
+---
+
+update <Await> to accept ReactNode as children function return result
diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
@@ -394,7 +394,7 @@ export function Routes({
 }
 
 export interface AwaitResolveRenderFunction {
-  (data: Awaited<any>): React.ReactElement;
+  (data: Awaited<any>): React.ReactNode;
 }
 
 export interface AwaitProps {
@@ -531,10 +531,8 @@ function ResolveAwait({
   children: React.ReactNode | AwaitResolveRenderFunction;
 }) {
   let data = useAsyncValue();
-  if (typeof children === "function") {
-    return children(data);
-  }
-  return <>{children}</>;
+  let toRender = typeof children === "function" ? children(data) : children;
+  return <>{toRender}</>;
 }
 
 ///////////////////////////////////////////////////////////////////////////////