From 5760f8ad3e43981d532c66bc8dcd65580851551f Mon Sep 17 00:00:00 2001 From: Jacob Ebey Date: Thu, 12 Jan 2023 22:28:30 -0800 Subject: [PATCH] fix: update to accept ReactNode as result --- .changeset/light-pandas-confess.md | 5 +++++ packages/react-router/lib/components.tsx | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 .changeset/light-pandas-confess.md diff --git a/.changeset/light-pandas-confess.md b/.changeset/light-pandas-confess.md new file mode 100644 index 0000000000..dff9a75b88 --- /dev/null +++ b/.changeset/light-pandas-confess.md @@ -0,0 +1,5 @@ +--- +"react-router": patch +--- + +update to accept ReactNode as children function return result diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index d023669a1b..b76e5781e8 100644 --- 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): React.ReactElement; + (data: Awaited): 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}; } ///////////////////////////////////////////////////////////////////////////////