npm - @payload-onpage/lexical - Versions diffs - 0.2.1 → 0.3.0 - Mend

@payload-onpage/lexical 0.2.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/dist/InlineRichText.d.ts +2 -1
package/dist/InlineRichText.d.ts.map +1 -1
package/dist/InlineRichText.js +21 -29
package/dist/InlineRichText.js.map +1 -1
package/dist/convert.d.ts +9 -1
package/dist/convert.d.ts.map +1 -1
package/dist/convert.js +25 -11
package/dist/convert.js.map +1 -1
package/dist/index.d.ts +1 -1
package/dist/index.d.ts.map +1 -1
package/dist/index.js +14 -1
package/dist/index.js.map +1 -1
package/dist/nodes.d.ts +1 -1
package/dist/nodes.d.ts.map +1 -1
package/dist/nodes.js +19 -3
package/dist/nodes.js.map +1 -1
package/package.json +3 -3
package/src/InlineRichText.tsx +31 -38
package/src/convert.ts +32 -11
package/src/index.ts +2 -2
package/src/nodes.tsx +8 -4

package/dist/InlineRichText.d.ts CHANGED Viewed

@@ -6,8 +6,9 @@
  * editor produced for the untouched content.
  */
 import React from 'react';
+import { type ScalarField } from '@payload-onpage/core';
 import { type FieldEditorProps } from '@payload-onpage/react/editor-kit';
 import { RICH_TEXT_NODES } from './nodeList.ts';
 export { RICH_TEXT_NODES };
-export declare function InlineRichText({ field, value, element, commit, close, ghost, live, point, t, }: FieldEditorProps): React.JSX.Element;
+export declare function InlineRichText({ field, value, element, commit, close, ghost, live, point, t, }: FieldEditorProps<ScalarField>): React.JSX.Element;
 //# sourceMappingURL=InlineRichText.d.ts.map

package/dist/InlineRichText.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"InlineRichText.d.ts","sourceRoot":"","sources":["../src/InlineRichText.tsx"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,OAAO,KAA6E,MAAM,OAAO,CAAA;~~AAsCjG~~,OAAO,EAML,KAAK,gBAAgB,EAEtB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAG/C,OAAO,EAAE,eAAe,EAAE,CAAA;~~AA8V1B~~,wBAAgB,cAAc,CAAC,EAC7B,KAAK,EACL,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,KAAK,EACL,CAAC,GACF,EAAE,gBAAgB,~~qBAyGlB~~"}
1	+ {"version":3,"file":"InlineRichText.d.ts","sourceRoot":"","sources":["../src/InlineRichText.tsx"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,OAAO,KAA6E,MAAM,OAAO,CAAA;AAuCjG,OAAO,EAAyB,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAML,KAAK,gBAAgB,EAEtB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAG/C,OAAO,EAAE,eAAe,EAAE,CAAA;AAqW1B,wBAAgB,cAAc,CAAC,EAC7B,KAAK,EACL,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,KAAK,EACL,CAAC,GACF,EAAE,gBAAgB,CAAC,WAAW,CAAC,qBAyG/B"}

package/dist/InlineRichText.js CHANGED Viewed

@@ -7,7 +7,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Only a real change is written: the value is compared with what the same
  * editor produced for the untouched content.
  */
-import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { LexicalComposer } from '@lexical/react/LexicalComposer';
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
 import { RichTextPlugin } from '@lexical/react/LexicalRichTextPlugin';
@@ -20,16 +20,23 @@ import { $isListNode, INSERT_ORDERED_LIST_COMMAND, INSERT_UNORDERED_LIST_COMMAND
 import { $setBlocksType } from '@lexical/selection';
 import { $findMatchingParent } from '@lexical/utils';
 import { $createParagraphNode, $createRangeSelectionFromDom, $getNearestNodeFromDOMNode, $getRoot, $getSelection, $isRangeSelection, $isTextNode, $setSelection, FORMAT_TEXT_COMMAND, REDO_COMMAND, UNDO_COMMAND, } from 'lexical';
-import { eachLexicalNode, newRowId, safeLinkUrl } from '@payload-onpage/core';
+import { newRowId, safeLinkUrl } from '@payload-onpage/core';
 import { HIDDEN, caretAt, placeOver, useEvent, useTrackElement, } from '@payload-onpage/react/editor-kit';
 import { $createPayloadLinkNode, $isPayloadLinkNode } from "./nodes.js";
 import { RICH_TEXT_NODES } from "./nodeList.js";
-import { fromEditorState, plainText, toEditorState } from "./convert.js";
+import { fromEditorState, hasOpaque, plainText, toEditorState } from "./convert.js";
 export { RICH_TEXT_NODES };
+const EMPTY_TOOLBAR = {
+    bold: false,
+    italic: false,
+    underline: false,
+    block: 'paragraph',
+    link: false,
+};
 function readToolbarState() {
     const sel = $getSelection();
     if (!$isRangeSelection(sel))
-        return { bold: false, italic: false, underline: false, block: 'paragraph', link: false };
+        return EMPTY_TOOLBAR;
     const anchor = sel.anchor.getNode();
     const top = anchor.getKey() === 'root' ? anchor : anchor.getTopLevelElementOrThrow();
     const list = $findMatchingParent(anchor, $isListNode);
@@ -75,8 +82,10 @@ function currentLinkUrl(editor) {
     });
     return url;
 }
-/** Link the selection to `url`; an empty url removes the link around it. */
-/** Link the selection; returns false (and changes nothing) for an unsafe URL such as `javascript:`. */
+/**
+ * Link the selection to `url`; an empty url removes the link around it. Returns
+ * false (and changes nothing) for an unsafe URL such as `javascript:`.
+ */
 function applyLink(editor, rawUrl, saved) {
     const url = rawUrl.trim();
     if (url && !safeLinkUrl(url))
@@ -89,7 +98,9 @@ function applyLink(editor, rawUrl, saved) {
         if (!$isRangeSelection(sel))
             return;
         const nodes = sel.extract();
-        const existing = nodes.map((n) => $findMatchingParent(n, $isPayloadLinkNode)).find(Boolean);
+        const existing = nodes
+            .map((n) => $findMatchingParent(n, $isPayloadLinkNode))
+            .find((n) => n !== null);
         if (existing) {
             if (!url) {
                 for (const child of existing.getChildren())
@@ -127,13 +138,7 @@ function ToolButton({ label, title, pressed = false, onAction, id, }) {
 }
 function Toolbar({ onDone, t }) {
     const [editor] = useLexicalComposerContext();
-    const [state, setState] = useState({
-        bold: false,
-        italic: false,
-        underline: false,
-        block: 'paragraph',
-        link: false,
-    });
+    const [state, setState] = useState(EMPTY_TOOLBAR);
     const [linkDraft, setLinkDraft] = useState(null);
     const savedSelection = useRef(null);
     const [linkError, setLinkError] = useState(false);
@@ -182,7 +187,7 @@ function Toolbar({ onDone, t }) {
                                 e.stopPropagation();
                                 setLinkDraft(null);
                             }
-                        }, "data-testid": "onpage-rt-link-input" }), _jsx("button", { type: "button", className: "po-btn", onMouseDown: (e) => e.preventDefault(), onClick: saveLink, "data-testid": "onpage-rt-link-apply", children: "Apply" })] }))] }));
+                        }, "data-testid": "onpage-rt-link-input" }), _jsx("button", { type: "button", className: "po-btn", onMouseDown: (e) => e.preventDefault(), onClick: saveLink, "data-testid": "onpage-rt-link-apply", children: t('rt.linkApply') })] }))] }));
 }
 /**
  * Grabs the editor instance and puts the caret where the user clicked —
@@ -204,7 +209,7 @@ function Bridge({ onReady, point, }) {
             root.focus({ preventScroll: true });
             editor.update(() => {
                 const node = hit ? $getNearestNodeFromDOMNode(hit.node) : null;
-                if (node && $isTextNode(node))
+                if (hit && $isTextNode(node))
                     node.select(hit.offset, hit.offset);
                 else
                     $getRoot().selectEnd();
@@ -295,17 +300,4 @@ export function InlineRichText({ field, value, element, commit, close, ghost, li
                 theme: { text: { bold: 'po-b', italic: 'po-i', underline: 'po-u' } },
             }, children: [_jsx(Toolbar, { onDone: () => finish(true), t: t }), _jsx(RichTextPlugin, { contentEditable: _jsx(ContentEditable, { className: `${className} po-rt-surface`, "aria-label": t('inline.label', { field: field.label }) }), ErrorBoundary: LexicalErrorBoundary }), _jsx(HistoryPlugin, {}), _jsx(ListPlugin, {}), _jsx(Bridge, { onReady: onReady, point: point })] }) }));
 }
-/** Does the value hold nodes the editor shows as placeholders (uploads, blocks…)? Then it isn't empty. */
-function hasOpaque(state) {
-    let found = false;
-    eachLexicalNode(state, (n) => {
-        if (n.type !== 'root' &&
-            n.type !== 'paragraph' &&
-            n.type !== 'text' &&
-            n.type !== 'linebreak' &&
-            !n.children)
-            found = true;
-    });
-    return found;
-}
 //# sourceMappingURL=InlineRichText.js.map

package/dist/InlineRichText.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"InlineRichText.js","sourceRoot":"","sources":["../src/InlineRichText.tsx"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"InlineRichText.js","sourceRoot":"","sources":["../src/InlineRichText.tsx"],"names":[],"mappings":"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"}

package/dist/convert.d.ts CHANGED Viewed

@@ -4,12 +4,20 @@
  * unwrapped on the way out, byte-for-byte.
  */
 import { type LexicalState } from '@payload-onpage/core';
+import type { SerializedEditorState } from 'lexical';
 export declare const EDITABLE_NODE_TYPES: Set<string>;
 export type RichTextState = LexicalState;
 export declare const EMPTY_STATE: RichTextState;
 export declare function isRichTextState(value: unknown): value is RichTextState;
 export declare function toEditorState(value: unknown): RichTextState;
-export declare function fromEditorState(state: RichTextState): RichTextState;
+/**
+ * The editor's state (`editorState.toJSON()`) back to Payload JSON, unwrapping
+ * placeholders. Lexical's serialized types are closed interfaces, so they are
+ * read through our open `LexicalState` here, once, instead of at every caller.
+ */
+export declare function fromEditorState(state: SerializedEditorState | RichTextState): RichTextState;
 /** Plain text of a state (used to treat a blank editor as "no value"). */
 export declare function plainText(state: RichTextState): string;
+/** Does the value hold nodes the editor shows as placeholders (uploads, blocks…)? Then it isn't empty. */
+export declare function hasOpaque(state: RichTextState): boolean;
 //# sourceMappingURL=convert.d.ts.map

package/dist/convert.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,~~EAAqC~~,KAAK,YAAY,~~EAAE~~,MAAM,sBAAsB,CAAA;~~AAG3F~~,eAAO,MAAM,mBAAmB,aAW9B,CAAA;AAGF,MAAM,MAAM,aAAa,GAAG,YAAY,CAAA;AAExC,eAAO,MAAM,WAAW,EAAE,aAWzB,CAAA;~~AAYD~~,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAItE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,~~CAM3D~~;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,~~CAEnE~~;AAED,0EAA0E;AAC1E,wBAAgB,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAMtD"}
1	+ {"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAGpD,eAAO,MAAM,mBAAmB,aAW9B,CAAA;AAGF,MAAM,MAAM,aAAa,GAAG,YAAY,CAAA;AAExC,eAAO,MAAM,WAAW,EAAE,aAWzB,CAAA;AASD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,aAAa,CAItE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,CAS3D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,qBAAqB,GAAG,aAAa,GAAG,aAAa,CAG3F;AAED,0EAA0E;AAC1E,wBAAgB,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAMtD;AAED,0GAA0G;AAC1G,wBAAgB,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAMvD"}

package/dist/convert.js CHANGED Viewed

@@ -3,7 +3,7 @@
  * through as-is; everything else is wrapped in an OpaqueNode on the way in and
  * unwrapped on the way out, byte-for-byte.
  */
-import { eachLexicalNode } from '@payload-onpage/core';
+import { eachLexicalNode, mapLexical, } from '@payload-onpage/core';
 import { OPAQUE_TYPE } from "./constants.js";
 export const EDITABLE_NODE_TYPES = new Set([
     'root',
@@ -29,29 +29,34 @@ export const EMPTY_STATE = {
         ],
     },
 };
+// Hand-written (not mapLexical): it must stop descending at a node it wraps, so
+// everything inside a placeholder stays byte-for-byte.
 function wrap(node) {
     if (!EDITABLE_NODE_TYPES.has(node.type))
         return { type: OPAQUE_TYPE, version: 1, data: node };
     return Array.isArray(node.children) ? { ...node, children: node.children.map(wrap) } : node;
 }
-function unwrap(node) {
-    if (node.type === OPAQUE_TYPE)
-        return node.data;
-    return Array.isArray(node.children) ? { ...node, children: node.children.map(unwrap) } : node;
-}
 export function isRichTextState(value) {
     return (!!value && typeof value === 'object' && value.root?.type === 'root');
 }
 export function toEditorState(value) {
     const state = isRichTextState(value) ? value : EMPTY_STATE;
     const root = wrap(state.root);
-    // Lexical needs at least one block child to place a caret.
-    if (!root.children?.length)
-        root.children = EMPTY_STATE.root.children;
-    return { root };
+    // Lexical needs at least one block child to place a caret. Build a new root:
+    // wrap() returns the input itself when there's nothing to wrap, and the empty
+    // children must never be shared between documents.
+    return root.children?.length
+        ? { root }
+        : { root: { ...root, children: structuredClone(EMPTY_STATE.root.children ?? []) } };
 }
+/**
+ * The editor's state (`editorState.toJSON()`) back to Payload JSON, unwrapping
+ * placeholders. Lexical's serialized types are closed interfaces, so they are
+ * read through our open `LexicalState` here, once, instead of at every caller.
+ */
 export function fromEditorState(state) {
-    return { root: unwrap(state.root) };
+    const open = state;
+    return mapLexical(open, (n) => (n.type === OPAQUE_TYPE ? n.data : n));
 }
 /** Plain text of a state (used to treat a blank editor as "no value"). */
 export function plainText(state) {
@@ -62,4 +67,13 @@ export function plainText(state) {
     });
     return parts.join('').trim();
 }
+/** Does the value hold nodes the editor shows as placeholders (uploads, blocks…)? Then it isn't empty. */
+export function hasOpaque(state) {
+    let found = false;
+    eachLexicalNode(state, (n) => {
+        if (!EDITABLE_NODE_TYPES.has(n.type))
+            found = true;
+    });
+    return found;
+}
 //# sourceMappingURL=convert.js.map

package/dist/convert.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"convert.js","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,~~EAAE~~,eAAe,~~EAAuC~~,MAAM,sBAAsB,CAAA;~~AAC3F~~,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IACzC,MAAM;IACN,WAAW;IACX,SAAS;IACT,OAAO;IACP,MAAM;IACN,UAAU;IACV,MAAM;IACN,WAAW;IACX,KAAK;IACL,MAAM;CACP,CAAC,CAAA;AAKF,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,IAAI,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,CAAC;QACT,SAAS,EAAE,IAAI;QACf,QAAQ,EAAE;YACR,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;SACxF;KACF;CACF,CAAA;AAED,SAAS,IAAI,CAAC,IAAU;IACtB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IAC7F,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAC7F,CAAC;AAED,~~SAAS,~~MAAM,CAAC,IAAU;IACxB,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC,IAAY,CAAA;IACvD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAC/F,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,OAAO,CACL,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAgC,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAChG,CAAA;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAA;IAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC7B,~~2DAA2D~~;~~IAC3D~~,~~IAAI~~,~~CAAC~~,IAAI,CAAC,QAAQ,EAAE,MAAM;~~QAAE~~,IAAI,CAAC,~~QAAQ~~,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,~~CAAA;IACrE~~,~~OAAO,~~EAAE,~~IAAI~~,EAAE,CAAA;~~AACjB~~,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,~~KAAoB~~;~~IAClD~~,OAAO,~~EAAE~~,IAAI,EAAE,~~MAAM~~,CAAC,~~KAAK~~,CAAC,IAAI,CAAC,~~EAAE~~,CAAA;~~AACrC~~,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,SAAS,CAAC,KAAoB;IAC5C,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;QAC3B,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;YAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;AAC9B,CAAC"}
1	+ {"version":3,"file":"convert.js","sourceRoot":"","sources":["../src/convert.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts CHANGED Viewed

@@ -10,7 +10,7 @@
  * (uploads, blocks, relationships…) are kept as-is and shown as placeholders.
  * The editor component and its nodes are in `@payload-onpage/lexical/editor`.
  */
-import type { EditorRegistry } from '@payload-onpage/react/editor-kit';
+import { type EditorRegistry } from '@payload-onpage/react/editor-kit';
 export declare const lexicalEditors: EditorRegistry;
 export { toEditorState, fromEditorState, plainText, isRichTextState, type RichTextState, } from './convert.ts';
 export { OPAQUE_TYPE } from './constants.ts';

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,~~EAAE,~~cAAc,EAAE,MAAM,kCAAkC,CAAA;~~AAOtE~~,eAAO,MAAM,cAAc,EAAE,cAE5B,CAAA;AAED,OAAO,EACL,aAAa,EACb,eAAe,EACf,SAAS,EACT,eAAe,EACf,KAAK,aAAa,GACnB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAOpF,eAAO,MAAM,cAAc,EAAE,cAE5B,CAAA;AAED,OAAO,EACL,aAAa,EACb,eAAe,EACf,SAAS,EACT,eAAe,EACf,KAAK,aAAa,GACnB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/index.js CHANGED Viewed

@@ -1,8 +1,21 @@
 'use client';
+/**
+ * @payload-onpage/lexical — inline rich-text editing for Payload's Lexical
+ * richText fields.
+ *
+ *   <OnPageEditor editors={lexicalEditors} … />   // the Next adapter includes it by default
+ *
+ * Light by design: the Lexical editor itself (~75 KB gz with Lexical) loads
+ * only when someone opens a rich-text field. It reads and writes Payload's
+ * Lexical JSON; links keep Payload's shape, and nodes it doesn't edit
+ * (uploads, blocks, relationships…) are kept as-is and shown as placeholders.
+ * The editor component and its nodes are in `@payload-onpage/lexical/editor`.
+ */
+import { defineEditor } from '@payload-onpage/react/editor-kit';
 import { lazy } from 'react';
 const InlineRichText = lazy(() => import("./InlineRichText.js").then((m) => ({ default: m.InlineRichText })));
 export const lexicalEditors = {
-    richText: { mode: 'inline', component: InlineRichText },
+    richText: defineEditor({ mode: 'inline', accepts: ['richText'], component: InlineRichText }),
 };
 export { toEditorState, fromEditorState, plainText, isRichTextState, } from "./convert.js";
 export { OPAQUE_TYPE } from "./constants.js";

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;~~AAeZ~~,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAE5B,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAC/B,MAAM,CAAC,qBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAC5E,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAmB;IAC5C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE;~~CACxD~~,CAAA;AAED,OAAO,EACL,aAAa,EACb,eAAe,EACf,SAAS,EACT,eAAe,GAEhB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,YAAY,EAAuB,MAAM,kCAAkC,CAAA;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAE5B,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAC/B,MAAM,CAAC,qBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAC5E,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAmB;IAC5C,QAAQ,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;CAC7F,CAAA;AAED,OAAO,EACL,aAAa,EACb,eAAe,EACf,SAAS,EACT,eAAe,GAEhB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/nodes.d.ts CHANGED Viewed

@@ -25,7 +25,7 @@ export type SerializedPayloadLinkNode = Spread<{
 }, SerializedElementNode>;
 export declare class PayloadLinkNode extends ElementNode {
     __fields: PayloadLinkFields;
-    __linkId?: string;
+    __linkId: string | undefined;
     static getType(): string;
     static clone(node: PayloadLinkNode): PayloadLinkNode;
     constructor(fields?: PayloadLinkFields, id?: string, key?: NodeKey);

package/dist/nodes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../src/nodes.tsx"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,MAAM,OAAO,CAAA;~~AACzB~~,OAAO,EACL,aAAa,EACb,WAAW,EACX,KAAK,WAAW,EAChB,KAAK,OAAO,EACZ,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,MAAM,EACZ,MAAM,SAAS,CAAA;AAEhB,MAAM,WAAW,iBAAiB;IAChC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAC5C;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EACzE,qBAAqB,CACtB,CAAA;AAED,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,QAAQ,EAAE,iBAAiB,CAAA;IAC3B,QAAQ,~~CAAC,~~EAAE,MAAM,CAAA;~~WAED~~,OAAO,IAAI,MAAM;WAIjB,KAAK,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe;gBAIjD,MAAM,GAAE,iBAAsB,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO;IAM7D,SAAS,IAAI,WAAW;IAWxB,SAAS,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO;WAcpD,UAAU,CAAC,IAAI,EAAE,yBAAyB,GAAG,eAAe;~~IAInE~~,UAAU,IAAI,yBAAyB;~~IAUhD~~,SAAS,IAAI,iBAAiB;IAI9B,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAMjC,QAAQ,IAAI,OAAO;IAInB,UAAU,IAAI,OAAO;IAIrB,mBAAmB,IAAI,OAAO;IAI9B,kBAAkB,IAAI,OAAO;CAGvC;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,eAAe,CAE9F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,IAAI,eAAe,CAEhG;AAID,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,EAAE,WAAW,EAAE,CAAA;AAGtB,MAAM,MAAM,oBAAoB,GAAG,MAAM,CACvC;IAAE,IAAI,EAAE,OAAO,WAAW,CAAC;IAAC,OAAO,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,EAC1D,qBAAqB,CACtB,CAAA;AAED,yDAAyD;AACzD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,GAAG,MAAM,CAAA;IAChD,MAAM,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAmBrD;AAED,qBAAa,UAAW,SAAQ,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC;IAC5D,MAAM,EAAE,UAAU,CAAA;WAEF,OAAO,IAAI,MAAM;WAIjB,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU;gBAIvC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,OAAO;IAKlC,SAAS,IAAI,WAAW;IAIxB,SAAS,IAAI,OAAO;IAIpB,QAAQ,IAAI,OAAO;WAIZ,UAAU,CAAC,IAAI,EAAE,oBAAoB,GAAG,UAAU;IAIzD,UAAU,IAAI,oBAAoB;IAIlC,QAAQ,IAAI,KAAK,CAAC,SAAS;CAOrC"}
1	+ {"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../src/nodes.tsx"],"names":[],"mappings":"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"}

package/dist/nodes.js CHANGED Viewed

@@ -1,5 +1,18 @@
 'use client';
 import { jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * Lexical nodes for editing Payload rich text in place.
+ *
+ *  - PayloadLinkNode — Payload stores links as
+ *      { type: "link", id, fields: { url, newTab, linkType, doc? }, children, … }
+ *    (not @lexical/link's { url, rel, target }). This node reads and writes that
+ *    shape, keeping `id` and every key in `fields`.
+ *  - OpaqueNode — any node type we don't edit (upload, block, relationship,
+ *    horizontalrule…) is carried through untouched and shown as a locked chip,
+ *    so editing a paragraph never loses an image or embed.
+ */
+import React from 'react';
+import { newRowId } from '@payload-onpage/core';
 import { DecoratorNode, ElementNode, } from 'lexical';
 export class PayloadLinkNode extends ElementNode {
     __fields;
@@ -41,15 +54,18 @@ export class PayloadLinkNode extends ElementNode {
         return false;
     }
     static importJSON(json) {
-        return $createPayloadLinkNode(json.fields ?? {}, json.id).updateFromJSON(json);
+        // We always export version 3, which Payload expects to carry an id; it only
+        // mints one itself when importing version 2. Give older links one here.
+        return $createPayloadLinkNode(json.fields ?? {}, json.id || newRowId()).updateFromJSON(json);
     }
     exportJSON() {
+        const latest = this.getLatest();
         return {
             ...super.exportJSON(),
             type: 'link',
             version: 3,
-            fields: { ...this.getLatest().__fields },
-            ...(this.getLatest().__linkId ? { id: this.getLatest().__linkId } : {}),
+            fields: { ...latest.__fields },
+            ...(latest.__linkId ? { id: latest.__linkId } : {}),
         };
     }
     getFields() {

package/dist/nodes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nodes.js","sourceRoot":"","sources":["../src/nodes.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;;~~AAcZ~~,OAAO,EACL,aAAa,EACb,WAAW,GAMZ,MAAM,SAAS,CAAA;AAchB,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC9C,QAAQ,CAAmB;IAC3B,QAAQ,~~CAAS~~;~~IAEjB~~,MAAM,CAAU,OAAO;QACrB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,IAAqB;QACzC,OAAO,IAAI,eAAe,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IAC7E,CAAC;IAED,YAAY,SAA4B,EAAE,EAAE,EAAW,EAAE,GAAa;QACpE,KAAK,CAAC,GAAG,CAAC,CAAA;QACV,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAA;QACtB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAA;IACpB,CAAC;IAEQ,SAAS;QAChB,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QACrC,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,CAAA;QAChD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACzB,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAClC,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAA;QAC9C,CAAC;QACD,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAA;QACtD,OAAO,CAAC,CAAA;IACV,CAAC;IAEQ,SAAS,CAAC,IAAqB,EAAE,GAAgB;QACxD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,GAAG;YAAE,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,CAAA;QAC/F,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACzB,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;gBACpC,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAA;YAChD,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;gBAC7B,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,CAAU,UAAU,CAAC,IAA+B;QACxD,OAAO,sBAAsB,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;~~IAChF~~,CAAC;IAEQ,UAAU;QACjB,OAAO;YACL,GAAG,KAAK,CAAC,UAAU,EAAE;YACrB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,EAAE,GAAG,~~IAAI~~,CAAC,~~SAAS,EAAE,CAAC,~~QAAQ,EAAE;~~YACxC~~,GAAG,CAAC,~~IAAI~~,CAAC,~~SAAS,EAAE,CAAC,~~QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,~~IAAI~~,CAAC,~~SAAS,EAAE,CAAC,~~QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;~~SACxE~~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"}
1	+ {"version":3,"file":"nodes.js","sourceRoot":"","sources":["../src/nodes.tsx"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@payload-onpage/lexical",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "payload-onpage rich-text field editor: inline Lexical editing compatible with Payload's Lexical JSON.",
   "license": "MIT",
   "type": "module",
@@ -53,8 +53,8 @@
     "provenance": true
   },
   "dependencies": {
-    "@payload-onpage/core": "0.2.1",
-    "@payload-onpage/react": "0.2.1"
+    "@payload-onpage/core": "0.3.0",
+    "@payload-onpage/react": "0.3.0"
   },
   "peerDependencies": {
     "@lexical/list": "~0.50.0",

package/src/InlineRichText.tsx CHANGED Viewed

@@ -20,12 +20,14 @@ import {
   $createQuoteNode,
   $isHeadingNode,
   $isQuoteNode,
+  type HeadingTagType,
 } from '@lexical/rich-text'
 import {
   $isListNode,
   INSERT_ORDERED_LIST_COMMAND,
   INSERT_UNORDERED_LIST_COMMAND,
   REMOVE_LIST_COMMAND,
+  type ListType,
 } from '@lexical/list'
 import { $setBlocksType } from '@lexical/selection'
 import { $findMatchingParent } from '@lexical/utils'
@@ -44,7 +46,7 @@ import {
   UNDO_COMMAND,
   type LexicalEditor,
 } from 'lexical'
-import { eachLexicalNode, newRowId, safeLinkUrl } from '@payload-onpage/core'
+import { newRowId, safeLinkUrl, type ScalarField } from '@payload-onpage/core'
 import {
   HIDDEN,
   caretAt,
@@ -56,26 +58,36 @@ import {
 } from '@payload-onpage/react/editor-kit'
 import { $createPayloadLinkNode, $isPayloadLinkNode, type PayloadLinkNode } from './nodes.tsx'
 import { RICH_TEXT_NODES } from './nodeList.ts'
-import { fromEditorState, plainText, toEditorState, type RichTextState } from './convert.ts'
+import { fromEditorState, hasOpaque, plainText, toEditorState } from './convert.ts'
 export { RICH_TEXT_NODES }
+/** The block the selection is in, as the toolbar shows it. */
+type BlockKind = 'paragraph' | 'quote' | HeadingTagType | `list-${ListType}`
 interface ToolbarState {
   bold: boolean
   italic: boolean
   underline: boolean
-  block: string
+  block: BlockKind
   link: boolean
 }
+const EMPTY_TOOLBAR: ToolbarState = {
+  bold: false,
+  italic: false,
+  underline: false,
+  block: 'paragraph',
+  link: false,
+}
 function readToolbarState(): ToolbarState {
   const sel = $getSelection()
-  if (!$isRangeSelection(sel))
-    return { bold: false, italic: false, underline: false, block: 'paragraph', link: false }
+  if (!$isRangeSelection(sel)) return EMPTY_TOOLBAR
   const anchor = sel.anchor.getNode()
   const top = anchor.getKey() === 'root' ? anchor : anchor.getTopLevelElementOrThrow()
   const list = $findMatchingParent(anchor, $isListNode)
-  const block = list
+  const block: BlockKind = list
     ? `list-${list.getListType()}`
     : $isHeadingNode(top)
       ? top.getTag()
@@ -121,8 +133,10 @@ function currentLinkUrl(editor: LexicalEditor): string | undefined {
   return url
 }
-/** Link the selection to `url`; an empty url removes the link around it. */
-/** Link the selection; returns false (and changes nothing) for an unsafe URL such as `javascript:`. */
+/**
+ * Link the selection to `url`; an empty url removes the link around it. Returns
+ * false (and changes nothing) for an unsafe URL such as `javascript:`.
+ */
 function applyLink(editor: LexicalEditor, rawUrl: string, saved: BaseSelection | null): boolean {
   const url = rawUrl.trim()
   if (url && !safeLinkUrl(url)) return false
@@ -132,8 +146,9 @@ function applyLink(editor: LexicalEditor, rawUrl: string, saved: BaseSelection |
     const sel = $getSelection()
     if (!$isRangeSelection(sel)) return
     const nodes = sel.extract()
-    const existing = nodes.map((n) => $findMatchingParent(n, $isPayloadLinkNode)).find(Boolean) as
-      PayloadLinkNode | undefined
+    const existing = nodes
+      .map((n) => $findMatchingParent(n, $isPayloadLinkNode))
+      .find((n): n is PayloadLinkNode => n !== null)
     if (existing) {
       if (!url) {
         for (const child of existing.getChildren()) existing.insertBefore(child)
@@ -197,13 +212,7 @@ function ToolButton({
 function Toolbar({ onDone, t }: { onDone: () => void; t: Translate }) {
   const [editor] = useLexicalComposerContext()
-  const [state, setState] = useState<ToolbarState>({
-    bold: false,
-    italic: false,
-    underline: false,
-    block: 'paragraph',
-    link: false,
-  })
+  const [state, setState] = useState<ToolbarState>(EMPTY_TOOLBAR)
   const [linkDraft, setLinkDraft] = useState<string | null>(null)
   const savedSelection = useRef<BaseSelection | null>(null)
   const [linkError, setLinkError] = useState(false)
@@ -360,7 +369,7 @@ function Toolbar({ onDone, t }: { onDone: () => void; t: Translate }) {
             onClick={saveLink}
             data-testid="onpage-rt-link-apply"
           >
-            Apply
+            {t('rt.linkApply')}
           </button>
         </span>
       )}
@@ -378,7 +387,7 @@ function Bridge({
   point,
 }: {
   onReady: (editor: LexicalEditor) => void
-  point?: { x: number; y: number }
+  point?: { x: number; y: number } | undefined
 }) {
   const [editor] = useLexicalComposerContext()
   useEffect(() => {
@@ -396,7 +405,7 @@ function Bridge({
           editor.update(
             () => {
               const node = hit ? $getNearestNodeFromDOMNode(hit.node) : null
-              if (node && $isTextNode(node)) node.select(hit!.offset, hit!.offset)
+              if (hit && $isTextNode(node)) node.select(hit.offset, hit.offset)
               else $getRoot().selectEnd()
             },
             { discrete: true },
@@ -418,7 +427,7 @@ export function InlineRichText({
   live,
   point,
   t,
-}: FieldEditorProps) {
+}: FieldEditorProps<ScalarField>) {
   const box = useRef<HTMLDivElement>(null)
   const editorRef = useRef<LexicalEditor | null>(null)
   const baseline = useRef<string | null>(null)
@@ -457,7 +466,7 @@ export function InlineRichText({
     done.current = true
     const editor = editorRef.current
     if (save && editor) {
-      const json = editor.getEditorState().toJSON() as unknown as RichTextState
+      const json = editor.getEditorState().toJSON()
       if (JSON.stringify(json) !== baseline.current) {
         const next = fromEditorState(json)
         commit(plainText(next) || hasOpaque(next) ? next : null)
@@ -524,19 +533,3 @@ export function InlineRichText({
     </div>
   )
 }
-/** Does the value hold nodes the editor shows as placeholders (uploads, blocks…)? Then it isn't empty. */
-function hasOpaque(state: RichTextState): boolean {
-  let found = false
-  eachLexicalNode(state, (n) => {
-    if (
-      n.type !== 'root' &&
-      n.type !== 'paragraph' &&
-      n.type !== 'text' &&
-      n.type !== 'linebreak' &&
-      !n.children
-    )
-      found = true
-  })
-  return found
-}

package/src/convert.ts CHANGED Viewed

@@ -3,7 +3,13 @@
  * through as-is; everything else is wrapped in an OpaqueNode on the way in and
  * unwrapped on the way out, byte-for-byte.
  */
-import { eachLexicalNode, type LexicalNode, type LexicalState } from '@payload-onpage/core'
+import {
+  eachLexicalNode,
+  mapLexical,
+  type LexicalNode,
+  type LexicalState,
+} from '@payload-onpage/core'
+import type { SerializedEditorState } from 'lexical'
 import { OPAQUE_TYPE } from './constants.ts'
 export const EDITABLE_NODE_TYPES = new Set([
@@ -35,16 +41,13 @@ export const EMPTY_STATE: RichTextState = {
   },
 }
+// Hand-written (not mapLexical): it must stop descending at a node it wraps, so
+// everything inside a placeholder stays byte-for-byte.
 function wrap(node: Node): Node {
   if (!EDITABLE_NODE_TYPES.has(node.type)) return { type: OPAQUE_TYPE, version: 1, data: node }
   return Array.isArray(node.children) ? { ...node, children: node.children.map(wrap) } : node
 }
-function unwrap(node: Node): Node {
-  if (node.type === OPAQUE_TYPE) return node.data as Node
-  return Array.isArray(node.children) ? { ...node, children: node.children.map(unwrap) } : node
-}
 export function isRichTextState(value: unknown): value is RichTextState {
   return (
     !!value && typeof value === 'object' && (value as Partial<RichTextState>).root?.type === 'root'
@@ -54,13 +57,22 @@ export function isRichTextState(value: unknown): value is RichTextState {
 export function toEditorState(value: unknown): RichTextState {
   const state = isRichTextState(value) ? value : EMPTY_STATE
   const root = wrap(state.root)
-  // Lexical needs at least one block child to place a caret.
-  if (!root.children?.length) root.children = EMPTY_STATE.root.children
-  return { root }
+  // Lexical needs at least one block child to place a caret. Build a new root:
+  // wrap() returns the input itself when there's nothing to wrap, and the empty
+  // children must never be shared between documents.
+  return root.children?.length
+    ? { root }
+    : { root: { ...root, children: structuredClone(EMPTY_STATE.root.children ?? []) } }
 }
-export function fromEditorState(state: RichTextState): RichTextState {
-  return { root: unwrap(state.root) }
+/**
+ * The editor's state (`editorState.toJSON()`) back to Payload JSON, unwrapping
+ * placeholders. Lexical's serialized types are closed interfaces, so they are
+ * read through our open `LexicalState` here, once, instead of at every caller.
+ */
+export function fromEditorState(state: SerializedEditorState | RichTextState): RichTextState {
+  const open = state as unknown as RichTextState
+  return mapLexical(open, (n) => (n.type === OPAQUE_TYPE ? (n.data as Node) : n))
 }
 /** Plain text of a state (used to treat a blank editor as "no value"). */
@@ -71,3 +83,12 @@ export function plainText(state: RichTextState): string {
   })
   return parts.join('').trim()
 }
+/** Does the value hold nodes the editor shows as placeholders (uploads, blocks…)? Then it isn't empty. */
+export function hasOpaque(state: RichTextState): boolean {
+  let found = false
+  eachLexicalNode(state, (n) => {
+    if (!EDITABLE_NODE_TYPES.has(n.type)) found = true
+  })
+  return found
+}

package/src/index.ts CHANGED Viewed

@@ -12,7 +12,7 @@
  * (uploads, blocks, relationships…) are kept as-is and shown as placeholders.
  * The editor component and its nodes are in `@payload-onpage/lexical/editor`.
  */
-import type { EditorRegistry } from '@payload-onpage/react/editor-kit'
+import { defineEditor, type EditorRegistry } from '@payload-onpage/react/editor-kit'
 import { lazy } from 'react'
 const InlineRichText = lazy(() =>
@@ -20,7 +20,7 @@ const InlineRichText = lazy(() =>
 )
 export const lexicalEditors: EditorRegistry = {
-  richText: { mode: 'inline', component: InlineRichText },
+  richText: defineEditor({ mode: 'inline', accepts: ['richText'], component: InlineRichText }),
 }
 export {

package/src/nodes.tsx CHANGED Viewed

@@ -12,6 +12,7 @@
  *    so editing a paragraph never loses an image or embed.
  */
 import React from 'react'
+import { newRowId } from '@payload-onpage/core'
 import {
   DecoratorNode,
   ElementNode,
@@ -36,7 +37,7 @@ export type SerializedPayloadLinkNode = Spread<
 export class PayloadLinkNode extends ElementNode {
   __fields: PayloadLinkFields
-  __linkId?: string
+  __linkId: string | undefined
   static override getType(): string {
     return 'link'
@@ -78,16 +79,19 @@ export class PayloadLinkNode extends ElementNode {
   }
   static override importJSON(json: SerializedPayloadLinkNode): PayloadLinkNode {
-    return $createPayloadLinkNode(json.fields ?? {}, json.id).updateFromJSON(json)
+    // We always export version 3, which Payload expects to carry an id; it only
+    // mints one itself when importing version 2. Give older links one here.
+    return $createPayloadLinkNode(json.fields ?? {}, json.id || newRowId()).updateFromJSON(json)
   }
   override exportJSON(): SerializedPayloadLinkNode {
+    const latest = this.getLatest()
     return {
       ...super.exportJSON(),
       type: 'link',
       version: 3,
-      fields: { ...this.getLatest().__fields },
-      ...(this.getLatest().__linkId ? { id: this.getLatest().__linkId } : {}),
+      fields: { ...latest.__fields },
+      ...(latest.__linkId ? { id: latest.__linkId } : {}),
     }
   }