fix(docz): remove null return on routes

doczjs · Mar 17, 2019 · 5bbbbb3 · 5bbbbb3
1 parent b856168
commit 5bbbbb3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/core/docz/src/components/Routes.tsx b/core/docz/src/components/Routes.tsx
@@ -32,7 +32,6 @@ const goToHash = ({ location }: HistoryListenerParameter) => {
 export const Routes: SFC<RoutesProps> = ({ imports }) => {
   const components = useComponents()
   const { entries } = useContext(doczState.context)
-  if (!entries || !components) return null
 
   const NotFound: any = components.notFound
   const Loading: any = components.loading
@@ -48,20 +47,21 @@ export const Routes: SFC<RoutesProps> = ({ imports }) => {
         <React.Suspense fallback={<Loading />}>
           <Router basepath={DOCZ_BASE_URL}>
             <NotFound default />
-            {entries.map(({ key: path, value: entry }) => {
-              const props = { path, entries, components }
-              const component = loadRoute(path, imports)
+            {entries &&
+              entries.map(({ key: path, value: entry }) => {
+                const props = { path, entries, components }
+                const component = loadRoute(path, imports)
 
-              return (
-                <AsyncRoute
-                  {...props}
-                  entry={entry}
-                  key={entry.id}
-                  path={entry.route}
-                  asyncComponent={component}
-                />
-              )
-            })}
+                return (
+                  <AsyncRoute
+                    {...props}
+                    entry={entry}
+                    key={entry.id}
+                    path={entry.route}
+                    asyncComponent={component}
+                  />
+                )
+              })}
           </Router>
         </React.Suspense>
       </LocationProvider>

diff --git a/core/docz/src/hooks/useDocs.ts b/core/docz/src/hooks/useDocs.ts
@@ -5,8 +5,7 @@ import { doczState, Entry } from '../state'
 import { compare } from '../utils/helpers'
 
 export const useDocs = (): Entry[] | null => {
-  const { entries } = useContext(doczState.context)
-  if (!entries) return null
+  const { entries = [] } = useContext(doczState.context)
   const arr = entries.map(({ value }) => value)
   return sort(arr, (a: Entry, b: Entry) => compare(a.name, b.name))
 }