Merge pull request #5558 from marmelab/revert-5557-fix/login-page-theme

Revert "Fix Loading route missing theme with LoadingPage"

Author: fzaninotto

packages/ra-core/src/core/CoreAdminRouter.tsx

@@ -17,7 +17,6 @@ import {
     CustomRoutes,
     CatchAllComponent,
     LayoutComponent,
-    LoadingComponent,
     CoreLayoutProps,
     ResourceProps,
     RenderResourcesFunction,
@@ -29,7 +28,7 @@ export interface AdminRouterProps extends CoreLayoutProps {
     catchAll: CatchAllComponent;
     children?: AdminChildren;
     customRoutes?: CustomRoutes;
-    loading: LoadingComponent;
+    loading: ComponentType;
     ready?: ComponentType;
 }
 
@@ -102,7 +101,7 @@ const CoreAdminRouter: FunctionComponent<AdminRouterProps> = props => {
         children,
         customRoutes,
         dashboard,
-        loading: LoadingPage,
+        loading,
         logout,
         menu,
         ready,
@@ -122,13 +121,7 @@ const CoreAdminRouter: FunctionComponent<AdminRouterProps> = props => {
         (!computedChildren || computedChildren.length === 0)
     ) {
         if (oneSecondHasPassed) {
-            return (
-                <Route
-                    path="/"
-                    key="loading"
-                    render={() => <LoadingPage theme={theme} />}
-                />
-            );
+            return <Route path="/" key="loading" component={loading} />;
         } else {
             return null;
         }

packages/ra-core/src/core/CoreAdminUI.tsx

@@ -13,7 +13,6 @@ import {
     CatchAllComponent,
     CustomRoutes,
     DashboardComponent,
-    LoadingComponent,
 } from '../types';
 
 export type ChildrenFunction = () => ComponentType[];
@@ -28,7 +27,7 @@ export interface AdminUIProps {
     customRoutes?: CustomRoutes;
     dashboard?: DashboardComponent;
     layout?: LayoutComponent;
-    loading?: LoadingComponent;
+    loading?: ComponentType;
     loginPage?: LoginComponent | boolean;
     logout?: ComponentType;
     menu?: ComponentType;

packages/ra-core/src/types.ts

@@ -409,11 +409,6 @@ export interface CoreLayoutProps {
 }
 
 export type LayoutComponent = ComponentType<CoreLayoutProps>;
-export type LoadingComponent = ComponentType<{
-    theme?: ThemeOptions;
-    loadingPrimary?: string;
-    loadingSecondary?: string;
-}>;
 
 export interface ResourceComponentInjectedProps {
     basePath?: string;

packages/ra-ui-materialui/src/layout/LoadingPage.tsx

@@ -8,7 +8,6 @@ import Error, { ErrorProps } from './Error';
 import HideOnScroll, { HideOnScrollProps } from './HideOnScroll';
 import Layout, { LayoutProps } from './Layout';
 import Loading from './Loading';
-import LoadingPage from './LoadingPage';
 import LinearProgress from './LinearProgress';
 import LoadingIndicator from './LoadingIndicator';
 import Menu, { MenuProps } from './Menu';
@@ -33,7 +32,6 @@ export {
     HideOnScroll,
     Layout,
     Loading,
-    LoadingPage,
     LinearProgress,
     LoadingIndicator,
     Menu,

packages/ra-ui-materialui/src/layout/index.ts

@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { FC } from 'react';
 import { CoreAdminRouter, AdminRouterProps } from 'ra-core';
-import { LoadingPage } from 'ra-ui-materialui';
+import { Loading } from 'ra-ui-materialui';
 
 const AdminRouter: FC<AdminRouterProps> = props => (
     <CoreAdminRouter {...props} />
 );
 
 AdminRouter.defaultProps = {
-    loading: LoadingPage,
+    loading: Loading,
 };
 
 export default AdminRouter;

packages/react-admin/src/AdminRouter.tsx

@@ -3,7 +3,7 @@ import { FC } from 'react';
 import { CoreAdminUI, AdminUIProps } from 'ra-core';
 import {
     Layout as DefaultLayout,
-    LoadingPage,
+    Loading,
     Login,
     Logout,
     NotFound,
@@ -14,7 +14,7 @@ const AdminUI: FC<AdminUIProps> = props => <CoreAdminUI {...props} />;
 AdminUI.defaultProps = {
     layout: DefaultLayout,
     catchAll: NotFound,
-    loading: LoadingPage,
+    loading: Loading,
     loginPage: Login,
     logout: Logout,
 };