Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Prevent document corruption during JSX fallback conversion (#4638)

Dimitri POSTOLOV2a59fb603286
diff --git a/.changeset/preserve-unknown-component-neighbors.md b/.changeset/preserve-unknown-component-neighbors.md
new file mode 100644
index 000000000..bf6f74bf6
--- /dev/null
+++ b/.changeset/preserve-unknown-component-neighbors.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+Prevent opening documents with multiple unsupported components from corrupting nearby content. This fix does not restore text lost in earlier releases; after updating, use the [Timeline](https://openknowledge.ai/docs/features/timeline-and-recovery) to compare affected documents with older versions and restore an intact version if available.
diff --git a/packages/app/src/editor/extensions/JsxComponentView.ask-ai.dom.test.tsx b/packages/app/src/editor/extensions/JsxComponentView.ask-ai.dom.test.tsx
index 32c27ac3d..8feef3ae7 100644
--- a/packages/app/src/editor/extensions/JsxComponentView.ask-ai.dom.test.tsx
+++ b/packages/app/src/editor/extensions/JsxComponentView.ask-ai.dom.test.tsx
@@ -1,4 +1,6 @@
+import { sharedExtensions } from '@inkeep/open-knowledge-core';
import { cleanup, fireEvent, render, waitFor } from '@testing-library/react';
+import { getSchema } from '@tiptap/core';
import type { NodeViewProps } from '@tiptap/react';
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
@@ -41,6 +43,22 @@ function makeProps({
noPos = false,
freshlyInserted = false,
}: Overrides = {}) {
+ const schema = getSchema(sharedExtensions);
+ const node = schema.nodes.jsxComponent.create(
+ {
+ componentName: 'MermaidFence',
+ kind: 'element',
+ attributes: [{ type: 'mdxJsxAttribute', name: 'chart', value: 'graph TD;' }],
+ props: freshlyInserted ? { chart: '' } : { chart: 'graph TD;' },
+ sourceRaw: freshlyInserted ? '' : '```mermaid\ngraph TD;\n```',
+ sourceDirty: freshlyInserted,
+ },
+ contentSize > 0 ? schema.nodes.paragraph.create(null, schema.text('body')) : [],
+ );
+ const doc = schema.node('doc', null, [
+ schema.nodes.paragraph.create(null, schema.text('abc')),
+ node,
+ ]);
return {
editor: {
isEditable: true,
@@ -53,23 +71,11 @@ function makeProps({
nodeSelections.push(p);
},
},
- state: { doc: { resolve: () => ({ depth: 0 }) }, selection: { from: 0, to: 0 } },
+ state: { doc, selection: { from: 0, to: 0 } },
on: () => {},
off: () => {},
},
- node: {
- type: { name: 'jsxComponent' },
- attrs: {
- componentName: 'MermaidFence',
- kind: 'element',
- attributes: [{ type: 'mdxJsxAttribute', name: 'chart', value: 'graph TD;' }],
- props: freshlyInserted ? { chart: '' } : { chart: 'graph TD;' },
- sourceRaw: freshlyInserted ? '' : '```mermaid\ngraph TD;\n```',
- sourceDirty: freshlyInserted,
- },
- content: { size: contentSize },
- nodeSize: 2,
- },
+ node,
getPos: noPos ? undefined : () => 5,
selected: true,
updateAttributes: () => {},
diff --git a/packages/app/src/editor/extensions/JsxComponentView.auto-convert.dom.test.tsx b/packages/app/src/editor/extensions/JsxComponentView.auto-convert.dom.test.tsx
new file mode 100644
index 000000000..7e9eaf837
--- /dev/null
+++ b/packages/app/src/editor/extensions/JsxComponentView.auto-convert.dom.test.tsx
@@ -0,0 +1,334 @@
+import {
+ getParseHealth,
+ MarkdownManager,
+ resetParseHealth,
+ sharedExtensions,
+} from '@inkeep/open-knowledge-core';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import type { Editor } from '@tiptap/core';
+import { EditorContent, useEditor } from '@tiptap/react';
+import { StrictMode, useEffect, useState } from 'react';
+import { createPortal } from 'react-dom';
+import { Toaster, toast } from 'sonner';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { JsxComponent } from './jsx-component';
+import { SelectionStatePlugin } from './selection-state-plugin';
+import { SourceDirtyObserver } from './source-dirty-observer';
+
+const manager = new MarkdownManager({ extensions: sharedExtensions });
+const extensions = [
+ ...sharedExtensions.map((extension) =>
+ extension.name === 'jsxComponent' ? JsxComponent : extension,
+ ),
+ SourceDirtyObserver,
+ SelectionStatePlugin,
+];
+
+function Host({ source, onEditor }: { source: string; onEditor: (editor: Editor) => void }) {
+ const editor = useEditor({
+ extensions,
+ content: manager.parse(source),
+ immediatelyRender: false,
+ onCreate: ({ editor: createdEditor }) => onEditor(createdEditor),
+ });
+ const [target] = useState(() => document.createElement('div'));
+ useEffect(() => {
+ document.body.appendChild(target);
+ return () => target.remove();
+ }, [target]);
+ return createPortal(
+ // oxlint-disable-next-line ok/no-unportaled-editor-content -- Each test editor owns its portal target.
+ <EditorContent editor={editor} />,
+ target,
+ );
+}
+
+async function mountEditor(source: string): Promise<Editor> {
+ let editor: Editor | undefined;
+ render(
+ <StrictMode>
+ <Host
+ source={source}
+ onEditor={(value) => {
+ editor = value;
+ }}
+ />
+ <Toaster />
+ </StrictMode>,
+ );
+ await waitFor(() => expect(editor).toBeDefined());
+ if (!editor) throw new Error('editor not mounted');
+ return editor;
+}
+
+beforeEach(() => {
+ expect(document.querySelector('.ProseMirror')).toBeNull();
+ resetParseHealth();
+});
+
+afterEach(() => {
+ toast.dismiss();
+ vi.useRealTimers();
+});
+
+describe('unknown component conversion', () => {
+ test.each([
+ {
+ name: 'adjacent components that expand when converted to source',
+ blocks: [
+ '<Badge>\nDefault\n</Badge>',
+ '<Badge variant="accent">\nPreview\n</Badge>',
+ '<Badge variant="success">\nStable\n</Badge>',
+ ],
+ },
+ {
+ name: 'nested components and their following siblings',
+ blocks: [
+ '<CardGroup cols={2}>\n<Card title="Quick start">\nFirst page.\n</Card>\n<Card title="Components">\nUseful documentation.\n</Card>\n</CardGroup>',
+ '<Icon icon="book-open" size={32} />',
+ ],
+ },
+ ])('preserves all source bytes for $name', async ({ blocks }) => {
+ const source = `# Before\n\n${blocks.join('\n\n')}\n\n## After\n\nKeep this paragraph.\n`;
+ const editor = await mountEditor(source);
+
+ await waitFor(() => {
+ const fallbacks: string[] = [];
+ editor.state.doc.descendants((node) => {
+ if (node.type.name === 'rawMdxFallback') fallbacks.push(node.textContent);
+ });
+ expect(fallbacks).toEqual(blocks);
+ });
+ expect(manager.serialize(editor.getJSON())).toBe(source);
+ });
+
+ test('converts a value-equal replacement while its node view is reused', async () => {
+ vi.useFakeTimers({ toFake: ['requestAnimationFrame', 'cancelAnimationFrame'] });
+ const source = '<Badge>\nDefault\n</Badge>\n';
+ const editor = await mountEditor(source);
+ const original = editor.state.doc.child(0);
+ const replacement = editor.schema.nodeFromJSON(original.toJSON());
+ expect(replacement).not.toBe(original);
+ expect(replacement.eq(original)).toBe(true);
+
+ act(() => {
+ editor.view.dispatch(editor.state.tr.replaceWith(0, original.nodeSize, replacement));
+ });
+ expect(editor.state.doc.child(0)).toBe(replacement);
+ act(() => vi.advanceTimersToNextFrame());
+
+ expect(editor.state.doc.child(0).type.name).toBe('rawMdxFallback');
+ expect(manager.serialize(editor.getJSON())).toBe(source);
+ });
+
+ test('converts the latest source when the node changes before the scheduled frame', async () => {
+ vi.useFakeTimers({ toFake: ['requestAnimationFrame', 'cancelAnimationFrame'] });
+ const editor = await mountEditor('<Badge>\nDefault\n</Badge>\n');
+ const replacement = editor.schema
+ .nodeFromJSON(manager.parse('<Badge>\nUpdated\n</Badge>\n'))
+ .child(0);
+
+ act(() => {
+ editor.view.dispatch(
+ editor.state.tr.replaceWith(0, editor.state.doc.child(0).nodeSize, replacement),
+ );
+ vi.advanceTimersToNextFrame();
+ });
+ const edited = manager.serialize(editor.getJSON());
+ act(() => vi.advanceTimersToNextFrame());
+
+ expect(editor.state.doc.child(0).type.name).toBe('rawMdxFallback');
+ expect(editor.state.doc.child(0).textContent).toContain('Updated');
+ expect(manager.serialize(editor.getJSON())).toBe(edited);
+ expect(getParseHealth().jsxAutoConvertFailed).toEqual({});
+ expect(getParseHealth().jsxActionAborted).toEqual({});
+ });
+
+ test('does not restore a node deleted before the scheduled frame', async () => {
+ vi.useFakeTimers({ toFake: ['requestAnimationFrame', 'cancelAnimationFrame'] });
+ const editor = await mountEditor('<Badge>\nDefault\n</Badge>\n\nKeep this paragraph.\n');
+
+ act(() => {
+ editor.view.dispatch(editor.state.tr.delete(0, editor.state.doc.child(0).nodeSize));
+ vi.advanceTimersToNextFrame();
+ });
+
+ expect(manager.serialize(editor.getJSON())).toBe('Keep this paragraph.\n');
+ expect(getParseHealth().jsxAutoConvertFailed).toEqual({});
+ expect(getParseHealth().jsxActionAborted).toEqual({});
+ });
+});
+
+describe('component actions before the shifted position renders', () => {
+ test('deletes the clicked component without deleting its preceding text', async () => {
+ const component = '<Callout title="Target">\nKeep the neighbors.\n</Callout>';
+ const source = `Before.\n\n${component}\n\nAfter.\n`;
+ const editor = await mountEditor(source);
+ const button = screen.getByRole('button', { name: 'Delete Callout', exact: true });
+
+ act(() => {
+ editor.view.dispatch(editor.state.tr.insertText('Shifted ', 1));
+ fireEvent.click(button);
+ });
+
+ expect(manager.serialize(editor.getJSON())).toBe('Shifted Before.\n\nAfter.\n');
+ });
+
+ test.each(['up', 'down'] as const)(
+ 'moves the clicked component %s after a position shift',
+ async (direction) => {
+ const first = '<Callout title="First">\nFirst body.\n</Callout>';
+ const second = '<Callout title="Second">\nSecond body.\n</Callout>';
+ const source = `Before.\n\n<Callout title="Group">\n${first}\n${second}\n</Callout>\n\nAfter.\n`;
+ const editor = await mountEditor(source);
+ const button = screen.getByRole('button', { name: `Move ${direction}`, exact: true });
+
+ act(() => {
+ editor.view.dispatch(editor.state.tr.insertText('Shifted ', 1));
+ fireEvent.click(button);
+ });
+
+ expect(editor.state.doc.child(0).textContent).toBe('Shifted Before.');
+ const group = editor.state.doc.child(1);
+ expect(group.child(0).textContent).toBe('Second body.');
+ expect(group.child(1).textContent).toBe('First body.');
+ expect(editor.state.doc.child(2).textContent).toBe('After.');
+ },
+ );
+
+ test('selects the clicked component for a comment after a position shift', async () => {
+ const source = 'Before.\n\n<Math formula="x^2" />\n\nAfter.\n';
+ const editor = await mountEditor(source);
+ const target = editor.state.doc.child(1);
+ const button = screen.getByRole('button', {
+ name: 'Comment or ask AI about this Math',
+ exact: true,
+ });
+
+ act(() => {
+ editor.view.dispatch(editor.state.tr.insertText('Shifted ', 1));
+ fireEvent.click(button);
+ });
+
+ expect(editor.state.selection.from).toBe(editor.state.doc.child(0).nodeSize);
+ expect(editor.state.doc.nodeAt(editor.state.selection.from)).toBe(target);
+ expect(manager.serialize(editor.getJSON())).toBe(source.replace('Before.', 'Shifted Before.'));
+ });
+
+ test('updates move-button availability when an unchanged child changes position', async () => {
+ const editor = await mountEditor(
+ '<Callout title="Group">\n<Callout title="First">\nFirst body.\n</Callout>\n<Callout title="Second">\nSecond body.\n</Callout>\n</Callout>\n',
+ );
+ const first = editor.state.doc.child(0).child(0);
+ const second = editor.state.doc.child(0).child(1);
+ expect(screen.getByRole('button', { name: 'Move up', exact: true })).toBeTruthy();
+ expect(screen.getByRole('button', { name: 'Move down', exact: true })).toBeTruthy();
+
+ act(() => editor.view.dispatch(editor.state.tr.delete(1, 1 + first.nodeSize)));
+
+ await waitFor(() => {
+ expect(screen.queryByRole('button', { name: 'Move up', exact: true })).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Move down', exact: true })).toBeNull();
+ });
+ expect(editor.state.doc.child(0).child(0)).toBe(second);
+ });
+
+ test('acknowledges a delete aborted because the component changed', async () => {
+ const warn = vi.spyOn(console, 'warn');
+ const editor = await mountEditor('<Callout title="Target">\nOriginal body.\n</Callout>\n');
+ const button = screen.getByRole('button', { name: 'Delete Callout', exact: true });
+ const replacement = editor.schema
+ .nodeFromJSON(manager.parse('<Callout title="Target">\nNew body.\n</Callout>\n'))
+ .child(0);
+
+ act(() => {
+ editor.view.dispatch(
+ editor.state.tr.replaceWith(0, editor.state.doc.child(0).nodeSize, replacement),
+ );
+ fireEvent.click(button);
+ });
+
+ expect(editor.state.doc.child(0).textContent).toBe('New body.');
+ expect(await screen.findByText('This component changed. Try again.')).toBeTruthy();
+ expect(getParseHealth().jsxActionAborted).toEqual({ 'delete-chrome': 1 });
+ expect(warn).toHaveBeenCalledWith(
+ JSON.stringify({
+ event: 'jsx-component-action-aborted',
+ action: 'delete-chrome',
+ reason: 'changed',
+ component: 'Callout',
+ rawComponentName: 'Callout',
+ }),
+ );
+ warn.mockRestore();
+ });
+
+ test('does not insert a child at document start after its parent is removed', async () => {
+ const editor = await mountEditor(
+ '<Tabs>\n<Tab label="First">\nFirst body.\n</Tab>\n</Tabs>\n\nKeep this paragraph.\n',
+ );
+ const button = screen.getByRole('button', { name: 'Add tab', exact: true });
+
+ act(() => {
+ editor.view.dispatch(editor.state.tr.delete(0, editor.state.doc.child(0).nodeSize));
+ fireEvent.click(button);
+ });
+
+ expect(manager.serialize(editor.getJSON())).toBe('Keep this paragraph.\n');
+ expect(await screen.findByText('This component was removed.')).toBeTruthy();
+ expect(getParseHealth().jsxActionAborted).toEqual({ 'insert-child': 1 });
+ });
+
+ test('attributes a stale keyboard delete to the keyboard entry point', async () => {
+ const warn = vi.spyOn(console, 'warn');
+ const editor = await mountEditor('<Callout title="Target">\nOriginal body.\n</Callout>\n');
+ act(() => {
+ editor.commands.setNodeSelection(0);
+ });
+ const wrapper = document.querySelector('[data-component-name="Callout"][data-selected="true"]');
+ if (!wrapper) throw new Error('selected component wrapper not found');
+ const replacement = editor.schema
+ .nodeFromJSON(manager.parse('<Callout title="Target">\nNew body.\n</Callout>\n'))
+ .child(0);
+
+ act(() => {
+ editor.view.dispatch(
+ editor.state.tr.replaceWith(0, editor.state.doc.child(0).nodeSize, replacement),
+ );
+ fireEvent.keyDown(wrapper, { key: 'Backspace' });
+ });
+
+ expect(editor.state.doc.child(0).textContent).toBe('New body.');
+ expect(getParseHealth().jsxActionAborted).toEqual({ 'delete-keyboard': 1 });
+ expect(warn).toHaveBeenCalledWith(
+ JSON.stringify({
+ event: 'jsx-component-action-aborted',
+ action: 'delete-keyboard',
+ reason: 'changed',
+ component: 'Callout',
+ rawComponentName: 'Callout',
+ }),
+ );
+ warn.mockRestore();
+ });
+
+ test('merges a property edit with other live property changes', async () => {
+ const editor = await mountEditor('<Callout title="Original">\nBody.\n</Callout>\n');
+ fireEvent.click(screen.getByRole('button', { name: 'Callout properties', exact: true }));
+ const title = await screen.findByDisplayValue('Original');
+
+ act(() => {
+ const node = editor.state.doc.child(0);
+ editor.view.dispatch(
+ editor.state.tr.setNodeAttribute(0, 'props', { ...node.attrs.props, icon: 'sparkles' }),
+ );
+ fireEvent.change(title, { target: { value: 'Updated title' } });
+ });
+
+ expect(editor.state.doc.child(0).attrs.props).toMatchObject({
+ title: 'Updated title',
+ icon: 'sparkles',
+ });
+ expect(getParseHealth().jsxActionAborted).toEqual({});
+ });
+});
diff --git a/packages/app/src/editor/extensions/JsxComponentView.tsx b/packages/app/src/editor/extensions/JsxComponentView.tsx
index 1173d331f..79a2365c1 100644
--- a/packages/app/src/editor/extensions/JsxComponentView.tsx
+++ b/packages/app/src/editor/extensions/JsxComponentView.tsx
@@ -6,14 +6,17 @@
import {
commentLeafText,
+ incrementJsxActionAborted,
incrementJsxAutoConvertFailed,
incrementJsxAutoConvertSucceeded,
+ incrementJsxChromeDeleteFailed,
incrementJsxKeyboardDeleteFailed,
incrementJsxMoveFailed,
incrementJsxPopoverCloseRestoreFailed,
incrementJsxRenderFailure,
incrementJsxStuckCopyFailed,
incrementJsxStuckDeleteFailed,
+ type JsxNodeAction,
} from '@inkeep/open-knowledge-core';
import { Trans, useLingui } from '@lingui/react/macro';
import type { NodeViewProps } from '@tiptap/core';
@@ -31,6 +34,7 @@ import {
import type { ReactNode } from 'react';
import { useEffect, useRef, useState } from 'react';
import { ErrorBoundary, type FallbackProps } from 'react-error-boundary';
+import { toast } from 'sonner';
import { emitStartComment } from '@/comments/store';
import { Button } from '@/components/ui/button';
import { useIsEmbedded } from '@/hooks/use-is-embedded';
@@ -73,6 +77,7 @@ import {
autonomousFragmentEditAllowed,
markAutonomousFragmentEdit,
} from './autonomous-fragment-edit.ts';
+import { isSameJsxElement, resolveJsxNodeTarget } from './jsx-node-target.ts';
interface ComponentErrorBoundaryProps {
children: ReactNode;
@@ -284,9 +289,46 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
}, [boardExpandable]);
const resetKey = `${descriptor.name}::${stableHash(primitiveProps)}`;
- const insertChildAt = () => {
- const p = typeof getPos === 'function' ? (getPos() ?? 0) : 0;
- return p + 1 + node.content.size;
+ const reportAbortedAction = (action: JsxNodeAction, reason: 'changed' | 'removed') => {
+ incrementJsxActionAborted(action);
+ console.warn(
+ JSON.stringify({
+ event: 'jsx-component-action-aborted',
+ action,
+ reason,
+ component: descriptor.name === '*' ? 'wildcard' : descriptor.name,
+ rawComponentName: String(node.attrs.componentName ?? '').slice(0, 200),
+ }),
+ );
+ toast.info(
+ reason === 'removed' ? t`This component was removed.` : t`This component changed. Try again.`,
+ );
+ };
+
+ const resolveActionTarget = (action: JsxNodeAction) => {
+ const target = resolveJsxNodeTarget(editor.state.doc, getPos, node);
+ if (target.kind !== 'current') {
+ reportAbortedAction(action, target.kind);
+ return null;
+ }
+ return target;
+ };
+
+ const resolveElementActionTarget = (action: JsxNodeAction) => {
+ const target = resolveJsxNodeTarget(editor.state.doc, getPos, node);
+ if (target.kind === 'removed' || !isSameJsxElement(target.node, node)) {
+ reportAbortedAction(action, target.kind === 'removed' ? 'removed' : 'changed');
+ return null;
+ }
+ return target;
+ };
+
+ const insertChild = (childName: string) => {
+ const target = resolveActionTarget('insert-child');
+ if (!target) return;
+ const insertPos = target.pos + 1 + target.node.content.size;
+ editor.chain().focus().insertContentAt(insertPos, createChildNode(childName)).run();
+ focusInsertedComponent(editor, insertPos, getDescriptor(childName));
};
const needsConversion = descriptor.name === '*' || renderError !== null;
@@ -296,9 +338,6 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
useEffect(() => {
if (!needsConversion || convertedRef.current || stuck) return;
- const p = typeof getPos === 'function' ? getPos() : undefined;
- if (typeof p !== 'number') return;
-
const source = reconstructSource(node);
const reason =
descriptor.name === '*'
@@ -347,6 +386,9 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
return;
}
try {
+ const target = resolveJsxNodeTarget(view.state.doc, getPos, node);
+ if (target.kind !== 'current') return;
+ const p = target.pos;
view.dispatch(
markAutonomousFragmentEdit(view.state.tr.replaceWith(p, p + node.nodeSize, fallbackNode)),
);
@@ -393,10 +435,10 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
}
};
const deleteNode = () => {
- const p = typeof getPos === 'function' ? getPos() : undefined;
- if (typeof p !== 'number') return;
try {
- editor.chain().focus().setNodeSelection(p).deleteSelection().run();
+ const target = resolveActionTarget('delete-stuck');
+ if (!target) return;
+ editor.chain().focus().setNodeSelection(target.pos).deleteSelection().run();
} catch (err) {
if (!(err instanceof RangeError)) throw err;
incrementJsxStuckDeleteFailed(descriptor.name);
@@ -468,19 +510,19 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
if (target.closest('.jsx-component-chrome')) return;
if (target.closest('.jsx-add-child-pill, .jsx-empty-child-placeholder')) return;
if (target.closest('a[href]')) return;
- if (typeof pos !== 'number') return;
- const curNode = editor.state.doc.nodeAt(pos);
- if (!curNode) return;
- const nodeEnd = pos + curNode.nodeSize;
+ const targetNode = resolveJsxNodeTarget(editor.state.doc, getPos, node);
+ if (targetNode.kind !== 'current') return;
+ const p = targetNode.pos;
+ const nodeEnd = p + node.nodeSize;
const selFrom = editor.state.selection.from;
- if (selFrom < pos || selFrom >= nodeEnd) return;
- editor.chain().focus().setNodeSelection(pos).run();
+ if (selFrom < p || selFrom >= nodeEnd) return;
+ editor.chain().focus().setNodeSelection(p).run();
};
const openPanel = () => {
- const p = typeof getPos === 'function' ? getPos() : undefined;
- if (typeof p !== 'number') return;
- editor.chain().focus().setNodeSelection(p).run();
+ const target = resolveActionTarget('open-properties');
+ if (!target) return;
+ editor.chain().focus().setNodeSelection(target.pos).run();
setPopoverOpen(true);
};
@@ -497,11 +539,16 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
if (!isInnermostSelected) return;
if (!e.currentTarget.contains(target)) return;
if (target.matches('input, textarea')) return;
- const p = typeof getPos === 'function' ? getPos() : undefined;
- if (typeof p !== 'number') return;
e.preventDefault();
try {
- const dispatched = editor.chain().focus().setNodeSelection(p).deleteSelection().run();
+ const targetNode = resolveActionTarget('delete-keyboard');
+ if (!targetNode) return;
+ const dispatched = editor
+ .chain()
+ .focus()
+ .setNodeSelection(targetNode.pos)
+ .deleteSelection()
+ .run();
if (!dispatched) {
incrementJsxKeyboardDeleteFailed(descriptor.name);
console.warn(
@@ -541,11 +588,10 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
setPopoverOpen(open);
if (open) return;
requestAnimationFrame(() => {
- const p = typeof getPos === 'function' ? getPos() : undefined;
- if (typeof p !== 'number') return;
try {
- const curNode = editor.state.doc.nodeAt(p);
- if (!curNode) return;
+ const target = resolveJsxNodeTarget(editor.state.doc, getPos, node);
+ if (target.kind !== 'current') return;
+ const { pos: p, node: curNode } = target;
const nodeEnd = p + curNode.nodeSize;
const selFrom = editor.state.selection.from;
if (selFrom < p || selFrom >= nodeEnd) return;
@@ -661,17 +707,19 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
aria-label={t`Move up`}
onClick={() => {
try {
- if (typeof pos !== 'number') return;
- const $p = editor.state.doc.resolve(pos);
+ const target = resolveActionTarget('move-up');
+ if (!target) return;
+ const p = target.pos;
+ const $p = editor.state.doc.resolve(p);
const idx = $p.index($p.depth);
if (idx === 0) return;
const parent = $p.node($p.depth);
const prev = parent.child(idx - 1);
- const from = pos - prev.nodeSize;
- const to = pos + node.nodeSize;
+ const from = p - prev.nodeSize;
+ const to = p + node.nodeSize;
const tr = editor.state.tr;
- const cur = editor.state.doc.slice(pos, pos + node.nodeSize);
- const pre = editor.state.doc.slice(from, pos);
+ const cur = editor.state.doc.slice(p, p + node.nodeSize);
+ const pre = editor.state.doc.slice(from, p);
tr.replaceWith(from, to, cur.content.append(pre.content));
editor.view.dispatch(tr.scrollIntoView());
} catch (err) {
@@ -700,17 +748,19 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
aria-label={t`Move down`}
onClick={() => {
try {
- if (typeof pos !== 'number') return;
- const $p = editor.state.doc.resolve(pos);
+ const target = resolveActionTarget('move-down');
+ if (!target) return;
+ const p = target.pos;
+ const $p = editor.state.doc.resolve(p);
const idx = $p.index($p.depth);
const parent = $p.node($p.depth);
if (idx >= parent.childCount - 1) return;
const next = parent.child(idx + 1);
- const from = pos;
- const to = pos + node.nodeSize + next.nodeSize;
+ const from = p;
+ const to = p + node.nodeSize + next.nodeSize;
const tr = editor.state.tr;
- const cur = editor.state.doc.slice(pos, pos + node.nodeSize);
- const nxt = editor.state.doc.slice(pos + node.nodeSize, to);
+ const cur = editor.state.doc.slice(p, p + node.nodeSize);
+ const nxt = editor.state.doc.slice(p + node.nodeSize, to);
tr.replaceWith(from, to, nxt.content.append(cur.content));
editor.view.dispatch(tr.scrollIntoView());
} catch (err) {
@@ -780,7 +830,9 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
data-testid="jsx-component-ask-ai-btn"
onClick={() => {
try {
- editor.commands.setNodeSelection(pos);
+ const target = resolveActionTarget('comment');
+ if (!target) return;
+ editor.commands.setNodeSelection(target.pos);
} catch (err) {
console.warn(
JSON.stringify({
@@ -818,16 +870,17 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
className="jsx-chrome-btn jsx-chrome-btn--delete"
aria-label={t`Delete ${deleteDescriptorLabel}`}
onClick={() => {
- if (typeof pos !== 'number') return;
try {
+ const target = resolveActionTarget('delete-chrome');
+ if (!target) return;
const dispatched = editor
.chain()
.focus()
- .setNodeSelection(pos)
+ .setNodeSelection(target.pos)
.deleteSelection()
.run();
if (!dispatched) {
- incrementJsxKeyboardDeleteFailed(descriptor.name);
+ incrementJsxChromeDeleteFailed(descriptor.name);
console.warn(
JSON.stringify({
event: 'jsx-component-chrome-delete-failed',
@@ -839,7 +892,7 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
}
} catch (err) {
if (!(err instanceof RangeError)) throw err;
- incrementJsxKeyboardDeleteFailed(descriptor.name);
+ incrementJsxChromeDeleteFailed(descriptor.name);
console.warn(
JSON.stringify({
event: 'jsx-component-chrome-delete-failed',
@@ -900,16 +953,15 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
? {
editor,
getPos: () => {
- const p = getPos();
- return typeof p === 'number' ? p : undefined;
+ const target = resolveJsxNodeTarget(editor.state.doc, getPos, node);
+ return target.kind !== 'removed' && isSameJsxElement(target.node, node)
+ ? target.pos
+ : undefined;
},
addChild: descriptor.emptyChildName
? () => {
const childName = descriptor.emptyChildName as string;
- const childJSON = createChildNode(childName);
- const insertPos = insertChildAt();
- editor.chain().focus().insertContentAt(insertPos, childJSON).run();
- focusInsertedComponent(editor, insertPos, getDescriptor(childName));
+ insertChild(childName);
}
: null,
}
@@ -953,10 +1005,7 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
onMouseDown={(e) => e.stopPropagation()}
onClick={() => {
const childName = descriptor.emptyChildName as string;
- const childJSON = createChildNode(childName);
- const insertPos = insertChildAt();
- editor.chain().focus().insertContentAt(insertPos, childJSON).run();
- focusInsertedComponent(editor, insertPos, getDescriptor(childName));
+ insertChild(childName);
}}
{...{ [OPT_OUT_ATTR]: 'true' }}
>
@@ -1003,10 +1052,9 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
);
}}
onSave={(value) => {
- const livePos = typeof getPos === 'function' ? getPos() : undefined;
- if (typeof livePos !== 'number') return;
- const curNode = editor.state.doc.nodeAt(livePos);
- if (!curNode) return;
+ const target = resolveElementActionTarget('edit-source');
+ if (!target) return;
+ const { pos: livePos, node: curNode } = target;
const elementAttrs = getElementJsxAttrs(curNode.attrs);
if (!elementAttrs) return;
try {
@@ -1053,10 +1101,9 @@ export function JsxComponentView({ node, editor, extension, getPos, selected }:
values={primitiveProps}
onDismiss={() => setPopoverOpen(false)}
onChange={(propName, value) => {
- const p = typeof getPos === 'function' ? getPos() : undefined;
- if (typeof p !== 'number') return;
- const curNode = editor.state.doc.nodeAt(p);
- if (!curNode) return;
+ const target = resolveElementActionTarget('edit-properties');
+ if (!target) return;
+ const { pos: p, node: curNode } = target;
const elementAttrs = getElementJsxAttrs(curNode.attrs);
if (!elementAttrs) return;
const currentNodeProps = elementAttrs.props;
diff --git a/packages/app/src/editor/extensions/jsx-node-target.test.ts b/packages/app/src/editor/extensions/jsx-node-target.test.ts
new file mode 100644
index 000000000..844606ca3
--- /dev/null
+++ b/packages/app/src/editor/extensions/jsx-node-target.test.ts
@@ -0,0 +1,45 @@
+import { MarkdownManager, sharedExtensions } from '@inkeep/open-knowledge-core';
+import { getSchema } from '@tiptap/core';
+import { describe, expect, test } from 'vitest';
+import { isSameJsxElement, resolveJsxNodeTarget } from './jsx-node-target';
+
+const schema = getSchema(sharedExtensions);
+const manager = new MarkdownManager({ extensions: sharedExtensions });
+
+function component(source: string) {
+ return schema.nodeFromJSON(manager.parse(source)).child(0);
+}
+
+describe('JSX node targets', () => {
+ test('resolves the live position and accepts equal replacement nodes', () => {
+ const expected = component('<Callout title="Original">\nBody.\n</Callout>');
+ const replacement = schema.nodeFromJSON(expected.toJSON());
+ const prefix = schema.nodes.paragraph.create(null, schema.text('Shifted'));
+ const doc = schema.node('doc', null, [prefix, replacement]);
+ expect(resolveJsxNodeTarget(doc, () => prefix.nodeSize, expected)).toEqual({
+ kind: 'current',
+ pos: prefix.nodeSize,
+ node: replacement,
+ });
+ });
+
+ test('returns changed nodes so attribute writers can preserve their live properties', () => {
+ const expected = component('<Callout title="Original">\nBody.\n</Callout>');
+ const current = component('<Callout title="Updated">\nNew body.\n</Callout>');
+ const doc = schema.node('doc', null, [current]);
+ expect(resolveJsxNodeTarget(doc, () => 0, expected)).toEqual({
+ kind: 'changed',
+ pos: 0,
+ node: current,
+ });
+ expect(isSameJsxElement(current, expected)).toBe(true);
+ expect(isSameJsxElement(component('<Math formula="x" />'), expected)).toBe(false);
+ });
+
+ test('does not substitute position zero for a detached node', () => {
+ const node = component('<Callout>\nBody.\n</Callout>');
+ const doc = schema.node('doc', null, [node]);
+ expect(resolveJsxNodeTarget(doc, () => undefined, node)).toEqual({ kind: 'removed' });
+ expect(resolveJsxNodeTarget(doc, () => doc.content.size, node)).toEqual({ kind: 'removed' });
+ });
+});
diff --git a/packages/app/src/editor/extensions/jsx-node-target.ts b/packages/app/src/editor/extensions/jsx-node-target.ts
new file mode 100644
index 000000000..86e05eb5d
--- /dev/null
+++ b/packages/app/src/editor/extensions/jsx-node-target.ts
@@ -0,0 +1,26 @@
+import type { NodeViewProps } from '@tiptap/core';
+import type { Node as PmNode } from '@tiptap/pm/model';
+
+type JsxNodeTarget =
+ | { kind: 'current' | 'changed'; pos: number; node: PmNode }
+ | { kind: 'removed' };
+
+export function resolveJsxNodeTarget(
+ doc: PmNode,
+ getPos: NodeViewProps['getPos'],
+ expected: PmNode,
+): JsxNodeTarget {
+ const pos = getPos();
+ if (pos === undefined) return { kind: 'removed' };
+ const node = doc.nodeAt(pos);
+ if (!node) return { kind: 'removed' };
+ return { kind: node.eq(expected) ? 'current' : 'changed', pos, node };
+}
+
+export function isSameJsxElement(current: PmNode, expected: PmNode): boolean {
+ return (
+ current.type === expected.type &&
+ current.attrs.kind === 'element' &&
+ current.attrs.componentName === expected.attrs.componentName
+ );
+}
diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.json
index d66441565..2ed6d8cbe 100644
--- a/packages/app/src/locales/ar/messages.json
+++ b/packages/app/src/locales/ar/messages.json
@@ -1218,6 +1218,7 @@
"Ba4D2x": ["تم استيراد القالب"],
"Bdha5y": ["يجري النشر..."],
"BeWTQy": ["يجري تحميل حزم البداية"],
+ "BfTQmM": ["تمت إزالة هذا المكوّن."],
"BgV29F": ["حقل بحث المحرر المرئي مركَّز عليه"],
"Bgaa_U": ["فشل تحديث إعداد الأداء — ", ["detail"]],
"BhLPRk": ["تم التراجع بـ «", ["name"], "» إلى النسخة المثبتة"],
@@ -2336,6 +2337,7 @@
"NSnIUP": ["صفحتان (زوجي)"],
"NUr4kz": ["نقطة انطلاق قابلة لإعادة الاستخدام للمستندات الجديدة في هذا المجلد."],
"NVghPF": ["تعذّر على الطرفية تشغيل هذا الأمر في الصدفة المُهيّأة."],
+ "NXNzgx": ["لقد تغيّر هذا المكوّن. حاول مرة أخرى."],
"NY0p7s": ["تم تخطّي تفعيل أدوات Open Knowledge. تعمل هذه السلسلة بدونها."],
"NYUhy5": ["اسم المجلد الفرعي"],
"NYn1cR": ["يجري تحميل المحرر"],
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index c171a5a32..c7021ea05 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -14446,6 +14446,14 @@ msgstr "يحتوي هذا الأمر على أحرف مخفية قد تجعله
msgid "This comment is on the whole property"
msgstr "هذا التعليق على الخاصية بأكملها"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "لقد تغيّر هذا المكوّن. حاول مرة أخرى."
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "تمت إزالة هذا المكوّن."
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.json
index d7f5ee9de..7aa32b7c6 100644
--- a/packages/app/src/locales/bn/messages.json
+++ b/packages/app/src/locales/bn/messages.json
@@ -996,6 +996,7 @@
"Ba4D2x": ["টেমপ্লেট আমদানি করা হয়েছে"],
"Bdha5y": ["প্রকাশ করা হচ্ছে…"],
"BeWTQy": ["স্টার্টার প্যাক লোড হচ্ছে"],
+ "BfTQmM": ["এই উপাদানটি সরানো হয়েছে।"],
"BgV29F": ["দৃশ্য সম্পাদকের খোঁজার ইনপুট ফোকাসে"],
"Bgaa_U": ["পারফরম্যান্স সেটিং হালনাগাদ করতে ব্যর্থ — ", ["detail"]],
"BhLPRk": ["\"", ["name"], "\"-কে ইনস্টল করা সংস্করণে ফিরিয়ে নেওয়া হয়েছে"],
@@ -1948,6 +1949,7 @@
"NSnIUP": ["দুই পাতা (জোড়)"],
"NUr4kz": ["এই ফোল্ডারে নতুন নথির জন্য একটি পুনর্ব্যবহারযোগ্য শুরুর বিন্দু।"],
"NVghPF": ["টার্মিনাল কনফিগার করা শেলে এই কমান্ড চালাতে পারে না।"],
+ "NXNzgx": ["এই উপাদানটি পরিবর্তিত হয়েছে। আবার চেষ্টা করুন।"],
"NY0p7s": ["Open Knowledge টুল সক্ষম করা এড়িয়ে যাওয়া হয়েছে। এই থ্রেড সেগুলো ছাড়াই চলবে।"],
"NYUhy5": ["উপ-ফোল্ডারের নাম"],
"NYn1cR": ["সম্পাদক লোড হচ্ছে"],
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index 626b4e1ec..3f0d9a9bf 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -14442,6 +14442,14 @@ msgstr "এই কমান্ডে লুকানো অক্ষর আছ
msgid "This comment is on the whole property"
msgstr "এই মন্তব্যটি পুরো প্রপার্টির উপর"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "এই উপাদানটি পরিবর্তিত হয়েছে। আবার চেষ্টা করুন।"
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "এই উপাদানটি সরানো হয়েছে।"
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.json
index 34a924dc4..b8b205678 100644
--- a/packages/app/src/locales/en/messages.json
+++ b/packages/app/src/locales/en/messages.json
@@ -1030,6 +1030,7 @@
"Ba4D2x": ["Template imported"],
"Bdha5y": ["Publishing..."],
"BeWTQy": ["Loading starter packs"],
+ "BfTQmM": ["This component was removed."],
"BgV29F": ["Visual editor find input focused"],
"Bgaa_U": ["Failed to update performance setting — ", ["detail"]],
"BhLPRk": ["Reverted \"", ["name"], "\" to the installed version"],
@@ -2021,6 +2022,7 @@
"NSnIUP": ["Two-page (even)"],
"NUr4kz": ["A reusable starting point for new documents in this folder."],
"NVghPF": ["The terminal can't run this command in the configured shell."],
+ "NXNzgx": ["This component changed. Try again."],
"NY0p7s": ["Skipped enabling Open Knowledge tools. This thread runs without them."],
"NYUhy5": ["Subfolder name"],
"NYn1cR": ["Loading editor"],
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index e8496efc7..60ec544d9 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -14446,6 +14446,14 @@ msgstr "This command contains hidden characters that can make it look different
msgid "This comment is on the whole property"
msgstr "This comment is on the whole property"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "This component changed. Try again."
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "This component was removed."
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.json
index a03204ac8..58841e61d 100644
--- a/packages/app/src/locales/es/messages.json
+++ b/packages/app/src/locales/es/messages.json
@@ -1213,6 +1213,7 @@
"Ba4D2x": ["Plantilla importada"],
"Bdha5y": ["Publicando..."],
"BeWTQy": ["Cargando paquetes iniciales"],
+ "BfTQmM": ["Este componente se ha eliminado."],
"BgV29F": ["Campo de búsqueda del editor visual enfocado"],
"Bgaa_U": ["No se pudo actualizar el ajuste de rendimiento — ", ["detail"]],
"BhLPRk": ["Se revirtió \"", ["name"], "\" a la versión instalada"],
@@ -2354,6 +2355,7 @@
"NSnIUP": ["Dos páginas (pares)"],
"NUr4kz": ["Un punto de partida reutilizable para los documentos nuevos de esta carpeta."],
"NVghPF": ["La terminal no puede ejecutar este comando en el shell configurado."],
+ "NXNzgx": ["Este componente ha cambiado. Inténtalo de nuevo."],
"NY0p7s": [
"Se omitió habilitar las herramientas de Open Knowledge. Este hilo funciona sin ellas."
],
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index a52c4a6e1..8fc6e51f4 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -14446,6 +14446,14 @@ msgstr "Este comando contiene caracteres ocultos que pueden hacer que se vea dis
msgid "This comment is on the whole property"
msgstr "Este comentario es sobre toda la propiedad"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "Este componente ha cambiado. Inténtalo de nuevo."
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "Este componente se ha eliminado."
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.json
index fc482b6a0..0641eb1aa 100644
--- a/packages/app/src/locales/fr/messages.json
+++ b/packages/app/src/locales/fr/messages.json
@@ -1240,6 +1240,7 @@
"Ba4D2x": ["Modèle importé"],
"Bdha5y": ["Publication…"],
"BeWTQy": ["Chargement des packs de démarrage"],
+ "BfTQmM": ["Ce composant a été supprimé."],
"BgV29F": ["Champ de recherche de l'éditeur visuel actif"],
"Bgaa_U": ["Échec de la mise à jour du paramètre de performance — ", ["detail"]],
"BhLPRk": ["« ", ["name"], " » ramené à la version installée"],
@@ -2397,6 +2398,7 @@
"NSnIUP": ["Deux pages (paires)"],
"NUr4kz": ["Un point de départ réutilisable pour les nouveaux documents de ce dossier."],
"NVghPF": ["Le terminal ne peut pas exécuter cette commande dans le shell configuré."],
+ "NXNzgx": ["Ce composant a changé. Réessayez."],
"NY0p7s": ["Activation des outils Open Knowledge ignorée. Ce fil fonctionne sans eux."],
"NYUhy5": ["Nom du sous-dossier"],
"NYn1cR": ["Chargement de l'éditeur"],
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index 559722d39..5fcdbfb1c 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -14446,6 +14446,14 @@ msgstr "Cette commande contient des caractères masqués qui peuvent la faire pa
msgid "This comment is on the whole property"
msgstr "Ce commentaire porte sur toute la propriété"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "Ce composant a changé. Réessayez."
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "Ce composant a été supprimé."
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.json
index 8039497c0..95c099d6b 100644
--- a/packages/app/src/locales/hi/messages.json
+++ b/packages/app/src/locales/hi/messages.json
@@ -1003,6 +1003,7 @@
"Ba4D2x": ["टेम्पलेट आयात किया गया"],
"Bdha5y": ["प्रकाशित किया जा रहा है…"],
"BeWTQy": ["स्टार्टर पैक लोड हो रहे हैं"],
+ "BfTQmM": ["यह घटक हटा दिया गया है।"],
"BgV29F": ["दृश्य संपादक का खोज इनपुट फ़ोकस में"],
"Bgaa_U": ["प्रदर्शन सेटिंग अपडेट करने में विफल — ", ["detail"]],
"BhLPRk": ["\"", ["name"], "\" को इंस्टॉल किए गए संस्करण पर वापस ले लिया गया"],
@@ -1956,6 +1957,7 @@
"NSnIUP": ["दो पेज (सम)"],
"NUr4kz": ["इस फ़ोल्डर में नए दस्तावेज़ों के लिए एक पुन: उपयोग योग्य शुरुआती बिंदु।"],
"NVghPF": ["टर्मिनल कॉन्फ़िगर किए गए शेल में यह कमांड नहीं चला सकता।"],
+ "NXNzgx": ["यह घटक बदल गया है। फिर से कोशिश करें।"],
"NY0p7s": ["Open Knowledge टूल सक्षम करना छोड़ दिया गया। यह थ्रेड उनके बिना चलता है।"],
"NYUhy5": ["उप-फ़ोल्डर का नाम"],
"NYn1cR": ["संपादक लोड हो रहा है"],
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index ce1197760..508b4605f 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -14442,6 +14442,14 @@ msgstr "इस कमांड में छिपे हुए वर्ण ह
msgid "This comment is on the whole property"
msgstr "यह टिप्पणी पूरी प्रॉपर्टी पर है"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "यह घटक बदल गया है। फिर से कोशिश करें।"
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "यह घटक हटा दिया गया है।"
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.json
index 21c0a99df..311d5ccb0 100644
--- a/packages/app/src/locales/id/messages.json
+++ b/packages/app/src/locales/id/messages.json
@@ -1030,6 +1030,7 @@
"Ba4D2x": ["Templat diimpor"],
"Bdha5y": ["Menerbitkan..."],
"BeWTQy": ["Memuat paket awal"],
+ "BfTQmM": ["Komponen ini telah dihapus."],
"BgV29F": ["Bidang pencarian penyunting visual sedang difokus"],
"Bgaa_U": ["Gagal memperbarui pengaturan performa — ", ["detail"]],
"BhLPRk": ["\"", ["name"], "\" dikembalikan ke versi yang terpasang"],
@@ -2039,6 +2040,7 @@
"NSnIUP": ["Dua halaman (genap)"],
"NUr4kz": ["Titik awal yang bisa dipakai ulang untuk dokumen baru di folder ini."],
"NVghPF": ["Terminal tidak dapat menjalankan perintah ini di shell yang dikonfigurasi."],
+ "NXNzgx": ["Komponen ini telah berubah. Coba lagi."],
"NY0p7s": ["Pengaktifan alat Open Knowledge dilewati. Utas ini berjalan tanpa alat itu."],
"NYUhy5": ["Nama subfolder"],
"NYn1cR": ["Memuat penyunting"],
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index 2a1a494e7..21c5a12f8 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -14442,6 +14442,14 @@ msgstr "Perintah ini berisi karakter tersembunyi yang dapat membuatnya terlihat
msgid "This comment is on the whole property"
msgstr "Komentar ini berlaku untuk seluruh properti"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "Komponen ini telah berubah. Coba lagi."
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "Komponen ini telah dihapus."
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.json
index 12b44cf45..c238beb6c 100644
--- a/packages/app/src/locales/ko/messages.json
+++ b/packages/app/src/locales/ko/messages.json
@@ -996,6 +996,7 @@
"Ba4D2x": ["템플릿을 가져왔습니다"],
"Bdha5y": ["게시 중…"],
"BeWTQy": ["스타터 팩 불러오는 중"],
+ "BfTQmM": ["이 컴포넌트가 삭제되었습니다."],
"BgV29F": ["비주얼 편집기 찾기 입력 필드에 포커스가 있습니다."],
"Bgaa_U": ["성능 설정을 업데이트하지 못했습니다: ", ["detail"]],
"BhLPRk": ["\"", ["name"], "\"을 설치된 버전으로 되돌렸습니다"],
@@ -1954,6 +1955,7 @@
"NSnIUP": ["두 페이지 (짝수)"],
"NUr4kz": ["이 폴더에서 새 문서를 시작할 수 있는 재사용 가능한 출발점입니다."],
"NVghPF": ["터미널이 구성된 셸에서 이 명령을 실행할 수 없습니다."],
+ "NXNzgx": ["이 컴포넌트가 변경되었습니다. 다시 시도하세요."],
"NY0p7s": ["Open Knowledge 도구 사용 설정을 건너뛰었습니다. 이 스레드는 도구 없이 실행됩니다."],
"NYUhy5": ["하위 폴더 이름"],
"NYn1cR": ["편집기 불러오는 중"],
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 2fbefcad3..08c043e8f 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -14446,6 +14446,14 @@ msgstr "이 명령에는 실제로 실행되는 내용과 다르게 보이게
msgid "This comment is on the whole property"
msgstr "이 댓글, 속성 전체에 적용됨"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "이 컴포넌트가 변경되었습니다. 다시 시도하세요."
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "이 컴포넌트가 삭제되었습니다."
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.json
index c9c86edf6..6ea842511 100644
--- a/packages/app/src/locales/pseudo/messages.json
+++ b/packages/app/src/locales/pseudo/messages.json
@@ -1030,6 +1030,7 @@
"Ba4D2x": ["Ţēḿƥĺàţē ĩḿƥōŕţēď"],
"Bdha5y": ["Ƥũƀĺĩśĥĩńĝ..."],
"BeWTQy": ["Ĺōàďĩńĝ śţàŕţēŕ ƥàćķś"],
+ "BfTQmM": ["Ţĥĩś ćōḿƥōńēńţ ŵàś ŕēḿōvēď."],
"BgV29F": ["Vĩśũàĺ ēďĩţōŕ ƒĩńď ĩńƥũţ ƒōćũśēď"],
"Bgaa_U": ["Ƒàĩĺēď ţō ũƥďàţē ƥēŕƒōŕḿàńćē śēţţĩńĝ — ", ["detail"]],
"BhLPRk": ["Ŕēvēŕţēď \"", ["name"], "\" ţō ţĥē ĩńśţàĺĺēď vēŕśĩōń"],
@@ -2021,6 +2022,7 @@
"NSnIUP": ["Ţŵō-ƥàĝē (ēvēń)"],
"NUr4kz": ["À ŕēũśàƀĺē śţàŕţĩńĝ ƥōĩńţ ƒōŕ ńēŵ ďōćũḿēńţś ĩń ţĥĩś ƒōĺďēŕ."],
"NVghPF": ["Ţĥē ţēŕḿĩńàĺ ćàń'ţ ŕũń ţĥĩś ćōḿḿàńď ĩń ţĥē ćōńƒĩĝũŕēď śĥēĺĺ."],
+ "NXNzgx": ["Ţĥĩś ćōḿƥōńēńţ ćĥàńĝēď. Ţŕŷ àĝàĩń."],
"NY0p7s": ["Śķĩƥƥēď ēńàƀĺĩńĝ Ōƥēń Ķńōŵĺēďĝē ţōōĺś. Ţĥĩś ţĥŕēàď ŕũńś ŵĩţĥōũţ ţĥēḿ."],
"NYUhy5": ["Śũƀƒōĺďēŕ ńàḿē"],
"NYn1cR": ["Ĺōàďĩńĝ ēďĩţōŕ"],
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index 1e1b4ad29..2728d7462 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -14442,6 +14442,14 @@ msgstr ""
msgid "This comment is on the whole property"
msgstr ""
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr ""
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr ""
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.json
index 733abd003..3e02b98ab 100644
--- a/packages/app/src/locales/pt-BR/messages.json
+++ b/packages/app/src/locales/pt-BR/messages.json
@@ -1199,6 +1199,7 @@
"Ba4D2x": ["Modelo importado"],
"Bdha5y": ["Publicando..."],
"BeWTQy": ["Carregando pacotes iniciais"],
+ "BfTQmM": ["Este componente foi removido."],
"BgV29F": ["Campo de busca do editor visual em foco"],
"Bgaa_U": ["Falha ao atualizar a configuração de desempenho — ", ["detail"]],
"BhLPRk": ["\"", ["name"], "\" revertido para a versão instalada"],
@@ -2327,6 +2328,7 @@
"NSnIUP": ["Duas páginas (pares)"],
"NUr4kz": ["Um ponto de partida reutilizável para novos documentos nesta pasta."],
"NVghPF": ["O terminal não pode executar este comando no shell configurado."],
+ "NXNzgx": ["Este componente foi alterado. Tente novamente."],
"NY0p7s": [
"A ativação das ferramentas do Open Knowledge foi ignorada. Esta conversa funciona sem elas."
],
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 43b15e554..341dc7d4c 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -14442,6 +14442,14 @@ msgstr "Este comando contém caracteres ocultos que podem fazer com que ele pare
msgid "This comment is on the whole property"
msgstr "Este comentário é sobre a propriedade inteira"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "Este componente foi alterado. Tente novamente."
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "Este componente foi removido."
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.json
index 9d3e40677..98ff132eb 100644
--- a/packages/app/src/locales/ur/messages.json
+++ b/packages/app/src/locales/ur/messages.json
@@ -1044,6 +1044,7 @@
"Ba4D2x": ["ٹیمپلیٹ درآمد ہو گیا"],
"Bdha5y": ["شائع کیا جا رہا ہے..."],
"BeWTQy": ["ابتدائی پیکس لوڈ ہو رہے ہیں"],
+ "BfTQmM": ["یہ جزو ہٹا دیا گیا ہے۔"],
"BgV29F": ["بصری ایڈیٹر کا تلاش اِن پٹ فوکس میں ہے"],
"Bgaa_U": ["کارکردگی کی ترتیب تازہ نہیں ہو سکی — ", ["detail"]],
"BhLPRk": ["«", ["name"], "» کو نصب شدہ ورژن پر واپس پلٹا دیا گیا"],
@@ -2062,6 +2063,7 @@
"NSnIUP": ["دو صفحے (جفت)"],
"NUr4kz": ["اس فولڈر میں نئی دستاویزات کے لیے دوبارہ استعمال ہونے والا نقطۂ آغاز۔"],
"NVghPF": ["ٹرمینل ترتیب دیے گئے شیل میں یہ کمانڈ نہیں چلا سکتا۔"],
+ "NXNzgx": ["یہ جزو تبدیل ہو گیا ہے۔ دوبارہ کوشش کریں۔"],
"NY0p7s": ["Open Knowledge ٹولز فعال کرنا چھوڑ دیا گیا۔ یہ تھریڈ ان کے بغیر چلے گا۔"],
"NYUhy5": ["ذیلی فولڈر کا نام"],
"NYn1cR": ["ایڈیٹر لوڈ ہو رہا ہے"],
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index d509076a1..76725d0d4 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -14446,6 +14446,14 @@ msgstr "اس کمانڈ میں پوشیدہ حروف ہیں جن کی وجہ س
msgid "This comment is on the whole property"
msgstr "یہ تبصرہ پوری خصوصیت پر ہے"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "یہ جزو تبدیل ہو گیا ہے۔ دوبارہ کوشش کریں۔"
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "یہ جزو ہٹا دیا گیا ہے۔"
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.json
index d46e6b552..3a6af6ee8 100644
--- a/packages/app/src/locales/zh-Hans/messages.json
+++ b/packages/app/src/locales/zh-Hans/messages.json
@@ -903,6 +903,7 @@
"Ba4D2x": ["模板已导入"],
"Bdha5y": ["正在发布…"],
"BeWTQy": ["正在加载入门包"],
+ "BfTQmM": ["此组件已被移除。"],
"BgV29F": ["可视化编辑器查找输入框已聚焦"],
"Bgaa_U": ["更新性能设置失败——", ["detail"]],
"BhLPRk": ["已把“", ["name"], "”还原到已安装的版本"],
@@ -1755,6 +1756,7 @@
"NSnIUP": ["双页(偶数)"],
"NUr4kz": ["这个文件夹中新文档可复用的起点。"],
"NVghPF": ["终端无法在配置的 shell 中运行此命令。"],
+ "NXNzgx": ["此组件已更改。请重试。"],
"NY0p7s": ["已跳过启用 Open Knowledge 工具。此线程将在没有这些工具的情况下运行。"],
"NYUhy5": ["子文件夹名"],
"NYn1cR": ["正在加载编辑器"],
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index 5f922e482..ae8515d26 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -14446,6 +14446,14 @@ msgstr "此命令包含隐藏字符,可能使其看起来与实际运行的内
msgid "This comment is on the whole property"
msgstr "这条评论针对的是整个属性"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "此组件已更改。请重试。"
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "此组件已被移除。"
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.json
index 2d24909c5..bf01cfabb 100644
--- a/packages/app/src/locales/zh-Hant/messages.json
+++ b/packages/app/src/locales/zh-Hant/messages.json
@@ -903,6 +903,7 @@
"Ba4D2x": ["範本已匯入"],
"Bdha5y": ["正在發布…"],
"BeWTQy": ["正在載入入門套件"],
+ "BfTQmM": ["此元件已被移除。"],
"BgV29F": ["視覺化編輯器尋找輸入框已聚焦"],
"Bgaa_U": ["更新效能設定失敗——", ["detail"]],
"BhLPRk": ["已把「", ["name"], "」回復成已安裝的版本"],
@@ -1773,6 +1774,7 @@
"NSnIUP": ["雙頁(偶數)"],
"NUr4kz": ["這個資料夾中新文件可重複使用的起點。"],
"NVghPF": ["終端機無法在設定的 shell 中執行此命令。"],
+ "NXNzgx": ["此元件已變更。請再試一次。"],
"NY0p7s": ["已略過啟用 Open Knowledge 工具。此執行緒將在沒有這些工具的情況下運作。"],
"NYUhy5": ["子資料夾名稱"],
"NYn1cR": ["正在載入編輯器"],
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index 6520fd477..255ecb7a1 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -14446,6 +14446,14 @@ msgstr "此指令包含隱藏字元,可能使其看起來與實際執行的內
msgid "This comment is on the whole property"
msgstr "這則註解是針對整個屬性的"
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component changed. Try again."
+msgstr "此元件已變更。請再試一次。"
+
+#: src/editor/extensions/JsxComponentView.tsx
+msgid "This component was removed."
+msgstr "此元件已被移除。"
+
#: src/components/BottomComposer.tsx
#: src/components/empty-state/CreatePromptComposer.tsx
#: src/editor/ComposerMentionInput.tsx
diff --git a/packages/app/tests/stress/jsx-wildcard-convert.e2e.ts b/packages/app/tests/stress/jsx-wildcard-convert.e2e.ts
index 76492f61f..9e9f8fb49 100644
--- a/packages/app/tests/stress/jsx-wildcard-convert.e2e.ts
+++ b/packages/app/tests/stress/jsx-wildcard-convert.e2e.ts
@@ -5,6 +5,8 @@
*/
import { randomUUID } from 'node:crypto';
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
import type { Page } from '@playwright/test';
import type { ApiHelpers } from './_helpers';
import { expect, test } from './_helpers';
@@ -83,3 +85,46 @@ test('S20: unregistered <UnknownWidget> auto-converts to rawMdxFallback on mount
expect(fallbacks).toHaveLength(1);
expect(residualJsxForUnknown).toHaveLength(0);
});
+
+test('S23: opening adjacent and nested unknown components preserves the document', async ({
+ page,
+ api,
+ workerServer,
+}) => {
+ const blocks = [
+ '<Badge>\nDefault\n</Badge>',
+ '<Badge variant="accent">\nPreview\n</Badge>',
+ '<Badge variant="success">\nStable\n</Badge>',
+ '<CardGroup cols={2}>\n<Card title="Quick start">\nFirst page.\n</Card>\n<Card title="Components">\nUseful documentation.\n</Card>\n</CardGroup>',
+ '<Icon icon="book-open" size={32} />',
+ ];
+ const source = `# Gallery\n\n${blocks.join('\n\n')}\n\n## After\n\nKeep this paragraph.\n`;
+ const docName = await setupDoc(page, api, source);
+
+ const expectPreserved = async () => {
+ await expect
+ .poll(() =>
+ page.evaluate(() => {
+ const editor = window.__activeEditor;
+ if (!editor) return null;
+ const sources: string[] = [];
+ editor.state.doc.descendants((node) => {
+ if (node.type.name === 'rawMdxFallback') sources.push(node.textContent);
+ });
+ return sources;
+ }),
+ )
+ .toEqual(blocks);
+ await expect
+ .poll(() =>
+ page.evaluate(() => window.__activeProvider?.document.getText('source').toString()),
+ )
+ .toBe(source);
+ expect(await readFile(join(workerServer.contentDir, `${docName}.md`), 'utf8')).toBe(source);
+ await expect(page.getByRole('heading', { name: 'After', exact: true })).toBeVisible();
+ };
+
+ await expectPreserved();
+ await page.reload();
+ await expectPreserved();
+});
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index b7227837f..1a89d4d63 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1044,9 +1044,11 @@ export {
getParseHealth,
incrementBlockFallback,
incrementBlockGripClickSelectFailed,
+ incrementJsxActionAborted,
incrementJsxArrowNodeSelectFailed,
incrementJsxAutoConvertFailed,
incrementJsxAutoConvertSucceeded,
+ incrementJsxChromeDeleteFailed,
incrementJsxKeyboardDeleteFailed,
incrementJsxMoveFailed,
incrementJsxPopoverCloseRestoreFailed,
@@ -1057,6 +1059,7 @@ export {
incrementWholeDocFallback,
incrementYpsMismatchBlock,
incrementYpsMismatchInline,
+ type JsxNodeAction,
type ParseHealthMetrics,
resetParseHealth,
} from './metrics/parse-health.ts';
diff --git a/packages/core/src/metrics/parse-health.test.ts b/packages/core/src/metrics/parse-health.test.ts
index 236ef55cf..89a791cec 100644
--- a/packages/core/src/metrics/parse-health.test.ts
+++ b/packages/core/src/metrics/parse-health.test.ts
@@ -2,7 +2,10 @@ import { afterEach, beforeEach, describe, expect, test } from 'vitest';
import {
getParseHealth,
incrementBlockFallback,
+ incrementJsxActionAborted,
incrementJsxAutoConvertFailed,
+ incrementJsxChromeDeleteFailed,
+ incrementJsxKeyboardDeleteFailed,
incrementJsxRenderFailure,
incrementWholeDocFallback,
incrementYpsMismatchBlock,
@@ -101,6 +104,36 @@ describe('parse-health metrics', () => {
expect(snap2.jsxRenderFailure.Callout).toBe(2);
});
+ test('action aborts are separate from conversion failures and reset without mutating snapshots', () => {
+ incrementJsxActionAborted('delete-chrome');
+ const snapshot = getParseHealth();
+ incrementJsxActionAborted('delete-chrome');
+ incrementJsxActionAborted('delete-keyboard');
+ expect(getParseHealth().jsxActionAborted).toEqual({
+ 'delete-chrome': 2,
+ 'delete-keyboard': 1,
+ });
+ expect(getParseHealth().jsxAutoConvertFailed).toEqual({});
+ resetParseHealth();
+ expect(getParseHealth().jsxActionAborted).toEqual({});
+ expect(snapshot.jsxActionAborted).toEqual({ 'delete-chrome': 1 });
+ });
+
+ test('chrome and keyboard delete failures remain separate and reset without mutating snapshots', () => {
+ incrementJsxChromeDeleteFailed('Callout');
+ incrementJsxKeyboardDeleteFailed('Callout');
+ incrementJsxChromeDeleteFailed('Callout');
+ const snapshot = getParseHealth();
+ expect(snapshot.jsxChromeDeleteFailed).toEqual({ Callout: 2 });
+ expect(snapshot.jsxKeyboardDeleteFailed).toEqual({ Callout: 1 });
+
+ resetParseHealth();
+ expect(getParseHealth().jsxChromeDeleteFailed).toEqual({});
+ expect(getParseHealth().jsxKeyboardDeleteFailed).toEqual({});
+ expect(snapshot.jsxChromeDeleteFailed).toEqual({ Callout: 2 });
+ expect(snapshot.jsxKeyboardDeleteFailed).toEqual({ Callout: 1 });
+ });
+
test('ypsMismatch counters are bridged via globalThis (CJS patch ↔ ESM)', () => {
type GlobalWithCounters = typeof globalThis & {
__okYpsCounters?: { block: number; inline: number };
diff --git a/packages/core/src/metrics/parse-health.ts b/packages/core/src/metrics/parse-health.ts
index b950584f3..08e97a378 100644
--- a/packages/core/src/metrics/parse-health.ts
+++ b/packages/core/src/metrics/parse-health.ts
@@ -7,6 +7,18 @@ interface YpsCountersHost {
__okYpsCounters?: YpsCounters;
}
+export type JsxNodeAction =
+ | 'move-up'
+ | 'move-down'
+ | 'delete-chrome'
+ | 'delete-keyboard'
+ | 'delete-stuck'
+ | 'comment'
+ | 'open-properties'
+ | 'insert-child'
+ | 'edit-source'
+ | 'edit-properties';
+
function ypsCounters(): YpsCounters {
const host = globalThis as YpsCountersHost;
host.__okYpsCounters ||= { block: 0, inline: 0 };
@@ -19,40 +31,31 @@ export interface ParseHealthMetrics {
jsxRenderFailure: Record<string, number>;
jsxAutoConvertFailed: Record<string, number>;
jsxAutoConvertSucceeded: Record<string, number>;
+ jsxActionAborted: Partial<Record<JsxNodeAction, number>>;
jsxPropDropped: Record<string, number>;
jsxMoveFailed: Record<string, number>;
jsxStuckCopyFailed: Record<string, number>;
jsxStuckDeleteFailed: Record<string, number>;
jsxPopoverCloseRestoreFailed: Record<string, number>;
jsxKeyboardDeleteFailed: Record<string, number>;
+ jsxChromeDeleteFailed: Record<string, number>;
blockGripClickSelectFailed: Record<string, number>;
jsxArrowNodeSelectFailed: Record<string, number>;
}
-const metrics: {
- parseFallback: { blockLevel: number; wholeDoc: number; wholeDocBudget: number };
- jsxRenderFailure: Record<string, number>;
- jsxAutoConvertFailed: Record<string, number>;
- jsxAutoConvertSucceeded: Record<string, number>;
- jsxPropDropped: Record<string, number>;
- jsxMoveFailed: Record<string, number>;
- jsxStuckCopyFailed: Record<string, number>;
- jsxStuckDeleteFailed: Record<string, number>;
- jsxPopoverCloseRestoreFailed: Record<string, number>;
- jsxKeyboardDeleteFailed: Record<string, number>;
- blockGripClickSelectFailed: Record<string, number>;
- jsxArrowNodeSelectFailed: Record<string, number>;
-} = {
+const metrics: Omit<ParseHealthMetrics, 'ypsMismatch'> = {
parseFallback: { blockLevel: 0, wholeDoc: 0, wholeDocBudget: 0 },
jsxRenderFailure: {},
jsxAutoConvertFailed: {},
jsxAutoConvertSucceeded: {},
+ jsxActionAborted: {},
jsxPropDropped: {},
jsxMoveFailed: {},
jsxStuckCopyFailed: {},
jsxStuckDeleteFailed: {},
jsxPopoverCloseRestoreFailed: {},
jsxKeyboardDeleteFailed: {},
+ jsxChromeDeleteFailed: {},
blockGripClickSelectFailed: {},
jsxArrowNodeSelectFailed: {},
};
@@ -82,6 +85,10 @@ export function incrementJsxAutoConvertSucceeded(component: string): void {
(metrics.jsxAutoConvertSucceeded[component] ?? 0) + 1;
}
+export function incrementJsxActionAborted(action: JsxNodeAction): void {
+ metrics.jsxActionAborted[action] = (metrics.jsxActionAborted[action] ?? 0) + 1;
+}
+
export function incrementJsxPropDropped(propName: string): void {
metrics.jsxPropDropped[propName] = (metrics.jsxPropDropped[propName] ?? 0) + 1;
}
@@ -108,6 +115,10 @@ export function incrementJsxKeyboardDeleteFailed(component: string): void {
(metrics.jsxKeyboardDeleteFailed[component] ?? 0) + 1;
}
+export function incrementJsxChromeDeleteFailed(component: string): void {
+ metrics.jsxChromeDeleteFailed[component] = (metrics.jsxChromeDeleteFailed[component] ?? 0) + 1;
+}
+
export function incrementBlockGripClickSelectFailed(nodeType: string): void {
metrics.blockGripClickSelectFailed[nodeType] =
(metrics.blockGripClickSelectFailed[nodeType] ?? 0) + 1;
@@ -136,12 +147,14 @@ export function getParseHealth(): ParseHealthMetrics {
jsxRenderFailure: { ...metrics.jsxRenderFailure },
jsxAutoConvertFailed: { ...metrics.jsxAutoConvertFailed },
jsxAutoConvertSucceeded: { ...metrics.jsxAutoConvertSucceeded },
+ jsxActionAborted: { ...metrics.jsxActionAborted },
jsxPropDropped: { ...metrics.jsxPropDropped },
jsxMoveFailed: { ...metrics.jsxMoveFailed },
jsxStuckCopyFailed: { ...metrics.jsxStuckCopyFailed },
jsxStuckDeleteFailed: { ...metrics.jsxStuckDeleteFailed },
jsxPopoverCloseRestoreFailed: { ...metrics.jsxPopoverCloseRestoreFailed },
jsxKeyboardDeleteFailed: { ...metrics.jsxKeyboardDeleteFailed },
+ jsxChromeDeleteFailed: { ...metrics.jsxChromeDeleteFailed },
blockGripClickSelectFailed: { ...metrics.blockGripClickSelectFailed },
jsxArrowNodeSelectFailed: { ...metrics.jsxArrowNodeSelectFailed },
};
@@ -155,6 +168,7 @@ export function resetParseHealth(): void {
for (const k of Object.keys(metrics.jsxAutoConvertFailed)) delete metrics.jsxAutoConvertFailed[k];
for (const k of Object.keys(metrics.jsxAutoConvertSucceeded))
delete metrics.jsxAutoConvertSucceeded[k];
+ metrics.jsxActionAborted = {};
for (const k of Object.keys(metrics.jsxPropDropped)) delete metrics.jsxPropDropped[k];
for (const k of Object.keys(metrics.jsxMoveFailed)) delete metrics.jsxMoveFailed[k];
for (const k of Object.keys(metrics.jsxStuckCopyFailed)) delete metrics.jsxStuckCopyFailed[k];
@@ -163,6 +177,8 @@ export function resetParseHealth(): void {
delete metrics.jsxPopoverCloseRestoreFailed[k];
for (const k of Object.keys(metrics.jsxKeyboardDeleteFailed))
delete metrics.jsxKeyboardDeleteFailed[k];
+ for (const k of Object.keys(metrics.jsxChromeDeleteFailed))
+ delete metrics.jsxChromeDeleteFailed[k];
for (const k of Object.keys(metrics.blockGripClickSelectFailed))
delete metrics.blockGripClickSelectFailed[k];
for (const k of Object.keys(metrics.jsxArrowNodeSelectFailed))