Merge branch 'main' into conico/rnd-8621-integration-markdown

conico974 · web-flow · commit d814917ec53f · 2025-11-18T20:38:31.000+01:00
diff --git a/.changeset/ready-ducks-burn.md b/.changeset/ready-ducks-burn.md
@@ -0,0 +1,5 @@
+---
+'@gitbook/react-openapi': patch
+---
+
+Fix OpenAPI basic auth placeholder
diff --git a/bun.lock b/bun.lock
@@ -7,7 +7,7 @@
       "devDependencies": {
         "@biomejs/biome": "^1.9.4",
         "@changesets/cli": "^2.29.7",
-        "turbo": "^2.5.8",
+        "turbo": "^2.6.1",
         "vercel": "^39.4.2",
       },
     },
diff --git a/packages/gitbook/src/components/DocumentView/BlockContentRef.tsx b/packages/gitbook/src/components/DocumentView/BlockContentRef.tsx
@@ -1,9 +1,18 @@
-import { type DocumentBlockContentRef, SiteInsightsLinkPosition } from '@gitbook/api';
+import {
+    type ContentRef,
+    type DocumentBlockContentRef,
+    SiteInsightsLinkPosition,
+} from '@gitbook/api';
 
-import { Card } from '@/components/primitives';
-import { type ResolvedContentRef, resolveContentRef } from '@/lib/references';
+import { Card, type CardProps } from '@/components/primitives';
+import {
+    type ResolvedContentRef,
+    resolveContentRef,
+    resolveContentRefFallback,
+} from '@/lib/references';
 
 import type { BlockProps } from './Block';
+import { NotFoundRefHoverCard } from './NotFoundRefHoverCard';
 
 export async function BlockContentRef(props: BlockProps<DocumentBlockContentRef>) {
     const { block, context, style } = props;
@@ -16,51 +25,45 @@ export async function BlockContentRef(props: BlockProps<DocumentBlockContentRef>
         : null;
 
     if (!resolved) {
-        return null;
+        const fallback = resolveContentRefFallback(block.data.ref);
+        if (!fallback) {
+            return null;
+        }
+        return (
+            <NotFoundRefHoverCard context={context}>
+                <BlockContentRefCard
+                    contentRef={block.data.ref}
+                    resolved={fallback}
+                    style={style}
+                />
+            </NotFoundRefHoverCard>
+        );
     }
 
-    const isContentInOtherSpace =
-        context.contentContext?.space &&
-        'space' in block.data.ref &&
-        context.contentContext.space.id !== block.data.ref.space;
-    const kind = block?.data?.ref?.kind;
-    if ((resolved.active && kind === 'space') || isContentInOtherSpace) {
-        return <SpaceRefCard {...props} resolved={resolved} />;
-    }
+    return <BlockContentRefCard contentRef={block.data.ref} resolved={resolved} style={style} />;
+}
 
+function BlockContentRefCard(
+    props: {
+        resolved: ResolvedContentRef;
+        contentRef: ContentRef;
+    } & Omit<CardProps, 'href' | 'title'>
+) {
+    const { ref, resolved, contentRef, ...rest } = props;
     return (
         <Card
+            ref={ref}
             leadingIcon={resolved.icon ? resolved.icon : null}
             href={resolved.href}
             title={resolved.text}
-            style={style}
             insights={{
                 type: 'link_click',
                 link: {
-                    target: block.data.ref,
+                    target: contentRef,
                     position: SiteInsightsLinkPosition.Content,
                 },
             }}
-        />
-    );
-}
-
-async function SpaceRefCard(
-    props: { resolved: ResolvedContentRef } & BlockProps<DocumentBlockContentRef>
-) {
-    const { context, style, resolved } = props;
-    const spaceId = context.contentContext?.space.id;
-
-    if (!spaceId) {
-        return null;
-    }
-
-    return (
-        <Card
-            href={resolved.href}
-            title={resolved.text}
-            postTitle={resolved.subText}
-            style={style}
+            {...rest}
         />
     );
 }
diff --git a/packages/gitbook/src/components/DocumentView/InlineButton.tsx b/packages/gitbook/src/components/DocumentView/InlineButton.tsx
@@ -1,31 +1,29 @@
-import { resolveContentRef } from '@/lib/references';
+import { resolveContentRef, resolveContentRefFallback } from '@/lib/references';
 import * as api from '@gitbook/api';
 import type { IconName } from '@gitbook/icons';
 import { Button } from '../primitives';
 import type { InlineProps } from './Inline';
+import { NotFoundRefHoverCard } from './NotFoundRefHoverCard';
 
 export async function InlineButton(props: InlineProps<api.DocumentInlineButton>) {
     const { inline, context } = props;
 
-    if (!context.contentContext) {
-        throw new Error('InlineButton requires a contentContext');
-    }
-
-    const resolved = await resolveContentRef(inline.data.ref, context.contentContext);
+    const resolved = context.contentContext
+        ? await resolveContentRef(inline.data.ref, context.contentContext)
+        : null;
 
-    if (!resolved) {
-        return null;
-    }
+    const href = resolved?.href ?? resolveContentRefFallback(inline.data.ref)?.href;
 
-    return (
+    const inlineElement = (
         // Set the leading to have some vertical space between adjacent buttons
         <span className="inline-button leading-12 [&:has(+.inline-button)]:mr-2">
             <Button
-                href={resolved.href}
+                href={href}
                 label={inline.data.label}
                 // TODO: use a variant specifically for user-defined buttons.
                 variant={inline.data.kind}
                 className="leading-normal"
+                disabled={href === undefined}
                 icon={inline.data.icon as IconName | undefined}
                 insights={{
                     type: 'link_click',
@@ -37,4 +35,10 @@ export async function InlineButton(props: InlineProps<api.DocumentInlineButton>)
             />
         </span>
     );
+
+    if (!resolved) {
+        return <NotFoundRefHoverCard context={context}>{inlineElement}</NotFoundRefHoverCard>;
+    }
+
+    return inlineElement;
 }
diff --git a/packages/gitbook/src/components/DocumentView/InlineLink/InlineLink.tsx b/packages/gitbook/src/components/DocumentView/InlineLink/InlineLink.tsx
@@ -1,12 +1,17 @@
-import { type DocumentInlineLink, SiteInsightsLinkPosition } from '@gitbook/api';
+import { type ContentRef, type DocumentInlineLink, SiteInsightsLinkPosition } from '@gitbook/api';
 
 import { getSpaceLanguage, tString } from '@/intl/server';
 import { type TranslationLanguage, languages } from '@/intl/translations';
-import { type ResolvedContentRef, resolveContentRef } from '@/lib/references';
+import {
+    type ResolvedContentRef,
+    resolveContentRef,
+    resolveContentRefFallback,
+} from '@/lib/references';
 import { Icon } from '@gitbook/icons';
-import { HoverCard, HoverCardRoot, HoverCardTrigger, StyledLink } from '../../primitives';
+import { StyledLink } from '../../primitives';
 import type { InlineProps } from '../Inline';
 import { Inlines } from '../Inlines';
+import { NotFoundRefHoverCard } from '../NotFoundRefHoverCard';
 import { InlineLinkTooltip } from './InlineLinkTooltip';
 
 export async function InlineLink(props: InlineProps<DocumentInlineLink>) {
@@ -18,52 +23,75 @@ export async function InlineLink(props: InlineProps<DocumentInlineLink>) {
               resolveAnchorText: false,
           })
         : null;
+
     const { contentContext } = context;
 
-    const language = contentContext ? getSpaceLanguage(contentContext) : languages.en;
+    const inlinesElement = (
+        <Inlines
+            context={context}
+            document={document}
+            nodes={inline.nodes}
+            ancestorInlines={[...ancestorInlines, inline]}
+        />
+    );
 
-    if (!contentContext || !resolved) {
+    if (!resolved) {
+        const fallback = resolveContentRefFallback(inline.data.ref);
         return (
-            <HoverCardRoot>
-                <HoverCardTrigger>
-                    <span className="cursor-not-allowed underline">
-                        <Inlines
-                            context={context}
-                            document={document}
-                            nodes={inline.nodes}
-                            ancestorInlines={[...ancestorInlines, inline]}
-                        />
-                    </span>
-                </HoverCardTrigger>
-                <HoverCard className="flex flex-col gap-1 p-4">
-                    <div className="flex items-center gap-2">
-                        <Icon icon="ban" className="size-4 text-tint-subtle" />
-                        <h5 className="font-semibold">{tString(language, 'notfound_title')}</h5>
-                    </div>
-                    <p className="text-sm text-tint">{tString(language, 'notfound_link')}</p>
-                </HoverCard>
-            </HoverCardRoot>
+            <NotFoundRefHoverCard context={context}>
+                {fallback ? (
+                    <InlineLinkAnchor href={fallback.href} contentRef={inline.data.ref} isExternal>
+                        {inlinesElement}
+                    </InlineLinkAnchor>
+                ) : (
+                    <span className="cursor-not-allowed underline">{inlinesElement}</span>
+                )}
+            </NotFoundRefHoverCard>
         );
     }
-    const isExternal = inline.data.ref.kind === 'url';
-    const isMailto = resolved.href.startsWith('mailto:');
-    const content = (
-        <StyledLink
+    const anchorElement = (
+        <InlineLinkAnchor
             href={resolved.href}
+            contentRef={inline.data.ref}
+            isExternal={inline.data.ref.kind === 'url'}
+        >
+            {inlinesElement}
+        </InlineLinkAnchor>
+    );
+
+    if (context.withLinkPreviews) {
+        const language = contentContext ? getSpaceLanguage(contentContext) : languages.en;
+
+        return (
+            <InlineLinkTooltipWrapper inline={inline} language={language} resolved={resolved}>
+                {anchorElement}
+            </InlineLinkTooltipWrapper>
+        );
+    }
+
+    return anchorElement;
+}
+
+function InlineLinkAnchor(props: {
+    href: string;
+    contentRef: ContentRef;
+    isExternal?: boolean;
+    children: React.ReactNode;
+}) {
+    const { href, isExternal, contentRef, children } = props;
+    const isMailto = href.startsWith('mailto:');
+    return (
+        <StyledLink
+            href={href}
             insights={{
                 type: 'link_click',
                 link: {
-                    target: inline.data.ref,
+                    target: contentRef,
                     position: SiteInsightsLinkPosition.Content,
                 },
             }}
         >
-            <Inlines
-                context={context}
-                document={document}
-                nodes={inline.nodes}
-                ancestorInlines={[...ancestorInlines, inline]}
-            />
+            {children}
             {isMailto ? (
                 <Icon
                     icon="envelope"
@@ -77,16 +105,6 @@ export async function InlineLink(props: InlineProps<DocumentInlineLink>) {
             ) : null}
         </StyledLink>
     );
-
-    if (context.withLinkPreviews) {
-        return (
-            <InlineLinkTooltipWrapper inline={inline} language={language} resolved={resolved}>
-                {content}
-            </InlineLinkTooltipWrapper>
-        );
-    }
-
-    return content;
 }
 
 /**
diff --git a/packages/gitbook/src/components/DocumentView/NotFoundRefHoverCard.tsx b/packages/gitbook/src/components/DocumentView/NotFoundRefHoverCard.tsx
@@ -0,0 +1,32 @@
+import { getSpaceLanguage, tString } from '@/intl/server';
+import { languages } from '@/intl/translations';
+import { Icon } from '@gitbook/icons';
+import type { DocumentContextProps } from '../DocumentView';
+import { HoverCard, HoverCardRoot, HoverCardTrigger } from '../primitives';
+
+/**
+ * Hover card displayed for a link not found.
+ */
+export function NotFoundRefHoverCard(
+    props: DocumentContextProps & {
+        children: React.ReactNode;
+    }
+) {
+    const {
+        context: { contentContext },
+        children,
+    } = props;
+    const language = contentContext ? getSpaceLanguage(contentContext) : languages.en;
+    return (
+        <HoverCardRoot>
+            <HoverCardTrigger>{children}</HoverCardTrigger>
+            <HoverCard className="flex flex-col gap-1 p-4">
+                <div className="flex items-center gap-2">
+                    <Icon icon="ban" className="size-4 text-tint-subtle" />
+                    <h5 className="font-semibold">{tString(language, 'notfound_title')}</h5>
+                </div>
+                <p className="text-sm text-tint">{tString(language, 'notfound_link')}</p>
+            </HoverCard>
+        </HoverCardRoot>
+    );
+}
diff --git a/packages/gitbook/src/components/primitives/Card.tsx b/packages/gitbook/src/components/primitives/Card.tsx
@@ -2,22 +2,40 @@ import { Icon } from '@gitbook/icons';
 
 import { type ClassValue, tcls } from '@/lib/tailwind';
 
-import { Link, type LinkInsightsProps } from './Link';
+import { Link, type LinkInsightsProps, type LinkProps } from './Link';
 
-export async function Card(
+export type CardProps = {
+    href: string;
+    leadingIcon?: React.ReactNode;
+    preTitle?: string;
+    title: string;
+    postTitle?: string;
+    style?: ClassValue;
+} & LinkInsightsProps &
+    Omit<LinkProps, 'href' | 'className' | 'classNames' | 'insights' | 'style'>;
+
+export function Card(
     props: {
         href: string;
         leadingIcon?: React.ReactNode;
         preTitle?: string;
         title: string;
         postTitle?: string;
         style?: ClassValue;
-    } & LinkInsightsProps
+    } & LinkInsightsProps &
+        Omit<LinkProps, 'href' | 'className' | 'classNames' | 'insights' | 'style'>
 ) {
-    const { title, leadingIcon, href, preTitle, postTitle, style, insights } = props;
+    const { ref, title, leadingIcon, href, preTitle, postTitle, style, insights, ...rest } = props;
 
     return (
-        <Link href={href} className={tcls(style)} classNames={['CardStyles']} insights={insights}>
+        <Link
+            ref={ref}
+            href={href}
+            className={tcls(style)}
+            classNames={['CardStyles']}
+            insights={insights}
+            {...rest}
+        >
             {leadingIcon}
             <span className={tcls('flex', 'flex-col', 'flex-1')}>
                 {preTitle ? (
diff --git a/packages/gitbook/src/components/primitives/Link.tsx b/packages/gitbook/src/components/primitives/Link.tsx
diff --git a/packages/gitbook/src/lib/references.tsx b/packages/gitbook/src/lib/references.tsx
diff --git a/packages/react-openapi/src/OpenAPICodeSample.tsx b/packages/react-openapi/src/OpenAPICodeSample.tsx

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@gitbook/react-openapi': patch
 +---
++
 +Fix OpenAPI basic auth placeholder