Use updated API

Author: emmerich

packages/gitbook/src/components/DocumentView/Block.tsx

@@ -92,7 +92,7 @@ export function Block<T extends DocumentBlock>(props: BlockProps<T>) {
             case 'math':
                 return <BlockMath {...props} {...contextProps} block={block} />;
             case 'file':
-                return <File {...props} {...contextProps} block={block} />
+                return <File {...props} {...contextProps} block={block} />;
             case 'divider':
                 return <Divider {...props} {...contextProps} block={block} />;
             case 'drawing':

packages/gitbook/src/components/DocumentView/ReusableContent.tsx

@@ -1,6 +1,6 @@
 import { DocumentBlockReusableContent } from '@gitbook/api';
 
-import { getReusableContentDocument } from '@/lib/api';
+import { getDocument, getReusableContent } from '@/lib/api';
 
 import { BlockProps } from './Block';
 import { UnwrappedBlocks } from './Blocks';
@@ -9,14 +9,15 @@ export async function ReusableContent(props: BlockProps<DocumentBlockReusableCon
     const { block, context, ancestorBlocks } = props;
 
     if (!context.content) {
+        throw new Error(`Expected a content context to render a reusable content block`);
+    }
+
+    const resolved = await context.resolveContentRef(block.data.ref);
+    if (!resolved?.documentId) {
         return null;
     }
 
-    const document = await getReusableContentDocument(
-        context.content.spaceId,
-        context.content.revisionId,
-        block.data.ref.reusableContent,
-    );
+    const document = await getDocument(context.content.spaceId, resolved.documentId);
 
     if (!document) {
         return null;

packages/gitbook/src/lib/api.ts

@@ -614,31 +614,26 @@ export const getRevisionFile = batch<[string, string, string], RevisionFile | nu
 );
 
 /**
- * Get reusable content in a revision. Also returns the document.
+ * Get reusable content in a revision.
  */
-export const getReusableContentDocument = async (
+export const getReusableContent = async (
     spaceId: string,
     revisionId: string,
     reusableContentId: string,
-): Promise<JSONDocument | null> => {
+): Promise<RevisionReusableContent | null> => {
     const hasRevisionInMemory = await getRevision.hasInMemory(spaceId, revisionId, {
         metadata: false,
     });
 
     if (hasRevisionInMemory) {
         const revision = await getRevision(spaceId, revisionId, { metadata: false });
-        const reusableContent = revision.reusableContents[reusableContentId];
-        if (!reusableContent) {
-            return null;
-        }
-        return getDocument(reusableContent.documentId);
+        return revision.reusableContents[reusableContentId] ?? null;
     } else {
-        const response = await getRevisionReusableContentById(
+        return getRevisionReusableContentById(
             spaceId,
             revisionId,
             reusableContentId,
         );
-        return response?.document ?? null;
     }
 };
 

packages/gitbook/src/lib/references.tsx

@@ -9,6 +9,7 @@ import {
     SpaceContentPointer,
     getCollection,
     getDocument,
+    getReusableContent,
     getRevisionFile,
     getSpace,
     getSpaceContentData,
@@ -35,6 +36,8 @@ export interface ResolvedContentRef {
     active: boolean;
     /** File, if the reference is a file */
     file?: RevisionFile;
+    /** ID of an attached document. */
+    documentId?: string;
 }
 
 export interface ContentRefContext extends PageHrefContext {
@@ -255,7 +258,18 @@ export async function resolveContentRef(
             };
         }
 
-        case 'reusable-content':
+        case 'reusable-content': {
+            const reusableContent = await getReusableContent(space.id, revisionId, contentRef.reusableContent);
+            if (!reusableContent) {
+                return null;
+            }
+            return {
+                href: gitbookAppHref(`/s/${space.id}`),
+                text: reusableContent.title,
+                active: false,
+                documentId: reusableContent.document,
+            }
+        }
         case 'synced-block':
             return null;