From 9d077d58bbbf131dfa522e706a50bc159f115442 Mon Sep 17 00:00:00 2001 From: YannBirba Date: Mon, 9 May 2022 14:41:55 +0200 Subject: [PATCH 1/3] Change children type to ReactElement in BrowserOnly from BrowserUtils --- packages/prerender/src/browserUtils/index.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/prerender/src/browserUtils/index.ts b/packages/prerender/src/browserUtils/index.ts index 2b801c589971..4ce482f88c17 100644 --- a/packages/prerender/src/browserUtils/index.ts +++ b/packages/prerender/src/browserUtils/index.ts @@ -1,3 +1,4 @@ +import type { ReactElement } from 'react' import { useMemo } from 'react' /* Web side prerender utils, to be used on the browser */ @@ -14,7 +15,11 @@ export const useIsBrowser = () => { }, []) } -export const BrowserOnly = ({ children }: { children: React.ReactNode }) => { +export const BrowserOnly = ({ + children, +}: { + children: ReactElement +}) => { const isBrowser = useIsBrowser() return isBrowser && children From 0cf5ebda3c2f8856f66c79e561e30d11539123b3 Mon Sep 17 00:00:00 2001 From: Yann Birba Date: Mon, 9 May 2022 19:58:47 +0200 Subject: [PATCH 2/3] Update index.ts --- packages/prerender/src/browserUtils/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/prerender/src/browserUtils/index.ts b/packages/prerender/src/browserUtils/index.ts index 4ce482f88c17..a4c8f0cbf815 100644 --- a/packages/prerender/src/browserUtils/index.ts +++ b/packages/prerender/src/browserUtils/index.ts @@ -18,7 +18,7 @@ export const useIsBrowser = () => { export const BrowserOnly = ({ children, }: { - children: ReactElement + children: ReactElement }) => { const isBrowser = useIsBrowser() From a893b528f64516160d5ff35dd7cb1826b4e8b649 Mon Sep 17 00:00:00 2001 From: Daniel Choudhury Date: Mon, 9 May 2022 18:14:44 +0000 Subject: [PATCH 3/3] Also change return type of browserOnly --- packages/prerender/src/browserUtils/index.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/prerender/src/browserUtils/index.ts b/packages/prerender/src/browserUtils/index.ts index a4c8f0cbf815..d76162e9aef4 100644 --- a/packages/prerender/src/browserUtils/index.ts +++ b/packages/prerender/src/browserUtils/index.ts @@ -15,12 +15,8 @@ export const useIsBrowser = () => { }, []) } -export const BrowserOnly = ({ - children, -}: { - children: ReactElement -}) => { +export const BrowserOnly = ({ children }: { children: ReactElement }) => { const isBrowser = useIsBrowser() - return isBrowser && children + return isBrowser ? children : null }