Simplified prop destruction to avoid type casts

Author: PatrickShaw

src/controllers/memory-router/index.tsx

@@ -1,50 +1,44 @@
 import React, { useRef } from 'react';
 
-import { createMemoryHistory, MemoryHistoryBuildOptions } from 'history';
+import { createMemoryHistory } from 'history';
 
 import { Router } from '../router';
-import { RouterProps } from '../router/types';
 
 import { MemoryRouterProps } from '../../common/types';
 
-const getRouterProps = (memoryRouterProps: MemoryRouterProps) => {
-  const {
-    isStatic = false,
-    isGlobal = true,
-    basePath,
-    routes,
-    resourceData,
-    resourceContext,
-  } = memoryRouterProps;
-  let routerProps: Partial<RouterProps> = {
-    basePath,
-    routes,
-    isStatic,
-    isGlobal,
-  };
-
-  if (resourceData) {
-    routerProps = { ...routerProps, resourceData };
-  }
+const lazy = <T extends any>(callback: () => T) => {
+  let firstCall = true;
+  let current: T | undefined = undefined;
 
-  if (resourceContext) {
-    routerProps = { ...routerProps, resourceContext };
-  }
+  return () => {
+    if (firstCall) {
+      current = callback();
+      firstCall = false;
+    }
 
-  return routerProps;
+    return current;
+  };
 };
 
 /**
  * Ensures the router store uses memory history.
  *
  */
-export const MemoryRouter = (props: MemoryRouterProps) => {
-  const { location, children } = props;
-
-  const newGetHistory = () =>
+export const MemoryRouter = ({
+  isStatic = false,
+  isGlobal = true,
+  location,
+  children,
+  basePath,
+  routes,
+  resourceData,
+  resourceContext,
+}: MemoryRouterProps) => {
+  const newGetHistory = lazy(() =>
     createMemoryHistory({
       initialEntries: location !== undefined ? [location] : undefined,
-    });
+    })
+  );
 
   const historyState = useRef({
     getHistory: newGetHistory,
@@ -55,13 +49,16 @@ export const MemoryRouter = (props: MemoryRouterProps) => {
     historyState.current.getHistory = newGetHistory;
   }
 
-  const routerProps = getRouterProps(props);
-
   return (
     // @ts-ignore suppress history will be overwritten warning
     <Router
+      isStatic={isStatic}
+      isGlobal={isGlobal}
       history={historyState.current.getHistory()}
-      {...(routerProps as RouterProps)}
+      basePath={basePath}
+      routes={routes}
+      resourceData={resourceData}
+      resourceContext={resourceContext}
     >
       {children}
     </Router>