Merge pull request #4242 from CarsonF/bugfix/ssr

Small fixes for SSR
marmelab · Jan 8, 2020 · c633422 · c633422
2 parents 1210e50 + cad005b
commit c633422
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/packages/ra-core/src/core/CoreAdminContext.tsx b/packages/ra-core/src/core/CoreAdminContext.tsx
@@ -73,9 +73,13 @@ React-admin requires a valid dataProvider function to work.`);
             <AuthContext.Provider value={finalAuthProvider}>
                 <DataProviderContext.Provider value={finalDataProvider}>
                     <TranslationProvider i18nProvider={i18nProvider}>
-                        <ConnectedRouter history={finalHistory}>
-                            {children}
-                        </ConnectedRouter>
+                        {typeof window !== 'undefined' ? (
+                            <ConnectedRouter history={finalHistory}>
+                                {children}
+                            </ConnectedRouter>
+                        ) : (
+                            children
+                        )}
                     </TranslationProvider>
                 </DataProviderContext.Provider>
             </AuthContext.Provider>

diff --git a/packages/ra-core/src/i18n/TranslationProvider.tsx b/packages/ra-core/src/i18n/TranslationProvider.tsx
@@ -2,7 +2,6 @@ import React, {
     useCallback,
     useMemo,
     Children,
-    ReactElement,
     FunctionComponent,
 } from 'react';
 
@@ -13,7 +12,6 @@ import { I18nProvider } from '../types';
 interface Props {
     locale?: string;
     i18nProvider: I18nProvider;
-    children: ReactElement<any>;
 }
 
 /**

diff --git a/packages/ra-ui-materialui/src/layout/Title.js b/packages/ra-ui-materialui/src/layout/Title.js
@@ -5,7 +5,10 @@ import { useTranslate, warning } from 'ra-core';
 
 const Title = ({ className, defaultTitle, locale, record, title, ...rest }) => {
     const translate = useTranslate();
-    const container = document.getElementById('react-admin-title');
+    const container =
+        typeof document !== 'undefined'
+            ? document.getElementById('react-admin-title')
+            : null;
     if (!container) return null;
     warning(!defaultTitle && !title, 'Missing title prop in <Title> element');