Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Render JSX blocks in History and agent-change diffs (PRD-9232) (#6072)

Andrew Mikofalvy6a1341f2831f
diff --git a/.changeset/history-diff-jsx-blocks.md b/.changeset/history-diff-jsx-blocks.md
new file mode 100644
index 000000000..468b96fbd
--- /dev/null
+++ b/.changeset/history-diff-jsx-blocks.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+History and agent-change diffs now render images, callouts and other components instead of empty boxes.
diff --git a/packages/app/src/components/RenderedDiffView.dom.test.tsx b/packages/app/src/components/RenderedDiffView.dom.test.tsx
index 687aa9f78..8bd37ce4e 100644
--- a/packages/app/src/components/RenderedDiffView.dom.test.tsx
+++ b/packages/app/src/components/RenderedDiffView.dom.test.tsx
@@ -99,6 +99,174 @@ describe('RenderedDiffView', () => {
);
});
+ test('an inserted standalone image renders the image inside the highlighted block', async () => {
+ const pane = await mountDiff(
+ 'Intro.',
+ 'Intro.\n\n![diagram](diagram.png)',
+ 'projects/ok-cloud/log',
+ );
+
+ await waitFor(() =>
+ expect(
+ pane
+ .querySelector('.ok-diff-ins-block [data-component-name="CommonMarkImage"] img')
+ ?.getAttribute('src'),
+ ).toBe('/projects/ok-cloud/diagram.png'),
+ );
+ });
+
+ test('a deleted standalone image renders the image inside the struck widget', async () => {
+ const pane = await mountDiff(
+ 'Intro.\n\n![diagram](diagram.png)',
+ 'Intro.',
+ 'projects/ok-cloud/log',
+ );
+
+ await waitFor(() =>
+ expect(pane.querySelector('[data-diff-deleted] img')?.getAttribute('src')).toBe(
+ '/projects/ok-cloud/diagram.png',
+ ),
+ );
+ });
+
+ test('an inserted Callout renders its callout box around the changed text', async () => {
+ const pane = await mountDiff(
+ 'Intro.',
+ 'Intro.\n\n<Callout type="warning">\n\nMind the gap.\n\n</Callout>',
+ );
+
+ const callout = await waitFor(() => {
+ const el = pane.querySelector('.ok-diff-ins-block .callout');
+ if (!el) throw new Error('callout not rendered');
+ return el;
+ });
+ expect(callout.getAttribute('data-callout-type')).toBe('warning');
+ expect(callout.textContent).toContain('Mind the gap.');
+ });
+
+ test('a deleted Callout renders its callout box inside the struck widget', async () => {
+ const pane = await mountDiff(
+ 'Intro.\n\n<Callout type="warning">\n\nMind the gap.\n\n</Callout>',
+ 'Intro.',
+ );
+
+ const callout = await waitFor(() => {
+ const el = pane.querySelector('[data-diff-deleted] .callout');
+ if (!el) throw new Error('callout not rendered');
+ return el;
+ });
+ expect(callout.textContent).toContain('Mind the gap.');
+ });
+
+ test('a Mirror renders as a static reference to its source, not a live embed', async () => {
+ const pane = await mountDiff(
+ 'Intro.',
+ 'Intro.\n\n<Mirror src="specs/shared-intro" anchor="overview" />',
+ );
+
+ const reference = await waitFor(() => {
+ const el = pane.querySelector('.ok-diff-ins-block [data-diff-jsx-reference]');
+ if (!el) throw new Error('reference not rendered');
+ return el;
+ });
+ expect(reference.textContent).toContain('specs/shared-intro#overview');
+ });
+
+ test('an unregistered component renders its source', async () => {
+ const pane = await mountDiff('Intro.', 'Intro.\n\n<Widget size="2" />');
+
+ const source = await waitFor(() => {
+ const el = pane.querySelector('.ok-diff-ins-block [data-diff-jsx-source]');
+ if (!el) throw new Error('source not rendered');
+ return el;
+ });
+ expect(source.textContent).toContain('Unknown component: Widget');
+ expect(source.querySelector('code')?.textContent).toBe('<Widget size="2" />');
+ });
+
+ test('an edit inside an unregistered wrapper renders its children in the changed blocks', async () => {
+ const before = '<Widget tone="calm">\n\nOld wrapped text.\n\n</Widget>';
+ const after = '<Widget tone="loud">\n\nNew wrapped text.\n\n</Widget>';
+ const pane = await mountDiff(before, after);
+
+ await waitFor(() =>
+ expect(pane.querySelector('.ok-diff-ins-block [data-diff-jsx-source] p')?.textContent).toBe(
+ 'New wrapped text.',
+ ),
+ );
+ await waitFor(() =>
+ expect(pane.querySelector('[data-diff-deleted] [data-diff-jsx-source] p')?.textContent).toBe(
+ 'Old wrapped text.',
+ ),
+ );
+ expect(pane.querySelector('.ok-diff-ins-block [data-diff-jsx-source] code')?.textContent).toBe(
+ '<Widget tone="loud">',
+ );
+ expect(pane.querySelector('[data-diff-deleted] [data-diff-jsx-source] code')?.textContent).toBe(
+ '<Widget tone="calm">',
+ );
+ const diff = computeRenderedDiff(before, after);
+ if (!diff.ok) throw new Error(`engine not-ok: ${diff.reason}`);
+ expect(pane.querySelectorAll(RENDERED_DIFF_CHANGE_SELECTOR).length).toBe(
+ countRenderedDiffAnchors(diff),
+ );
+ });
+
+ test('a deleted Tabs keeps its labelled tabs', async () => {
+ const tabs =
+ '<Tabs>\n\n<Tab label="One">\n\nFirst panel.\n\n</Tab>\n\n<Tab label="Two">\n\nSecond panel.\n\n</Tab>\n\n</Tabs>';
+ const pane = await mountDiff(`Intro.\n\n${tabs}`, 'Intro.');
+
+ await waitFor(() =>
+ expect(
+ Array.from(pane.querySelectorAll('[data-diff-deleted] [role="tab"]')).map(
+ (tab) => tab.textContent,
+ ),
+ ).toEqual(['One', 'Two']),
+ );
+ expect(pane.querySelector('[data-diff-deleted]')?.textContent).toContain('Second panel.');
+ });
+
+ test('a collapsible block renders open so its changed content is visible', async () => {
+ const pane = await mountDiff(
+ 'Intro.',
+ 'Intro.\n\n<Accordion title="Details">\n\nHidden detail.\n\n</Accordion>',
+ );
+
+ const details = await waitFor(() => {
+ const el = pane.querySelector<HTMLDetailsElement>('.ok-diff-ins-block details.accordion');
+ if (!el) throw new Error('accordion not rendered');
+ return el;
+ });
+ expect(details.open).toBe(true);
+ });
+
+ test('a video in a diff never autoplays or loops and always shows controls', async () => {
+ const pane = await mountDiff(
+ 'Intro.',
+ 'Intro.\n\n<video src="clip.mp4" autoplay loop controls={false} />',
+ );
+
+ const video = await waitFor(() => {
+ const el = pane.querySelector<HTMLVideoElement>('.ok-diff-ins-block video');
+ if (!el) throw new Error('video not rendered');
+ return el;
+ });
+ expect(video.autoplay).toBe(false);
+ expect(video.loop).toBe(false);
+ expect(video.controls).toBe(true);
+ });
+
+ test('a diff carries no editing chrome on its components', async () => {
+ const pane = await mountDiff(
+ 'Intro.',
+ 'Intro.\n\n<Callout type="warning">\n\nMind the gap.\n\n</Callout>',
+ );
+
+ await waitFor(() => expect(pane.querySelector('.callout')).toBeTruthy());
+ expect(pane.querySelector('.jsx-component-chrome')).toBeNull();
+ });
+
test('a formatting-only change (bold removed) renders without content churn', async () => {
const pane = await mountDiff('one **two three** four', 'one two three four');
expect(pane.querySelector('.ProseMirror')).toBeTruthy();
diff --git a/packages/app/src/components/RenderedDiffView.live-doc.dom.test.tsx b/packages/app/src/components/RenderedDiffView.live-doc.dom.test.tsx
new file mode 100644
index 000000000..2537adecf
--- /dev/null
+++ b/packages/app/src/components/RenderedDiffView.live-doc.dom.test.tsx
@@ -0,0 +1,58 @@
+import { cleanup, render, waitFor } from '@testing-library/react';
+import { afterEach, describe, expect, test, vi } from 'vitest';
+
+const constructed: string[] = [];
+
+class FakeProvider {
+ constructor(opts: { name: string }) {
+ constructed.push(opts.name);
+ }
+ on() {}
+ off() {}
+ destroy() {}
+}
+
+vi.doMock('@hocuspocus/provider', () => ({ HocuspocusProvider: FakeProvider }));
+vi.doMock('@/lib/use-collab-url', () => ({
+ useCollabUrl: () => ({ collabUrl: 'ws://test/collab' }),
+}));
+
+const { computeRenderedDiff, RenderedDiffView } = await import('./RenderedDiffView');
+
+afterEach(() => {
+ cleanup();
+ constructed.length = 0;
+});
+
+async function mountDiff(before: string, after: string): Promise<HTMLElement> {
+ const diff = computeRenderedDiff(before, after);
+ if (!diff.ok) throw new Error(`engine returned not-ok: ${diff.reason}`);
+ render(<RenderedDiffView diff={diff} docName="notes" />);
+ return waitFor(() => {
+ const el = document.querySelector<HTMLElement>('[data-testid="rendered-diff-view"]');
+ if (!el?.querySelector('.ProseMirror')) throw new Error('editor not mounted yet');
+ return el;
+ });
+}
+
+describe('RenderedDiffView live documents', () => {
+ test.each([
+ ['Mirror', '<Mirror src="specs/shared-intro" />'],
+ ['Excalidraw', '<Excalidraw src="/boards/plan.excalidraw" />'],
+ ])('an inserted and a deleted %s open no live document', async (name, block) => {
+ const inserted = await mountDiff('Intro.', `Intro.\n\n${block}`);
+ await waitFor(() =>
+ expect(
+ inserted.querySelector(`.ok-diff-ins-block [data-component-name="${name}"] > *`),
+ ).toBeTruthy(),
+ );
+ cleanup();
+ const deleted = await mountDiff(`Intro.\n\n${block}`, 'Intro.');
+ await waitFor(() =>
+ expect(
+ deleted.querySelector(`[data-diff-deleted] [data-component-name="${name}"] > *`),
+ ).toBeTruthy(),
+ );
+ expect(constructed).toEqual([]);
+ });
+});
diff --git a/packages/app/src/components/RenderedDiffView.tsx b/packages/app/src/components/RenderedDiffView.tsx
index 7595895ed..c15e9d46a 100644
--- a/packages/app/src/components/RenderedDiffView.tsx
+++ b/packages/app/src/components/RenderedDiffView.tsx
@@ -14,6 +14,7 @@ import {
} from '@/lib/rendered-diff/build-rendered-diff';
import { buildDiffDecorations } from '@/lib/rendered-diff/diff-decorations';
import { diffExtensions } from '@/lib/rendered-diff/diff-extensions';
+import { renderDeletedJsxBlock } from '@/lib/rendered-diff/diff-jsx-block';
const diffSchema = getSchema(diffExtensions);
@@ -21,13 +22,24 @@ export function computeRenderedDiff(before: string, after: string): RenderedDiff
return buildRenderedDiff(before, after, diffSchema, getSharedMarkdownManager());
}
-const DiffDecorations = Extension.create<{ decorations: DecorationSet }>({
+const DiffDecorations = Extension.create<{ diff: RenderedDiff | null }>({
name: 'renderedDiffDecorations',
addOptions() {
- return { decorations: DecorationSet.empty };
+ return { diff: null };
},
addProseMirrorPlugins() {
- const decorations = this.options.decorations;
+ const { diff } = this.options;
+ const editor = this.editor;
+ const decorations = diff
+ ? buildDiffDecorations(
+ diff.afterDoc,
+ diff.beforeDoc,
+ diff.changes,
+ diff.markChanges,
+ diffSchema,
+ (node) => renderDeletedJsxBlock(editor, node),
+ )
+ : DecorationSet.empty;
return [
new Plugin({
key: new PluginKey('renderedDiffDecorations'),
@@ -38,20 +50,12 @@ const DiffDecorations = Extension.create<{ decorations: DecorationSet }>({
});
export function RenderedDiffView({ diff, docName }: { diff: RenderedDiff; docName: string }) {
- const decorations = buildDiffDecorations(
- diff.afterDoc,
- diff.beforeDoc,
- diff.changes,
- diff.markChanges,
- diffSchema,
- );
-
const editor = useEditor(
{
editable: false,
extensions: [
...scopeExtensionsToDocument(diffExtensions, docName),
- DiffDecorations.configure({ decorations }),
+ DiffDecorations.configure({ diff }),
],
content: diff.afterDoc.toJSON(),
onBeforeCreate: ({ editor }) => setEditorDocName(editor, docName),
@@ -78,7 +82,10 @@ export function RenderedDiffView({ diff, docName }: { diff: RenderedDiff; docNam
}, [portalTarget]);
return (
- <div className="editor-doc-scroll min-h-0 flex-1" data-testid="rendered-diff-view">
+ <div
+ className="ok-rendered-diff editor-doc-scroll min-h-0 flex-1"
+ data-testid="rendered-diff-view"
+ >
<div className="tiptap-editor">
<div ref={portalSlotRef} style={{ display: 'contents' }} />
</div>
diff --git a/packages/app/src/editor/components/ExcalidrawEmbed.tsx b/packages/app/src/editor/components/ExcalidrawEmbed.tsx
index 97c1cecd1..f71852d5d 100644
--- a/packages/app/src/editor/components/ExcalidrawEmbed.tsx
+++ b/packages/app/src/editor/components/ExcalidrawEmbed.tsx
@@ -57,6 +57,10 @@ export function boardDocNameFromSrc(
}
}
+export function isLiveBoardSrc(src: unknown): boolean {
+ return typeof src === 'string' && boardDocNameFromSrc(src) !== null;
+}
+
interface ExcalidrawEmbedProps {
src?: string;
title?: string;
diff --git a/packages/app/src/editor/components/live-doc-pool.dom.test.tsx b/packages/app/src/editor/components/live-doc-pool.dom.test.tsx
index 99b60e7d7..5319d2699 100644
--- a/packages/app/src/editor/components/live-doc-pool.dom.test.tsx
+++ b/packages/app/src/editor/components/live-doc-pool.dom.test.tsx
@@ -42,6 +42,7 @@ const {
LIVE_DOC_OBSERVE_DEBOUNCE_MS,
LIVE_DOC_POOL_MAX,
LIVE_DOC_SYNC_WATCHDOG_MS,
+ LiveDocAccessContext,
releaseLiveDocProvider,
useLiveDocText,
} = await import('./live-doc-pool.ts');
@@ -71,6 +72,17 @@ describe('useLiveDocText', () => {
vi.useRealTimers();
});
+ test('refuses to open a provider where live-document access is off', () => {
+ const { result } = renderHook(() => useLiveDocText('tests/board.excalidraw'), {
+ wrapper: ({ children }) => (
+ <LiveDocAccessContext value={false}>{children}</LiveDocAccessContext>
+ ),
+ });
+ expect(result.current).toEqual({ kind: 'loading' });
+ expect(FakeProvider.instances).toHaveLength(0);
+ expect(__liveDocPoolSize()).toBe(0);
+ });
+
test('maps sync-with-content to ready, and debounces live updates', async () => {
const { result } = renderHook(() => useLiveDocText('tests/board.excalidraw'));
expect(result.current).toEqual({ kind: 'loading' });
diff --git a/packages/app/src/editor/components/live-doc-pool.ts b/packages/app/src/editor/components/live-doc-pool.ts
index bc8770a0a..b10a9b568 100644
--- a/packages/app/src/editor/components/live-doc-pool.ts
+++ b/packages/app/src/editor/components/live-doc-pool.ts
@@ -1,5 +1,5 @@
import { HocuspocusProvider } from '@hocuspocus/provider';
-import { useEffect, useState } from 'react';
+import { createContext, use, useEffect, useState } from 'react';
import * as Y from 'yjs';
import { useCollabUrl } from '@/lib/use-collab-url';
import { isConfigDoc, isSystemDoc } from '../is-system-doc';
@@ -29,7 +29,17 @@ export const LIVE_DOC_SYNC_WATCHDOG_MS = 10_000;
export type AcquireLiveDocResult =
| { ok: true; entry: LiveDocPoolEntry }
- | { ok: false; reason: 'inadmissible' | 'at-capacity' };
+ | { ok: false; reason: 'inadmissible' | 'at-capacity' | 'refused' };
+
+export const LiveDocAccessContext = createContext(true);
+
+function refuseLiveDoc(): AcquireLiveDocResult {
+ return { ok: false, reason: 'refused' };
+}
+
+export function useLiveDocAcquirer(): (collabUrl: string, docName: string) => AcquireLiveDocResult {
+ return use(LiveDocAccessContext) ? acquireLiveDocProvider : refuseLiveDoc;
+}
export function acquireLiveDocProvider(collabUrl: string, docName: string): AcquireLiveDocResult {
if (isSystemDoc(docName) || isConfigDoc(docName)) return { ok: false, reason: 'inadmissible' };
@@ -124,8 +134,24 @@ function reuseIfSame(prev: LiveDocTextStatus, next: LiveDocTextStatus): LiveDocT
return prev;
}
+function refusedLiveDocTextStatus(
+ docName: string,
+ reason: Extract<AcquireLiveDocResult, { ok: false }>['reason'],
+): LiveDocTextStatus {
+ switch (reason) {
+ case 'at-capacity':
+ return { kind: 'at-capacity' };
+ case 'inadmissible':
+ return { kind: 'unreachable' };
+ case 'refused':
+ console.warn('[LiveDoc] live-document access is off here; refused', { docName });
+ return { kind: 'loading' };
+ }
+}
+
export function useLiveDocText(docName: string | null, retryToken = 0): LiveDocTextStatus {
const { collabUrl } = useCollabUrl();
+ const acquireLiveDoc = useLiveDocAcquirer();
const [status, setStatus] = useState<LiveDocTextStatus>({ kind: 'loading' });
useEffect(() => {
@@ -140,9 +166,9 @@ export function useLiveDocText(docName: string | null, retryToken = 0): LiveDocT
}
setStatus((prev) => reuseIfSame(prev, { kind: 'loading' }));
- const acquired = acquireLiveDocProvider(collabUrl, docName);
+ const acquired = acquireLiveDoc(collabUrl, docName);
if (!acquired.ok) {
- setStatus({ kind: acquired.reason === 'at-capacity' ? 'at-capacity' : 'unreachable' });
+ setStatus(refusedLiveDocTextStatus(docName, acquired.reason));
return;
}
const { entry } = acquired;
@@ -200,7 +226,7 @@ export function useLiveDocText(docName: string | null, retryToken = 0): LiveDocT
clearTimeout(watchdog);
releaseOnce();
};
- }, [collabUrl, docName, retryToken]);
+ }, [collabUrl, docName, retryToken, acquireLiveDoc]);
return status;
}
diff --git a/packages/app/src/editor/components/use-mirror-source.ts b/packages/app/src/editor/components/use-mirror-source.ts
index 27c8856ce..092f65d7c 100644
--- a/packages/app/src/editor/components/use-mirror-source.ts
+++ b/packages/app/src/editor/components/use-mirror-source.ts
@@ -3,10 +3,11 @@ import { useEffect, useRef, useState } from 'react';
import { useCollabUrl } from '@/lib/use-collab-url';
import { getSharedMarkdownManager } from '../utils/md-singleton.ts';
import {
- acquireLiveDocProvider,
+ type AcquireLiveDocResult,
LIVE_DOC_OBSERVE_DEBOUNCE_MS,
LIVE_DOC_SYNC_WATCHDOG_MS,
releaseLiveDocProvider,
+ useLiveDocAcquirer,
} from './live-doc-pool.ts';
interface MdxJsxAttrLike {
@@ -76,8 +77,22 @@ export function renderMirrorSubtree(node: MdxJsxFlowElementLike): string {
return mdastToHtml(synthRoot as any);
}
+function refusedMirrorStatus(
+ reason: Extract<AcquireLiveDocResult, { ok: false }>['reason'],
+): MirrorSourceStatus {
+ switch (reason) {
+ case 'at-capacity':
+ return { kind: 'at-capacity' };
+ case 'inadmissible':
+ return { kind: 'source-removed' };
+ case 'refused':
+ return { kind: 'loading' };
+ }
+}
+
export function useMirrorSource(src: string, anchor: string): MirrorSourceStatus {
const { collabUrl } = useCollabUrl();
+ const acquireLiveDoc = useLiveDocAcquirer();
const [status, setStatus] = useState<MirrorSourceStatus>({ kind: 'loading' });
const anchorRef = useRef(anchor);
const recomputeRef = useRef<(() => void) | null>(null);
@@ -92,15 +107,13 @@ export function useMirrorSource(src: string, anchor: string): MirrorSourceStatus
return;
}
- const acquired = acquireLiveDocProvider(collabUrl, src);
+ const acquired = acquireLiveDoc(collabUrl, src);
if (!acquired.ok) {
console.warn('[Mirror] live-doc pool refused subscription', {
src,
reason: acquired.reason,
});
- setStatus(
- acquired.reason === 'at-capacity' ? { kind: 'at-capacity' } : { kind: 'source-removed' },
- );
+ setStatus(refusedMirrorStatus(acquired.reason));
return;
}
const { entry } = acquired;
@@ -179,7 +192,7 @@ export function useMirrorSource(src: string, anchor: string): MirrorSourceStatus
recomputeRef.current = null;
releaseLiveDocProvider(collabUrl, src);
};
- }, [collabUrl, src]);
+ }, [collabUrl, src, acquireLiveDoc]);
useEffect(() => {
anchorRef.current = anchor;
diff --git a/packages/app/src/editor/extensions/JsxComponentView.test.ts b/packages/app/src/editor/extensions/JsxComponentView.test.ts
index 58f4b2f9a..54bf0d3cc 100644
--- a/packages/app/src/editor/extensions/JsxComponentView.test.ts
+++ b/packages/app/src/editor/extensions/JsxComponentView.test.ts
@@ -2,7 +2,8 @@ import { readFileSync } from 'node:fs';
import { dirname, join } from 'node:path';
import { fileURLToPath } from 'node:url';
import { describe, expect, test } from 'vitest';
-import { extractPrimitiveProps, getElementJsxAttrs, stableHash } from './JsxComponentView.tsx';
+import { getElementJsxAttrs, stableHash } from './JsxComponentView.tsx';
+import { extractPrimitiveProps } from './jsx-render-contract.ts';
function reactNodes(...names: string[]): ReadonlySet<string> {
return new Set(names);
diff --git a/packages/app/src/editor/extensions/JsxComponentView.tsx b/packages/app/src/editor/extensions/JsxComponentView.tsx
index 408b9076e..a019ceeca 100644
--- a/packages/app/src/editor/extensions/JsxComponentView.tsx
+++ b/packages/app/src/editor/extensions/JsxComponentView.tsx
@@ -13,7 +13,6 @@ import {
incrementJsxKeyboardDeleteFailed,
incrementJsxMoveFailed,
incrementJsxPopoverCloseRestoreFailed,
- incrementJsxRenderFailure,
incrementJsxStuckCopyFailed,
incrementJsxStuckDeleteFailed,
type JsxNodeAction,
@@ -48,12 +47,10 @@ import {
import { OPT_OUT_ATTR } from '../clipboard/index.ts';
import { CodePreviewEditModal } from '../components/CodePreviewEditModal';
import { DescriptorPlaceholder } from '../components/DescriptorPlaceholder.tsx';
-import { boardDocNameFromSrc } from '../components/ExcalidrawEmbed.tsx';
+import { isLiveBoardSrc } from '../components/ExcalidrawEmbed.tsx';
import { JsxComponentHostProvider } from '../components/jsx-host-context.tsx';
import { MermaidLightbox } from '../components/Mermaid';
import { PropPanel } from '../components/PropPanel.tsx';
-import { getEditorDocName } from '../extensions/doc-context.ts';
-import { normalizeDocRelativeMediaRenderProps } from '../extensions/media-render-props.ts';
import { getWrapperBridgeId } from '../extensions/selection-state-plugin.ts';
import { useBlockSelection } from '../hooks/use-block-selection.ts';
import { markUserTyping } from '../observers.ts';
@@ -68,16 +65,23 @@ import {
createChildNode,
focusInsertedComponent,
} from '../slash-command/component-items.tsx';
-import { ALIGNABLE_DESCRIPTOR_NAMES } from '../utils/alignable-descriptors.ts';
import { formatContainerAriaLabel } from '../utils/editor-strings.ts';
import { getEditorView } from '../utils/get-editor-view.ts';
import { reconstructSource } from '../utils/reconstruct-source.ts';
-import { sanitizeComponentProps } from '../utils/sanitize-url.ts';
import {
autonomousFragmentEditAllowed,
markAutonomousFragmentEdit,
} from './autonomous-fragment-edit.ts';
import { isSameJsxElement, resolveJsxNodeTarget } from './jsx-node-target.ts';
+import {
+ extractPrimitiveProps,
+ JSX_WRAPPER_CLASS,
+ jsxChildrenClassName,
+ jsxWrapperDataAttributes,
+ reportJsxRenderFailure,
+ resolveJsxRenderProps,
+ resolveJsxSourceDocName,
+} from './jsx-render-contract.ts';
interface ComponentErrorBoundaryProps {
children: ReactNode;
@@ -97,18 +101,7 @@ function ComponentErrorBoundary(props: ComponentErrorBoundaryProps) {
<ErrorBoundary
resetKeys={[resetKey]}
onError={(error, info) => {
- const err = error instanceof Error ? error : new Error(String(error));
- console.warn(
- JSON.stringify({
- event: 'jsx-render-failure',
- component: descriptorName,
- rawComponentName: String(rawComponentName ?? '').slice(0, 200),
- error: String(err),
- stack: info.componentStack,
- }),
- );
- incrementJsxRenderFailure(descriptorName);
- onError(err);
+ onError(reportJsxRenderFailure(descriptorName, rawComponentName, error, info));
}}
fallbackRender={(fbProps) => (
<ComponentErrorFallback {...fbProps}>{children}</ComponentErrorFallback>
@@ -131,19 +124,6 @@ export function stableHash(value: unknown): string {
return `{${entries.map(([k, v]) => `${JSON.stringify(k)}:${stableHash(v)}`).join(',')}}`;
}
-export function extractPrimitiveProps(
- attrs: Record<string, unknown>,
- reactNodeNames: ReadonlySet<string>,
-): Record<string, unknown> {
- const propsObj = (attrs.props ?? {}) as Record<string, unknown>;
- const result: Record<string, unknown> = {};
- for (const [key, value] of Object.entries(propsObj)) {
- if (reactNodeNames.has(key)) continue;
- result[key] = value;
- }
- return sanitizeComponentProps(result);
-}
-
interface ElementJsxAttrs extends Record<string, unknown> {
kind: 'element';
props: Record<string, unknown>;
@@ -218,8 +198,6 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
const isSelfClosingLeaf = !descriptor.hasChildren || !!descriptor.isSelfClosing;
- const isAlignable = ALIGNABLE_DESCRIPTOR_NAMES.has(descriptor.name);
-
const editableSource: { propName: string; language: 'mermaid' | 'latex' } | null =
descriptor.name === 'MermaidFence'
? { propName: 'chart', language: 'mermaid' }
@@ -258,17 +236,10 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
}, [selected, hasEditableProps, isSourceBearing, pos]);
const primitiveProps = extractPrimitiveProps(node.attrs, descriptor.reactNodePropNames);
- const translatedProps =
- descriptor.surface === 'compat' ? descriptor.translateProps(primitiveProps) : primitiveProps;
- const configuredDocName = (extension.options as { docName?: unknown }).docName;
- const sourceDocName =
- typeof configuredDocName === 'string' && configuredDocName
- ? configuredDocName
- : getEditorDocName(editor);
- const renderProps = normalizeDocRelativeMediaRenderProps(
- descriptor.name,
- translatedProps,
- sourceDocName,
+ const renderProps = resolveJsxRenderProps(
+ descriptor,
+ primitiveProps,
+ resolveJsxSourceDocName(extension.options, editor),
);
const lightboxRenderChart =
descriptor.name === 'MermaidFence' && typeof renderProps.chart === 'string'
@@ -280,10 +251,7 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
useEffect(() => {
if (!diagramExpandable) setDiagramLightboxOpen(false);
}, [diagramExpandable]);
- const boardExpandable =
- descriptor.name === 'Excalidraw' &&
- typeof renderProps.src === 'string' &&
- boardDocNameFromSrc(renderProps.src) !== null;
+ const boardExpandable = descriptor.name === 'Excalidraw' && isLiveBoardSrc(renderProps.src);
useEffect(() => {
if (!boardExpandable) setBoardLightboxOpen(false);
}, [boardExpandable]);
@@ -620,19 +588,8 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
return (
<Popover open={popoverOpen} onOpenChange={handleOpenChange}>
<NodeViewWrapper
- className="jsx-component-wrapper my-2"
- data-jsx-component=""
- data-component-type={descriptor.name.toLowerCase()}
- data-align={(() => {
- const rawAlign = currentProps.align;
- if (rawAlign === 'left' || rawAlign === 'right' || rawAlign === 'center') {
- return rawAlign;
- }
- if (isAlignable) {
- return 'center';
- }
- return undefined;
- })()}
+ className={JSX_WRAPPER_CLASS}
+ {...jsxWrapperDataAttributes(descriptor, currentProps)}
data-selected={isInnermostSelected ? 'true' : undefined}
data-has-child-selected={hasChildSelected ? 'true' : undefined}
data-range-selected={isRangeEncompassed ? 'true' : undefined}
@@ -645,7 +602,6 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
{...(!isChildOfComponent
? { 'data-drag-handle': '', draggable: 'true' }
: { draggable: 'false', onDragStart: (e: React.DragEvent) => e.preventDefault() })}
- data-component-name={descriptor.name}
onClick={handleBodyClick}
onKeyDown={handleKeyDown}
>
@@ -978,9 +934,7 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
: {})}
>
<NodeViewContent
- className={`component-children ${
- !descriptor.hasChildren && node.childCount === 0 ? 'min-h-0 m-0 p-0' : ''
- }`}
+ className={jsxChildrenClassName(descriptor, node)}
{...(!descriptor.hasChildren || descriptor.isSelfClosing
? { contentEditable: false }
: {})}
diff --git a/packages/app/src/editor/extensions/JsxInlineView.tsx b/packages/app/src/editor/extensions/JsxInlineView.tsx
index 17cacda68..c73264be7 100644
--- a/packages/app/src/editor/extensions/JsxInlineView.tsx
+++ b/packages/app/src/editor/extensions/JsxInlineView.tsx
@@ -9,8 +9,8 @@ import { Button } from '../../components/ui/button.tsx';
import { Popover, PopoverContent, PopoverTrigger } from '../../components/ui/popover.tsx';
import { PropPanel } from '../components/PropPanel.tsx';
import { getDescriptor } from '../registry/index.ts';
-import { getEditorDocName } from './doc-context.ts';
-import { extractPrimitiveProps, stableHash } from './JsxComponentView.tsx';
+import { stableHash } from './JsxComponentView.tsx';
+import { extractPrimitiveProps, resolveJsxSourceDocName } from './jsx-render-contract.ts';
import { normalizeDocRelativeMediaRenderProps } from './media-render-props.ts';
export function JsxInlineView(viewProps: NodeViewProps) {
@@ -46,15 +46,10 @@ function RegisteredInlineView({
if (typeof bodyText === 'string' && bodyText !== '') {
(primitiveProps as Record<string, unknown>).children = bodyText;
}
- const configuredDocName = (extension.options as { docName?: unknown }).docName;
- const sourceDocName =
- typeof configuredDocName === 'string' && configuredDocName
- ? configuredDocName
- : getEditorDocName(editor);
const renderProps = normalizeDocRelativeMediaRenderProps(
descriptor.name,
primitiveProps,
- sourceDocName,
+ resolveJsxSourceDocName(extension.options, editor),
);
const resetKey = `${descriptor.name}::${stableHash(primitiveProps)}`;
diff --git a/packages/app/src/editor/extensions/jsx-render-contract.ts b/packages/app/src/editor/extensions/jsx-render-contract.ts
new file mode 100644
index 000000000..726d1028e
--- /dev/null
+++ b/packages/app/src/editor/extensions/jsx-render-contract.ts
@@ -0,0 +1,88 @@
+import { incrementJsxRenderFailure } from '@inkeep/open-knowledge-core/metrics/parse-health';
+import type { Editor } from '@tiptap/core';
+import type { Node as PmNode } from '@tiptap/pm/model';
+import type { ErrorInfo } from 'react';
+import type { JsxComponentDescriptor } from '../registry/types.ts';
+import { ALIGNABLE_DESCRIPTOR_NAMES } from '../utils/alignable-descriptors.ts';
+import { sanitizeComponentProps } from '../utils/sanitize-url.ts';
+import { getEditorDocName } from './doc-context.ts';
+import { normalizeDocRelativeMediaRenderProps } from './media-render-props.ts';
+
+export const JSX_WRAPPER_CLASS = 'jsx-component-wrapper my-2';
+
+export function extractPrimitiveProps(
+ attrs: Record<string, unknown>,
+ reactNodeNames: ReadonlySet<string>,
+): Record<string, unknown> {
+ const propsObj = (attrs.props ?? {}) as Record<string, unknown>;
+ const result: Record<string, unknown> = {};
+ for (const [key, value] of Object.entries(propsObj)) {
+ if (reactNodeNames.has(key)) continue;
+ result[key] = value;
+ }
+ return sanitizeComponentProps(result);
+}
+
+export function resolveJsxSourceDocName(extensionOptions: unknown, editor: Editor): string | null {
+ const configuredDocName = (extensionOptions as { docName?: unknown }).docName;
+ return typeof configuredDocName === 'string' && configuredDocName
+ ? configuredDocName
+ : getEditorDocName(editor);
+}
+
+export function resolveJsxRenderProps(
+ descriptor: JsxComponentDescriptor,
+ primitiveProps: Record<string, unknown>,
+ sourceDocName: string | null,
+): Record<string, unknown> {
+ const translatedProps =
+ descriptor.surface === 'compat' ? descriptor.translateProps(primitiveProps) : primitiveProps;
+ return normalizeDocRelativeMediaRenderProps(descriptor.name, translatedProps, sourceDocName);
+}
+
+function resolveJsxAlign(
+ descriptor: JsxComponentDescriptor,
+ props: Record<string, unknown>,
+): 'left' | 'right' | 'center' | undefined {
+ const rawAlign = props.align;
+ if (rawAlign === 'left' || rawAlign === 'right' || rawAlign === 'center') return rawAlign;
+ return ALIGNABLE_DESCRIPTOR_NAMES.has(descriptor.name) ? 'center' : undefined;
+}
+
+export function jsxWrapperDataAttributes(
+ descriptor: JsxComponentDescriptor,
+ props: Record<string, unknown>,
+) {
+ return {
+ 'data-jsx-component': '',
+ 'data-component-type': descriptor.name.toLowerCase(),
+ 'data-component-name': descriptor.name,
+ 'data-align': resolveJsxAlign(descriptor, props),
+ };
+}
+
+export function jsxChildrenClassName(descriptor: JsxComponentDescriptor, node: PmNode): string {
+ return !descriptor.hasChildren && node.childCount === 0
+ ? 'component-children min-h-0 m-0 p-0'
+ : 'component-children';
+}
+
+export function reportJsxRenderFailure(
+ descriptorName: string,
+ rawComponentName: unknown,
+ error: unknown,
+ info: ErrorInfo,
+): Error {
+ const err = error instanceof Error ? error : new Error(String(error));
+ console.warn(
+ JSON.stringify({
+ event: 'jsx-render-failure',
+ component: descriptorName,
+ rawComponentName: String(rawComponentName ?? '').slice(0, 200),
+ error: String(err),
+ stack: info.componentStack,
+ }),
+ );
+ incrementJsxRenderFailure(descriptorName);
+ return err;
+}
diff --git a/packages/app/src/globals.css b/packages/app/src/globals.css
index d5de3405a..76a5d0d2e 100644
--- a/packages/app/src/globals.css
+++ b/packages/app/src/globals.css
@@ -6525,6 +6525,27 @@ html.electron-mode [data-slot="sidebar-inner"] {
cursor: default;
}
+.ok-rendered-diff .tabs-strip {
+ display: none;
+}
+
+.ok-rendered-diff
+ .tabs-content
+ > .component-children
+ > [data-node-view-content-react]
+ > .react-renderer {
+ display: block;
+}
+
+.ok-rendered-diff .tab-panel[data-tab-label]::before {
+ content: attr(data-tab-label);
+ display: block;
+ margin-bottom: 0.25rem;
+ font-size: 0.875rem;
+ font-weight: 600;
+ color: var(--foreground);
+}
+
/* Mermaid WYSIWYG canvas (`mermaid-wysiwyg` package). The package injects its
own `<style data-mw>` at runtime with `--mw-*` custom-property hooks for all
interaction chrome (selection glow, popovers, in-place editors, plus-menus).
diff --git a/packages/app/src/lib/rendered-diff/diff-decorations.ts b/packages/app/src/lib/rendered-diff/diff-decorations.ts
index 5c4439acf..6ac74d86c 100644
--- a/packages/app/src/lib/rendered-diff/diff-decorations.ts
+++ b/packages/app/src/lib/rendered-diff/diff-decorations.ts
@@ -1,6 +1,9 @@
import { DOMSerializer, type Fragment, type Node as PMNode, type Schema } from '@tiptap/pm/model';
import { Decoration, DecorationSet } from '@tiptap/pm/view';
import type { MarkChange, SpanChange } from './build-rendered-diff';
+import type { RenderedJsxBlock } from './diff-jsx-block';
+
+export type JsxBlockRenderer = (node: PMNode) => RenderedJsxBlock;
export const RENDERED_DIFF_CHANGE_SELECTOR =
'.ok-diff-ins, .ok-diff-ins-block, [data-diff-deleted]';
@@ -48,26 +51,71 @@ function buildDeletedWidget(
return host;
}
+const widgetCleanups = new WeakMap<Node, Array<() => void>>();
+
+function widgetSerializer(
+ schema: Schema,
+ renderJsxBlock: JsxBlockRenderer,
+ cleanups: Array<() => void>,
+): DOMSerializer {
+ const base = DOMSerializer.fromSchema(schema);
+ return new DOMSerializer(
+ {
+ ...base.nodes,
+ jsxComponent: (node) => {
+ const block = renderJsxBlock(node);
+ cleanups.push(block.destroy);
+ return { dom: block.dom, contentDOM: block.contentDOM };
+ },
+ },
+ base.marks,
+ );
+}
+
+function deletedWidget(
+ pos: number,
+ content: Fragment,
+ schema: Schema,
+ renderJsxBlock: JsxBlockRenderer,
+): Decoration {
+ const isBlock = fragmentHasBlock(content);
+ return Decoration.widget(
+ pos,
+ () => {
+ const cleanups: Array<() => void> = [];
+ const dom = buildDeletedWidget(
+ widgetSerializer(schema, renderJsxBlock, cleanups),
+ content,
+ isBlock,
+ );
+ widgetCleanups.set(dom, cleanups);
+ return dom;
+ },
+ {
+ side: -1,
+ ignoreSelection: true,
+ marks: [],
+ destroy: (dom) => {
+ for (const cleanup of widgetCleanups.get(dom) ?? []) cleanup();
+ widgetCleanups.delete(dom);
+ },
+ },
+ );
+}
+
export function buildDiffDecorations(
afterDoc: PMNode,
beforeDoc: PMNode,
changes: readonly SpanChange[],
markChanges: readonly MarkChange[],
schema: Schema,
+ renderJsxBlock: JsxBlockRenderer,
): DecorationSet {
- const serializer = DOMSerializer.fromSchema(schema);
const decorations: Decoration[] = [];
for (const mark of markChanges) {
const slice = beforeDoc.slice(mark.fromA, mark.toA);
- const isBlock = fragmentHasBlock(slice.content);
- decorations.push(
- Decoration.widget(mark.fromB, () => buildDeletedWidget(serializer, slice.content, isBlock), {
- side: -1,
- ignoreSelection: true,
- marks: [],
- }),
- );
+ decorations.push(deletedWidget(mark.fromB, slice.content, schema, renderJsxBlock));
decorations.push(
Decoration.inline(mark.fromB, mark.toB, { class: 'ok-diff-ins' }, { inclusiveEnd: true }),
);
@@ -79,14 +127,7 @@ export function buildDiffDecorations(
}
if (change.toA > change.fromA) {
const slice = beforeDoc.slice(change.fromA, change.toA);
- const isBlock = fragmentHasBlock(slice.content);
- decorations.push(
- Decoration.widget(
- change.fromB,
- () => buildDeletedWidget(serializer, slice.content, isBlock),
- { side: -1, ignoreSelection: true, marks: [] },
- ),
- );
+ decorations.push(deletedWidget(change.fromB, slice.content, schema, renderJsxBlock));
}
}
diff --git a/packages/app/src/lib/rendered-diff/diff-extensions.ts b/packages/app/src/lib/rendered-diff/diff-extensions.ts
index 7a273bb3b..76af53aa1 100644
--- a/packages/app/src/lib/rendered-diff/diff-extensions.ts
+++ b/packages/app/src/lib/rendered-diff/diff-extensions.ts
@@ -1,6 +1,6 @@
-import { JsxComponent as CoreJsxComponent } from '@inkeep/open-knowledge-core/extensions/jsx-component';
import type { Extensions } from '@tiptap/core';
import { sharedExtensions } from '@/editor/extensions/shared';
+import { DiffJsxComponent } from './diff-jsx-block';
const DROP_NAMES = new Set([
'slashCommand',
@@ -20,4 +20,4 @@ const DROP_NAMES = new Set([
export const diffExtensions: Extensions = sharedExtensions
.filter((ext) => !DROP_NAMES.has(ext.name))
- .map((ext) => (ext.name === 'jsxComponent' ? CoreJsxComponent : ext));
+ .map((ext) => (ext.name === 'jsxComponent' ? DiffJsxComponent : ext));
diff --git a/packages/app/src/lib/rendered-diff/diff-jsx-block.tsx b/packages/app/src/lib/rendered-diff/diff-jsx-block.tsx
new file mode 100644
index 000000000..ea194eaf9
--- /dev/null
+++ b/packages/app/src/lib/rendered-diff/diff-jsx-block.tsx
@@ -0,0 +1,237 @@
+import { useLingui } from '@lingui/react/macro';
+import type { Editor } from '@tiptap/core';
+import type { Node as PMNode } from '@tiptap/pm/model';
+import {
+ NodeViewContent,
+ type NodeViewProps,
+ NodeViewWrapper,
+ ReactNodeViewRenderer,
+ ReactRenderer,
+} from '@tiptap/react';
+import type { ReactNode } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+import { isLiveBoardSrc } from '@/editor/components/ExcalidrawEmbed';
+import { JsxComponentHostProvider } from '@/editor/components/jsx-host-context';
+import { LiveDocAccessContext } from '@/editor/components/live-doc-pool';
+import { getEditorDocName } from '@/editor/extensions/doc-context';
+import { JsxComponent } from '@/editor/extensions/jsx-component';
+import {
+ extractPrimitiveProps,
+ JSX_WRAPPER_CLASS,
+ jsxChildrenClassName,
+ jsxWrapperDataAttributes,
+ reportJsxRenderFailure,
+ resolveJsxRenderProps,
+ resolveJsxSourceDocName,
+} from '@/editor/extensions/jsx-render-contract';
+import { getDescriptor } from '@/editor/registry';
+import {
+ resolveDescriptorPlaceholder,
+ shouldRenderPlaceholder,
+} from '@/editor/registry/resolve-descriptor-placeholder';
+import type { JsxComponentDescriptor } from '@/editor/registry/types';
+import { reconstructSource } from '@/editor/utils/reconstruct-source';
+
+export interface RenderedJsxBlock {
+ dom: HTMLElement;
+ contentDOM: HTMLElement;
+ destroy: () => void;
+}
+
+function nodeProps(node: PMNode): Record<string, unknown> {
+ return (node.attrs.props as Record<string, unknown> | null) ?? {};
+}
+
+function opensLiveDocument(
+ descriptor: JsxComponentDescriptor,
+ renderProps: Record<string, unknown>,
+): boolean {
+ if (descriptor.name === 'Mirror') return true;
+ return descriptor.name === 'Excalidraw' && isLiveBoardSrc(renderProps.src);
+}
+
+function referenceTarget(renderProps: Record<string, unknown>): string {
+ const src = typeof renderProps.src === 'string' ? renderProps.src : '';
+ const anchor = typeof renderProps.anchor === 'string' ? renderProps.anchor : '';
+ return anchor ? `${src}#${anchor}` : src;
+}
+
+function diffRenderProps(
+ descriptor: JsxComponentDescriptor,
+ renderProps: Record<string, unknown>,
+): Record<string, unknown> {
+ const propNames = new Set(descriptor.props.map((p) => p.name));
+ return {
+ ...renderProps,
+ ...(propNames.has('defaultOpen') ? { defaultOpen: true } : {}),
+ ...(propNames.has('autoplay') ? { autoplay: false } : {}),
+ ...(propNames.has('loop') ? { loop: false } : {}),
+ ...(propNames.has('controls') ? { controls: true } : {}),
+ };
+}
+
+function wrapperAttributes(node: PMNode) {
+ return {
+ className: JSX_WRAPPER_CLASS,
+ ...jsxWrapperDataAttributes(getDescriptor(node.attrs.componentName as string), nodeProps(node)),
+ };
+}
+
+function openingTag(node: PMNode): string {
+ const lines = reconstructSource(node).split('\n');
+ const end = lines.findIndex((line) => line.trimEnd().endsWith('>'));
+ return lines.slice(0, end + 1).join('\n');
+}
+
+function FallbackBlock({
+ node,
+ heading,
+ children,
+}: {
+ node: PMNode;
+ heading: ReactNode;
+ children: ReactNode;
+}) {
+ return (
+ <div data-diff-jsx-source="">
+ <div className="flex gap-2 text-xs font-mono text-foreground px-2 py-1">{heading}</div>
+ {node.childCount > 0 ? (
+ <>
+ <code className="block whitespace-pre-wrap px-2 text-xs text-foreground">
+ {openingTag(node)}
+ </code>
+ {children}
+ </>
+ ) : (
+ <pre className="overflow-x-auto rounded-md bg-muted px-3 py-2 text-sm">
+ <code>{reconstructSource(node)}</code>
+ </pre>
+ )}
+ </div>
+ );
+}
+
+function DiffJsxBlock({
+ node,
+ docName,
+ children,
+}: {
+ node: PMNode;
+ docName: string | null;
+ children: ReactNode;
+}) {
+ const { t } = useLingui();
+ const unregisteredComponentName = String(node.attrs.componentName ?? '');
+ const descriptor = getDescriptor(unregisteredComponentName);
+ const label = descriptor.displayName ?? descriptor.name;
+
+ if (descriptor.name === '*') {
+ return (
+ <FallbackBlock node={node} heading={t`Unknown component: ${unregisteredComponentName}`}>
+ {children}
+ </FallbackBlock>
+ );
+ }
+
+ const primitiveProps = extractPrimitiveProps(node.attrs, descriptor.reactNodePropNames);
+ const renderProps = resolveJsxRenderProps(descriptor, primitiveProps, docName);
+
+ if (
+ shouldRenderPlaceholder(descriptor, nodeProps(node)) ||
+ opensLiveDocument(descriptor, renderProps)
+ ) {
+ const { Icon } = resolveDescriptorPlaceholder(descriptor);
+ const target = referenceTarget(renderProps);
+ return (
+ <>
+ <div
+ data-diff-jsx-reference=""
+ className="flex items-center gap-2 rounded-md border border-dashed border-border px-3 py-2 text-sm text-foreground"
+ >
+ <Icon size={16} aria-hidden="true" />
+ <span>{label}</span>
+ {target ? <code className="truncate">{target}</code> : null}
+ </div>
+ {node.childCount > 0 ? children : null}
+ </>
+ );
+ }
+
+ const Comp = descriptor.Component;
+ return (
+ <ErrorBoundary
+ onError={(error, info) => {
+ reportJsxRenderFailure(descriptor.name, unregisteredComponentName, error, info);
+ }}
+ fallbackRender={() => (
+ <FallbackBlock
+ node={node}
+ heading={
+ <>
+ <span>{label}</span>
+ <span>{t`render error`}</span>
+ </>
+ }
+ >
+ {children}
+ </FallbackBlock>
+ )}
+ >
+ <LiveDocAccessContext value={false}>
+ <JsxComponentHostProvider value={null}>
+ <Comp {...diffRenderProps(descriptor, renderProps)}>{children}</Comp>
+ </JsxComponentHostProvider>
+ </LiveDocAccessContext>
+ </ErrorBoundary>
+ );
+}
+
+function DiffJsxComponentView({ node, editor, extension }: NodeViewProps) {
+ const descriptor = getDescriptor(node.attrs.componentName as string);
+ return (
+ <NodeViewWrapper {...wrapperAttributes(node)}>
+ <DiffJsxBlock node={node} docName={resolveJsxSourceDocName(extension.options, editor)}>
+ <NodeViewContent className={jsxChildrenClassName(descriptor, node)} />
+ </DiffJsxBlock>
+ </NodeViewWrapper>
+ );
+}
+
+export const DiffJsxComponent = JsxComponent.extend({
+ addNodeView() {
+ return ReactNodeViewRenderer(DiffJsxComponentView);
+ },
+});
+
+function DeletedJsxBlock({
+ node,
+ docName,
+ contentDOM,
+}: {
+ node: PMNode;
+ docName: string | null;
+ contentDOM: HTMLElement;
+}) {
+ return (
+ <div {...wrapperAttributes(node)}>
+ <DiffJsxBlock node={node} docName={docName}>
+ <div
+ className={jsxChildrenClassName(getDescriptor(node.attrs.componentName as string), node)}
+ ref={(host) => {
+ if (host && contentDOM.parentNode !== host) host.appendChild(contentDOM);
+ }}
+ />
+ </DiffJsxBlock>
+ </div>
+ );
+}
+
+export function renderDeletedJsxBlock(editor: Editor, node: PMNode): RenderedJsxBlock {
+ const contentDOM = document.createElement('div');
+ contentDOM.setAttribute('data-node-view-content-react', '');
+ const renderer = new ReactRenderer(DeletedJsxBlock, {
+ editor,
+ props: { node, docName: getEditorDocName(editor), contentDOM },
+ });
+ return { dom: renderer.element, contentDOM, destroy: () => renderer.destroy() };
+}
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index 6d09149e9..2bfb883bd 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "تغيّر إعادة التسمية الملف على القرص والمعرّف الذي يستخدمه الوكلاء لاختيار هذا القالب."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "خطأ في العرض"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "مكوّن غير معروف: {componentName} — يمكن تحرير المصدر أدناه"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "مكوّن غير معروف: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index c188a402f..9bbcfbc2a 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -12218,6 +12218,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "নাম বদলালে ডিস্কের ফাইল এবং এজেন্টরা এই টেমপ্লেটটি বাছতে যে id ব্যবহার করে দুটোই বদলে যায়।"
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "রেন্ডার ত্রুটি"
@@ -16242,6 +16243,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "অজানা কম্পোনেন্ট: {componentName} — সোর্স নিচে সম্পাদনাযোগ্য"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "অজানা কম্পোনেন্ট: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index fb0de971e..178bbe2e8 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "Renaming changes the file on disk and the id agents use to pick this template."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "render error"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "Unknown component: {componentName} — source editable below"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "Unknown component: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 982c4dcd1..26ffc71d0 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "Renombrarlo cambia el archivo en el disco y el id con el que los agentes eligen esta plantilla."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "error de renderizado"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "Componente desconocido: {componentName}; el código se puede editar abajo"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "Componente desconocido: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index a225844b6..40c5f47c4 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "Renommer modifie le fichier sur le disque ainsi que l'id que les agents utilisent pour choisir ce modèle."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "erreur de rendu"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "Composant inconnu : {componentName} — source modifiable ci-dessous"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "Composant inconnu : {unregisteredComponentName}"
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index 786400f48..ba05b8cac 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -12218,6 +12218,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "नाम बदलने पर डिस्क की फ़ाइल और वह id दोनों बदल जाते हैं जिससे एजेंट यह टेम्पलेट चुनते हैं।"
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "रेंडर त्रुटि"
@@ -16242,6 +16243,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "अज्ञात कंपोनेंट: {componentName} — स्रोत नीचे संपादन योग्य"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "अज्ञात कंपोनेंट: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index 479dec029..c3c5a3e12 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -12218,6 +12218,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "Mengganti nama mengubah berkas di disk dan id yang dipakai agen untuk memilih templat ini."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "galat render"
@@ -16242,6 +16243,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "Komponen tidak dikenal: {componentName} — sumber bisa disunting di bawah"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "Komponen tidak dikenal: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 3988cb300..e0a2f4b49 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "이름을 바꾸면 디스크의 파일과 에이전트가 이 템플릿을 선택할 때 사용하는 ID가 변경됩니다."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "렌더링 오류"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "알 수 없는 컴포넌트: {componentName}, 아래에서 소스를 편집할 수 있습니다"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "알 수 없는 컴포넌트: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/pl/messages.po b/packages/app/src/locales/pl/messages.po
index ffe46b74a..9bf27fd0d 100644
--- a/packages/app/src/locales/pl/messages.po
+++ b/packages/app/src/locales/pl/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "Zmiana nazwy zmienia plik na dysku oraz identyfikator, którego agenci używają do wyboru tego szablonu."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "błąd renderowania"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "Nieznany komponent: {componentName} — źródło można edytować poniżej"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "Nieznany komponent: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index 4b4c3a790..da6373280 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -12218,6 +12218,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr ""
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr ""
@@ -16242,6 +16243,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr ""
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr ""
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index f485f1ab8..c3ded21b4 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -12218,6 +12218,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "Renomear muda o arquivo no disco e o id que os agentes usam para escolher este modelo."
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "erro de renderização"
@@ -16242,6 +16243,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "Componente desconhecido: {componentName} — código editável abaixo"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "Componente desconhecido: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index 685e89609..791119ab6 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "نام بدلنے سے ڈسک پر فائل اور وہ شناخت بدل جاتی ہے جو ایجنٹس یہ ٹیمپلیٹ منتخب کرنے کے لیے استعمال کرتے ہیں۔"
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "رینڈر کی خرابی"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "نامعلوم جزو: {componentName} — سورس نیچے قابلِ ترمیم ہے"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "نامعلوم جزو: {unregisteredComponentName}"
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index b0e45c597..115015ab9 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "重命名会改变磁盘上的文件,以及智能体选择这个模板时使用的 id。"
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "渲染错误"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "未知组件:{componentName}——可在下方编辑源码"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "未知组件:{unregisteredComponentName}"
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index 93720fb7d..782d0a1c4 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -12222,6 +12222,7 @@ msgid "Renaming changes the file on disk and the id agents use to pick this temp
msgstr "重新命名會改變磁碟上的檔案,以及代理挑選這個範本時使用的 id。"
#: src/editor/utils/severity.ts
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "render error"
msgstr "算繪錯誤"
@@ -16246,6 +16247,7 @@ msgid "Unknown component: {componentName} — source editable below"
msgstr "未知的元件:{componentName}——可在下方編輯原始碼"
#: src/editor/extensions/RawMdxFallbackCMView.tsx
+#: src/lib/rendered-diff/diff-jsx-block.tsx
msgid "Unknown component: {unregisteredComponentName}"
msgstr "未知的元件:{unregisteredComponentName}"