fix: docId context

ccontrols · Jul 6, 2020 · 65eec8e · 65eec8e
1 parent b5e78cc
commit 65eec8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ui/app/src/DocPage/DocPage.tsx b/ui/app/src/DocPage/DocPage.tsx
@@ -15,6 +15,7 @@ export const DocPage: FC<Omit<DocPageProps, 'doc'>> = ({
 }) => {
   const { storeProvider, docId } = useContext(BlockContext);
   const doc = docId ? storeProvider.getStoryDoc(docId) : undefined;
+
   const hasNoSideBars = doc && !doc.navSidebar && !doc.contextSidebar;
   const isFullPage = doc && doc.fullPage;
   if (hasNoSideBars || isFullPage) {
@@ -26,5 +27,5 @@ export const DocPage: FC<Omit<DocPageProps, 'doc'>> = ({
       />
     );
   }
-  return doc ? <SidebarsPage type={type} doc={doc} {...props} /> : null;
+  return <SidebarsPage type={type} {...props} />;
 };
diff --git a/ui/app/src/SidebarsPage/SidebarsPage.tsx b/ui/app/src/SidebarsPage/SidebarsPage.tsx
@@ -3,7 +3,10 @@ import { BlockContext } from '@component-controls/blocks';
 import { SidebarsMDXPage } from './SidebarsMDXPage';
 import { DocPageProps, SidebarsStoryPage } from './SidebarsStoryPage';
 
-export const SidebarsPage: FC<DocPageProps> = ({ type, activeTab }) => {
+export const SidebarsPage: FC<Omit<DocPageProps, 'doc'>> = ({
+  type,
+  activeTab,
+}) => {
   const { storeProvider, docId } = useContext(BlockContext);
   const doc = docId ? storeProvider.getStoryDoc(docId) : undefined;
   if (doc && doc.MDXPage && !doc.stories?.length) {

diff --git a/ui/blocks/src/context/block/BlockContext.tsx b/ui/blocks/src/context/block/BlockContext.tsx
@@ -79,15 +79,15 @@ export const BlockContextProvider: React.FC<BlockContextInputProps> = ({
           <BlockContext.Provider
             value={{
               storyId,
-              docId,
+              docId: propsDocId,
               storeProvider: store,
               options,
             }}
           >
             <BlockDataContextProvider
               store={store}
               storyId={storyId}
-              docId={docId}
+              docId={propsDocId}
             >
               {children}
             </BlockDataContextProvider>