@apollohg/react-native-prose-editor 0.5.19 → 0.5.21

package/dist/NativeRichTextEditor.js

@@ -64,6 +64,25 @@ function isImageDataUrl(value) {
 function isRetryableNativeCommandBlock(reason) {
     return reason === 'composition' || (react_native_1.Platform.OS === 'android' && reason === 'pendingUpdate');
 }
+function restoreSelectionInBridge(bridge, selection) {
+    if (selection.type === 'text') {
+        const { anchor, head } = selection;
+        if (anchor == null || head == null) {
+            return false;
+        }
+        bridge.setSelection(anchor, head);
+        return true;
+    }
+    if (selection.type === 'node') {
+        const { pos } = selection;
+        if (pos == null) {
+            return false;
+        }
+        bridge.setSelection(pos, pos);
+        return true;
+    }
+    return false;
+}
 function isPromiseLike(value) {
     return (value != null &&
         typeof value === 'object' &&
@@ -543,23 +562,35 @@ function doesLiveMentionQueryConflictWithNativeSelectRequest(request, currentQue
         currentQuery.range.anchor !== request.range.anchor ||
         currentQuery.range.head !== request.range.head);
 }
-exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEditor({ initialContent, initialJSON, value, valueJSON, valueJSONRevision, schema, placeholder, editable = true, maxLength, autoFocus = false, autoCapitalize, autoCorrect, keyboardType, heightBehavior = 'autoGrow', showToolbar = true, toolbarPlacement = 'keyboard', toolbarItems = EditorToolbar_1.DEFAULT_EDITOR_TOOLBAR_ITEMS, onToolbarAction, onRequestLink, onRequestImage, autoDetectLinks = false, onContentChange, onContentChangeJSON, onSelectionChange, onActiveStateChange, onHistoryStateChange, onFocus, onBlur, style, containerStyle, theme, addons, remoteSelections, allowBase64Images = false, allowImageResizing = true, }, ref) {
+exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEditor({ initialContent, initialJSON, value, valueJSON, valueJSONRevision, valueJSONUpdateMode = 'replace', preserveSelectionOnValueJSONReset = false, selectionOnValueJSONReset, schema, placeholder, editable = true, maxLength, autoFocus = false, autoCapitalize, autoCorrect, keyboardType, heightBehavior = 'autoGrow', showToolbar = true, toolbarPlacement = 'keyboard', toolbarItems = EditorToolbar_1.DEFAULT_EDITOR_TOOLBAR_ITEMS, onToolbarAction, onRequestLink, onRequestImage, autoDetectLinks = false, onContentChange, onContentChangeJSON, onSelectionChange, onActiveStateChange, onHistoryStateChange, onFocus, onBlur, style, containerStyle, theme, addons, remoteSelections, allowBase64Images = false, allowImageResizing = true, }, ref) {
     const bridgeRef = (0, react_1.useRef)(null);
     const nativeViewRef = (0, react_1.useRef)(null);
     const [isReady, setIsReady] = (0, react_1.useState)(false);
     const [editorInstanceId, setEditorInstanceId] = (0, react_1.useState)(0);
+    const editorInstanceIdRef = (0, react_1.useRef)(0);
+    editorInstanceIdRef.current = editorInstanceId;
     const [isFocused, setIsFocused] = (0, react_1.useState)(false);
     const isFocusedRef = (0, react_1.useRef)(false);
     const [inlineToolbarFrame, setInlineToolbarFrame] = (0, react_1.useState)(null);
-    const registeredToolbarFrames = (0, EditorToolbar_1.useEditorToolbarFrames)();
+    const registeredToolbarFrames = (0, EditorToolbar_1.useEditorToolbarFrames)(editorInstanceId);
     const [pendingNativeUpdate, setPendingNativeUpdate] = (0, react_1.useState)({
         json: undefined,
         editorId: undefined,
         revision: 0,
     });
-    const pendingNativeUpdateRef = (0, react_1.useRef)(pendingNativeUpdate);
-    pendingNativeUpdateRef.current = pendingNativeUpdate;
+    const [pendingNativeResetUpdate, setPendingNativeResetUpdate] = (0, react_1.useState)({
+        json: undefined,
+        editorId: undefined,
+        revision: 0,
+    });
     const pendingNativeUpdateInFlightRef = (0, react_1.useRef)(null);
+    const pendingNativeResetUpdateInFlightRef = (0, react_1.useRef)(null);
+    const nativeUpdateRevisionRef = (0, react_1.useRef)(0);
+    const nextNativeUpdateRevision = (0, react_1.useCallback)(() => {
+        const revision = nativeUpdateRevisionRef.current + 1;
+        nativeUpdateRevisionRef.current = revision;
+        return revision;
+    }, []);
     const [blockedNativeCommandRetry, setBlockedNativeCommandRetry] = (0, react_1.useState)(0);
     const [detachedControlledSyncRetry, setDetachedControlledSyncRetry] = (0, react_1.useState)(0);
     const [controlledNativeUpdateRetry, setControlledNativeUpdateRetry] = (0, react_1.useState)(0);
@@ -753,19 +784,26 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         if (inFlight != null && inFlight.editorId === editorId) {
             pendingNativeUpdateInFlightRef.current = null;
         }
-        setPendingNativeUpdate((current) => {
-            if (current.json == null && current.editorId === editorId) {
-                return current;
-            }
-            const next = {
-                json: undefined,
-                editorId,
-                revision: current.revision + 1,
-            };
-            pendingNativeUpdateRef.current = next;
-            return next;
-        });
-    }, []);
+        const next = {
+            json: undefined,
+            editorId,
+            revision: nextNativeUpdateRevision(),
+        };
+        setPendingNativeUpdate(next);
+    }, [nextNativeUpdateRevision]);
+    const queuePendingNativeResetUpdate = (0, react_1.useCallback)((updateJson) => {
+        if (react_native_1.Platform.OS !== 'android')
+            return;
+        const editorId = bridgeRef.current?.editorId;
+        const revision = nextNativeUpdateRevision();
+        const next = {
+            json: updateJson,
+            editorId,
+            revision,
+        };
+        pendingNativeResetUpdateInFlightRef.current = { editorId, revision };
+        setPendingNativeResetUpdate(next);
+    }, [nextNativeUpdateRevision]);
     const consumeBlockedCommandInfoForRetry = (0, react_1.useCallback)((bridge) => {
         const blockedInfo = bridge.consumeLastCommandBlockedInfo();
         if (!blockedInfo.blocked)
@@ -819,17 +857,14 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
             const updateJson = JSON.stringify(update);
             if (react_native_1.Platform.OS === 'android') {
                 const editorId = bridgeRef.current?.editorId;
-                setPendingNativeUpdate((current) => {
-                    const revision = current.revision + 1;
-                    const next = {
-                        json: updateJson,
-                        editorId,
-                        revision,
-                    };
-                    pendingNativeUpdateRef.current = next;
-                    pendingNativeUpdateInFlightRef.current = { editorId, revision };
-                    return next;
-                });
+                const revision = nextNativeUpdateRevision();
+                const next = {
+                    json: updateJson,
+                    editorId,
+                    revision,
+                };
+                pendingNativeUpdateInFlightRef.current = { editorId, revision };
+                setPendingNativeUpdate(next);
             }
             else {
                 try {
@@ -853,7 +888,35 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
             }
         }
         return true;
-    }, []);
+    }, [nextNativeUpdateRevision]);
+    const applyResetUpdateToNativeView = (0, react_1.useCallback)((update, previousDocumentVersion) => {
+        const updateJson = JSON.stringify(update);
+        if (react_native_1.Platform.OS === 'android') {
+            clearPendingNativeUpdateForCurrentEditor();
+            queuePendingNativeResetUpdate(updateJson);
+            const applyResetUpdate = nativeViewRef.current?.applyEditorResetUpdate;
+            if (applyResetUpdate) {
+                try {
+                    const applyResult = applyResetUpdate(updateJson);
+                    if (isPromiseLike(applyResult)) {
+                        void applyResult.catch(() => {
+                            // The native view may already be torn down during navigation.
+                        });
+                    }
+                    return;
+                }
+                catch {
+                    // Fall through to the regular prop-based apply path.
+                }
+            }
+            return;
+        }
+        applyUpdateToNativeView(update, previousDocumentVersion);
+    }, [
+        applyUpdateToNativeView,
+        clearPendingNativeUpdateForCurrentEditor,
+        queuePendingNativeResetUpdate,
+    ]);
     const maybeApplyAutoDetectedLink = (0, react_1.useCallback)((update, previousDocumentVersion) => {
         const applyAutoLink = (candidateUpdate, allowPreflightRetry) => {
             if (!autoDetectLinks ||
@@ -916,10 +979,10 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         syncStateFromUpdate(update);
         onActiveStateChangeRef.current?.(update.activeState);
         onHistoryStateChangeRef.current?.(update.historyState);
+        onSelectionChangeRef.current?.(update.selection);
         if (!options?.suppressContentCallbacks) {
             emitContentCallbacksForUpdate(update, previousDocumentVersion);
         }
-        onSelectionChangeRef.current?.(update.selection);
         return update;
     }, [
         applyUpdateToNativeView,
@@ -982,10 +1045,10 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         syncStateFromUpdate(update);
         onActiveStateChangeRef.current?.(update.activeState);
         onHistoryStateChangeRef.current?.(update.historyState);
+        onSelectionChangeRef.current?.(update.selection);
         if (!options?.suppressContentCallbacks) {
             emitContentCallbacksForUpdate(update, previousDocumentVersion);
         }
-        onSelectionChangeRef.current?.(update.selection);
         return update;
     }, [
         applyUpdateToNativeView,
@@ -1014,6 +1077,40 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         return (options?.skipWhenContentChanged !== true ||
             !didContentChange(previousDocumentVersion, preflightUpdate));
     }, [consumeBlockedCommandForRetry, syncNativeUpdateFromBridge]);
+    const resetContentJsonString = (0, react_1.useCallback)((jsonString, options) => {
+        const bridge = bridgeRef.current;
+        if (!bridge || bridge.isDestroyed)
+            return null;
+        const previousDocumentVersion = documentVersionRef.current;
+        const preservedSelection = options?.preserveLiveTextSelection === true
+            ? (options.selection ?? selectionRef.current)
+            : null;
+        bridge.setJsonString(jsonString);
+        const update = bridge.getCurrentState();
+        if (!update)
+            return null;
+        if (preservedSelection != null &&
+            restoreSelectionInBridge(bridge, preservedSelection)) {
+            const selectionState = bridge.getSelectionState();
+            if (selectionState) {
+                update.selection = selectionState.selection;
+                update.activeState = selectionState.activeState;
+                update.historyState = selectionState.historyState;
+                if (typeof selectionState.documentVersion === 'number') {
+                    update.documentVersion = selectionState.documentVersion;
+                }
+            }
+        }
+        applyResetUpdateToNativeView(update, previousDocumentVersion);
+        syncStateFromUpdate(update);
+        onActiveStateChangeRef.current?.(update.activeState);
+        onHistoryStateChangeRef.current?.(update.historyState);
+        onSelectionChangeRef.current?.(update.selection);
+        if (!options?.suppressContentCallbacks) {
+            emitContentCallbacksForUpdate(update, previousDocumentVersion);
+        }
+        return update;
+    }, [applyResetUpdateToNativeView, emitContentCallbacksForUpdate, syncStateFromUpdate]);
     const syncPreflightUpdateFromNativeEvent = (0, react_1.useCallback)((updateJson) => {
         if (typeof updateJson !== 'string' || updateJson.length === 0) {
             return true;
@@ -1104,6 +1201,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
                 bridgeRef.current = null;
             }
             pendingNativeUpdateInFlightRef.current = null;
+            pendingNativeResetUpdateInFlightRef.current = null;
             pendingDetachedControlledSyncRef.current = false;
             pendingControlledSyncAfterNativeUpdateRef.current = false;
             pendingBlockedNativeCommandRetryRef.current = false;
@@ -1113,15 +1211,18 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
             mentionQueryEditorIdRef.current = null;
             clearBlockedNativeCommandRetryTimer();
             setMentionQueryEvent(null);
-            setPendingNativeUpdate((current) => {
-                const next = {
-                    json: undefined,
-                    editorId: undefined,
-                    revision: current.revision + 1,
-                };
-                pendingNativeUpdateRef.current = next;
-                return next;
-            });
+            const clearedNativeUpdate = {
+                json: undefined,
+                editorId: undefined,
+                revision: nextNativeUpdateRevision(),
+            };
+            setPendingNativeUpdate(clearedNativeUpdate);
+            const clearedNativeResetUpdate = {
+                json: undefined,
+                editorId: undefined,
+                revision: nextNativeUpdateRevision(),
+            };
+            setPendingNativeResetUpdate(clearedNativeResetUpdate);
             setEditorInstanceId(0);
             setIsReady(false);
         };
@@ -1132,6 +1233,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         allowBase64Images,
         serializedSchemaJson,
         clearBlockedNativeCommandRetryTimer,
+        nextNativeUpdateRevision,
     ]);
     (0, react_1.useEffect)(() => {
         if (value == null)
@@ -1203,6 +1305,27 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         const didControlledValueChange = previousSync.value !== serializedValueJson;
         const didDocumentAdvanceForSameValue = !didControlledValueChange &&
             previousSync.documentVersion !== documentVersionRef.current;
+        if (valueJSONUpdateMode === 'reset') {
+            const currentJson = bridgeRef.current.getJsonString();
+            if (currentJson === serializedValueJson) {
+                clearPendingNativeUpdateForCurrentEditor();
+                controlledJsonSyncRef.current = {
+                    value: serializedValueJson,
+                    documentVersion: documentVersionRef.current,
+                };
+                return;
+            }
+            resetContentJsonString(serializedValueJson, {
+                suppressContentCallbacks: true,
+                preserveLiveTextSelection: preserveSelectionOnValueJSONReset,
+                selection: selectionOnValueJSONReset,
+            });
+            controlledJsonSyncRef.current = {
+                value: serializedValueJson,
+                documentVersion: documentVersionRef.current,
+            };
+            return;
+        }
         if (!prepareBridgeForExternalContentRead({
             skipWhenContentChanged: !didControlledValueChange,
         })) {
@@ -1248,6 +1371,9 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
     }, [
         serializedValueJson,
         value,
+        valueJSONUpdateMode,
+        preserveSelectionOnValueJSONReset,
+        selectionOnValueJSONReset,
         runAndApply,
         blockedNativeCommandRetry,
         controlledNativeUpdateRetry,
@@ -1255,6 +1381,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         prepareBridgeForExternalContentRead,
         clearPendingNativeUpdateForCurrentEditor,
         hasPendingNativeUpdateInFlightForCurrentEditor,
+        resetContentJsonString,
     ]);
     const updateToolbarFrame = (0, react_1.useCallback)(() => {
         const toolbar = toolbarRef.current;
@@ -1384,29 +1511,13 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         }
         onSelectionChangeRef.current?.(nextSelection);
     }, [syncSelectionStateFromUpdate]);
-    const refocusAfterToolbarInteraction = (0, react_1.useCallback)(() => {
-        nativeViewRef.current?.focus?.();
-        requestAnimationFrame(() => {
-            nativeViewRef.current?.focus?.();
-        });
-        setTimeout(() => {
-            nativeViewRef.current?.focus?.();
-        }, 50);
-    }, []);
     const handleFocusChange = (0, react_1.useCallback)((event) => {
         if (!isCurrentNativeEditorEvent(event.nativeEvent, bridgeRef.current))
             return;
         const { isFocused: focused } = event.nativeEvent;
-        if (!focused &&
-            editable &&
-            isFocusedRef.current &&
-            (0, EditorToolbar_1.isEditorToolbarFocusPreservationActive)()) {
-            setIsFocused(true);
-            refocusAfterToolbarInteraction();
-            return;
-        }
         const wasFocused = isFocusedRef.current;
         isFocusedRef.current = focused;
+        (0, EditorToolbar_1.setActiveEditorToolbarFrameOwnerForEditor)(editorInstanceIdRef.current, focused);
         setIsFocused(focused);
         if (!focused) {
             setMentionQueryEventState(null);
@@ -1419,7 +1530,10 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         else if (wasFocused) {
             onBlurRef.current?.();
         }
-    }, [editable, refocusAfterToolbarInteraction, setMentionQueryEventState]);
+    }, [setMentionQueryEventState]);
+    (0, react_1.useEffect)(() => () => {
+        (0, EditorToolbar_1.setActiveEditorToolbarFrameOwnerForEditor)(editorInstanceId, false);
+    }, [editorInstanceId]);
     (0, react_1.useEffect)(() => {
         if (addons?.mentions != null) {
             return;
@@ -1443,30 +1557,57 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         const editorId = bridgeRef.current?.editorId;
         const acknowledgedRevision = event.nativeEvent.editorUpdateRevision;
         const inFlight = pendingNativeUpdateInFlightRef.current;
+        const resetInFlight = pendingNativeResetUpdateInFlightRef.current;
         let didClearInFlight = false;
+        let didMatchInFlight = false;
         if (inFlight != null) {
             const matchesRevision = typeof acknowledgedRevision === 'number' &&
                 inFlight.editorId === editorId &&
                 inFlight.revision === acknowledgedRevision;
-            if (!matchesRevision) {
-                return;
+            if (matchesRevision) {
+                didMatchInFlight = true;
+                pendingNativeUpdateInFlightRef.current = null;
+                didClearInFlight = true;
+                setPendingNativeUpdate((current) => {
+                    if (current.editorId !== editorId ||
+                        current.revision !== acknowledgedRevision ||
+                        current.json == null) {
+                        return current;
+                    }
+                    const next = {
+                        json: undefined,
+                        editorId,
+                        revision: current.revision,
+                    };
+                    return next;
+                });
             }
-            pendingNativeUpdateInFlightRef.current = null;
-            didClearInFlight = true;
-            setPendingNativeUpdate((current) => {
-                if (current.editorId !== editorId ||
-                    current.revision !== acknowledgedRevision ||
-                    current.json == null) {
-                    return current;
-                }
-                const next = {
-                    json: undefined,
-                    editorId,
-                    revision: current.revision,
-                };
-                pendingNativeUpdateRef.current = next;
-                return next;
-            });
+        }
+        if (resetInFlight != null) {
+            const matchesRevision = typeof acknowledgedRevision === 'number' &&
+                resetInFlight.editorId === editorId &&
+                resetInFlight.revision === acknowledgedRevision;
+            if (matchesRevision) {
+                didMatchInFlight = true;
+                pendingNativeResetUpdateInFlightRef.current = null;
+                didClearInFlight = true;
+                setPendingNativeResetUpdate((current) => {
+                    if (current.editorId !== editorId ||
+                        current.revision !== acknowledgedRevision ||
+                        current.json == null) {
+                        return current;
+                    }
+                    const next = {
+                        json: undefined,
+                        editorId,
+                        revision: current.revision,
+                    };
+                    return next;
+                });
+            }
+        }
+        if ((inFlight != null || resetInFlight != null) && !didMatchInFlight) {
+            return;
         }
         flushBlockedNativeCommandRetry();
         if (didClearInFlight && pendingControlledSyncAfterNativeUpdateRef.current) {
@@ -1623,6 +1764,24 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         }
         return { update, queued: didQueueRetry };
     }, [isCommandRetryScopeCurrent, runAndApply]);
+    const runPersistentContentCommand = (0, react_1.useCallback)((mutate, options) => {
+        const requestedEditorId = bridgeRef.current?.editorId;
+        let run = null;
+        const retry = () => {
+            const bridge = bridgeRef.current;
+            if (bridge == null ||
+                bridge.isDestroyed ||
+                bridge.editorId !== requestedEditorId) {
+                return false;
+            }
+            return run?.() != null;
+        };
+        run = () => runAndApply(mutate, {
+            ...options,
+            retryBlockedCommand: retry,
+        });
+        return run();
+    }, [runAndApply]);
     const insertImage = (0, react_1.useCallback)((src, attrs, selection) => {
         const trimmedSrc = src.trim();
         if (!trimmedSrc)
@@ -2069,10 +2228,15 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
             runAndApply(() => bridgeRef.current?.insertContentJson(doc) ?? null);
         },
         setContent(html) {
-            runAndApply(() => bridgeRef.current?.replaceHtml(html) ?? null);
+            runPersistentContentCommand(() => bridgeRef.current?.replaceHtml(html) ?? null);
         },
         setContentJson(doc) {
-            runAndApply(() => bridgeRef.current?.replaceJson(doc) ?? null);
+            const jsonString = stringifyCachedJson((0, schemas_1.normalizeDocumentJson)(doc, documentSchema));
+            runPersistentContentCommand(() => bridgeRef.current?.replaceJsonString(jsonString) ?? null);
+        },
+        clearContent() {
+            const jsonString = stringifyCachedJson((0, schemas_1.normalizeDocumentJson)({ type: 'doc', content: [] }, documentSchema));
+            resetContentJsonString(jsonString);
         },
         getContent() {
             if (!bridgeRef.current || bridgeRef.current.isDestroyed)
@@ -2121,7 +2285,14 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
                 return false;
             return bridgeRef.current.canRedo();
         },
-    }), [insertImage, prepareBridgeForExternalContentRead, runAndApply]);
+    }), [
+        documentSchema,
+        insertImage,
+        prepareBridgeForExternalContentRead,
+        runAndApply,
+        runPersistentContentCommand,
+        resetContentJsonString,
+    ]);
     const activeMentionTrigger = mentionQueryEvent?.trigger || resolveMentionTrigger(addons);
     const activeMentionSuggestions = (0, react_1.useMemo)(() => isFocused && mentionQueryEvent != null && addons?.mentions != null
         ? filterMentionSuggestions(addons.mentions.suggestions ?? [], mentionQueryEvent.query, activeMentionTrigger)
@@ -2273,7 +2444,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         nativeViewStyleParts.push({ height: autoGrowHeight });
     }
     const nativeViewStyle = nativeViewStyleParts.length <= 1 ? nativeViewStyleParts[0] : nativeViewStyleParts;
-    const toolbarFrameJson = serializeToolbarFrames(editable
+    const toolbarFrameJson = serializeToolbarFrames(editable && isFocused
         ? [
             ...(toolbarPlacement === 'inline' && inlineToolbarFrame != null
                 ? [inlineToolbarFrame]
@@ -2361,7 +2532,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
             }), onToggleStrike: () => runAndApply(() => bridgeRef.current?.toggleMark('strike') ?? null, {
                 skipNativeApplyIfContentUnchanged: true,
             }), onToggleBulletList: () => runAndApply(() => bridgeRef.current?.toggleList('bulletList') ?? null), onToggleOrderedList: () => runAndApply(() => bridgeRef.current?.toggleList('orderedList') ?? null), onIndentList: () => runAndApply(() => bridgeRef.current?.indentListItem() ?? null), onOutdentList: () => runAndApply(() => bridgeRef.current?.outdentListItem() ?? null), onInsertHorizontalRule: () => runAndApply(() => bridgeRef.current?.insertNode('horizontalRule') ?? null), onInsertLineBreak: () => runAndApply(() => bridgeRef.current?.insertNode('hardBreak') ?? null), onUndo: () => runAndApply(() => bridgeRef.current?.undo() ?? null), onRedo: () => runAndApply(() => bridgeRef.current?.redo() ?? null) })) }));
-    return ((0, jsx_runtime_1.jsxs)(react_native_1.View, { style: [styles.container, containerStyle], children: [(0, jsx_runtime_1.jsx)(NativeEditorView, { ref: nativeViewRef, style: nativeViewStyle, editorId: editorInstanceId, placeholder: placeholder, editable: editable, autoFocus: autoFocus, autoCapitalize: autoCapitalize, autoCorrect: autoCorrect, keyboardType: keyboardType, showToolbar: showToolbar, toolbarPlacement: toolbarPlacement, heightBehavior: heightBehavior, allowImageResizing: allowImageResizing, themeJson: themeJson, addonsJson: addonsJson, toolbarItemsJson: toolbarItemsJson, remoteSelectionsJson: remoteSelectionsJson, toolbarFrameJson: toolbarFrameJson, editorUpdateJson: pendingNativeUpdate.json, editorUpdateEditorId: pendingNativeUpdate.editorId, editorUpdateRevision: pendingNativeUpdate.revision, onEditorUpdate: handleUpdate, onSelectionChange: handleSelectionChange, onFocusChange: handleFocusChange, onContentHeightChange: handleContentHeightChange, ...(react_native_1.Platform.OS === 'android' ? { onEditorReady: handleEditorReady } : {}), onToolbarAction: handleToolbarAction, onAddonEvent: handleAddonEvent }, DEV_NATIVE_VIEW_KEY), shouldRenderJsToolbar && jsToolbar] }));
+    return ((0, jsx_runtime_1.jsxs)(react_native_1.View, { style: [styles.container, containerStyle], children: [(0, jsx_runtime_1.jsx)(NativeEditorView, { ref: nativeViewRef, style: nativeViewStyle, editorId: editorInstanceId, placeholder: placeholder, editable: editable, autoFocus: autoFocus, autoCapitalize: autoCapitalize, autoCorrect: autoCorrect, keyboardType: keyboardType, showToolbar: showToolbar, toolbarPlacement: toolbarPlacement, heightBehavior: heightBehavior, allowImageResizing: allowImageResizing, themeJson: themeJson, addonsJson: addonsJson, toolbarItemsJson: toolbarItemsJson, remoteSelectionsJson: remoteSelectionsJson, toolbarFrameJson: toolbarFrameJson, editorUpdateJson: pendingNativeUpdate.json, editorUpdateEditorId: pendingNativeUpdate.editorId, editorUpdateRevision: pendingNativeUpdate.revision, editorResetUpdateJson: pendingNativeResetUpdate.json, editorResetUpdateEditorId: pendingNativeResetUpdate.editorId, editorResetUpdateRevision: pendingNativeResetUpdate.revision, onEditorUpdate: handleUpdate, onSelectionChange: handleSelectionChange, onFocusChange: handleFocusChange, onContentHeightChange: handleContentHeightChange, ...(react_native_1.Platform.OS === 'android' ? { onEditorReady: handleEditorReady } : {}), onToolbarAction: handleToolbarAction, onAddonEvent: handleAddonEvent }, DEV_NATIVE_VIEW_KEY), shouldRenderJsToolbar && jsToolbar] }));
 });
 const styles = react_native_1.StyleSheet.create({
     container: {

package/dist/YjsCollaboration.d.ts

@@ -28,6 +28,8 @@ export interface YjsCollaborationState {
     status: YjsTransportStatus;
     isConnected: boolean;
     documentJson: DocumentJSON;
+    /** Local selection remapped through the latest collaboration document update. */
+    selectionOnValueJSONReset?: Selection;
     lastError?: Error;
 }
 export interface YjsCollaborationOptions {
@@ -74,6 +76,9 @@ export interface UseYjsCollaborationResult {
     updateLocalAwareness(partial: Partial<LocalAwarenessState>): void;
     editorBindings: {
         valueJSON: DocumentJSON;
+        valueJSONUpdateMode: 'reset';
+        preserveSelectionOnValueJSONReset: true;
+        selectionOnValueJSONReset?: Selection;
         remoteSelections: RemoteSelectionDecoration[];
         onContentChangeJSON: (doc: DocumentJSON) => void;
         onSelectionChange: (selection: Selection) => void;

package/dist/YjsCollaboration.js

@@ -177,6 +177,22 @@ function selectionToAwarenessRange(selection) {
         head: selection.head ?? selection.anchor ?? 0,
     };
 }
+function selectionFromPeerState(state) {
+    if (!state || typeof state !== 'object')
+        return undefined;
+    const selection = state.selection;
+    if (!selection || typeof selection !== 'object')
+        return undefined;
+    const anchor = Number(selection.anchor);
+    const head = Number(selection.head);
+    if (!Number.isFinite(anchor) || !Number.isFinite(head))
+        return undefined;
+    return { type: 'text', anchor, head };
+}
+function localSelectionFromPeers(peers) {
+    const localPeer = peers.find((peer) => peer.isLocal);
+    return localPeer ? selectionFromPeerState(localPeer.state) : undefined;
+}
 function peersToRemoteSelections(peers) {
     return peers.flatMap((peer) => {
         if (peer.isLocal || !peer.state || typeof peer.state !== 'object') {
@@ -240,17 +256,24 @@ class YjsCollaborationControllerImpl {
             localAwareness: awarenessToRecord(this.localAwarenessState),
         });
         const nativeDocumentJson = this.bridge.getDocumentJson();
+        this._peers = this.bridge.getPeers();
+        let initialDocumentJson;
+        if (options.initialDocumentJson != null) {
+            initialDocumentJson = cloneJsonValue(options.initialDocumentJson);
+        }
+        else if (shouldUseFallbackForNativeDocument(nativeDocumentJson, options)) {
+            initialDocumentJson = defaultEmptyDocument(options.schema);
+        }
+        else {
+            initialDocumentJson = nativeDocumentJson;
+        }
         this._state = {
             documentId: options.documentId,
             status: 'idle',
             isConnected: false,
-            documentJson: options.initialDocumentJson != null
-                ? cloneJsonValue(options.initialDocumentJson)
-                : shouldUseFallbackForNativeDocument(nativeDocumentJson, options)
-                    ? defaultEmptyDocument(options.schema)
-                    : nativeDocumentJson,
+            documentJson: initialDocumentJson,
+            selectionOnValueJSONReset: localSelectionFromPeers(this._peers),
         };
-        this._peers = this.bridge.getPeers();
         if (options.connect !== false) {
             this.connect();
         }
@@ -333,6 +356,9 @@ class YjsCollaborationControllerImpl {
                 return;
             }
             try {
+                if (this.pendingAwarenessTimer != null) {
+                    this.commitLocalAwareness();
+                }
                 const result = this.bridge.handleMessage(bytes);
                 this.applyResult(result);
                 sendBinaryMessages(socket, result.messages);
@@ -438,6 +464,9 @@ class YjsCollaborationControllerImpl {
         const result = this.bridge.applyLocalDocumentJson(doc);
         this.applyResult(result);
         sendBinaryMessages(this.socket, result.messages);
+        if (this.pendingAwarenessTimer != null) {
+            this.commitLocalAwareness();
+        }
     }
     handleSelectionChange(selection) {
         if (this.destroyed)
@@ -466,13 +495,17 @@ class YjsCollaborationControllerImpl {
         this.commitLocalAwareness();
     }
     applyResult(result) {
+        const didPeersChange = result.peersChanged && result.peers != null;
+        if (didPeersChange) {
+            this._peers = result.peers;
+        }
         if (result.documentChanged && result.documentJson) {
             this.setState({
                 documentJson: result.documentJson,
+                selectionOnValueJSONReset: localSelectionFromPeers(this._peers),
             });
         }
-        if (result.peersChanged && result.peers) {
-            this._peers = result.peers;
+        if (didPeersChange) {
             this.callbacks.onPeersChange?.(this._peers);
         }
     }
@@ -697,6 +730,9 @@ function useYjsCollaboration(options) {
         updateLocalAwareness: (partial) => controllerRef.current?.updateLocalAwareness(partial),
         editorBindings: {
             valueJSON: state.documentJson,
+            valueJSONUpdateMode: 'reset',
+            preserveSelectionOnValueJSONReset: true,
+            selectionOnValueJSONReset: state.selectionOnValueJSONReset,
             remoteSelections: peersToRemoteSelections(peers),
             onContentChangeJSON: (doc) => controllerRef.current?.handleLocalDocumentChange(doc),
             onSelectionChange: (selection) => controllerRef.current?.handleSelectionChange(selection),

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { NativeRichTextEditor, type NativeRichTextEditorProps, type NativeRichTextEditorRef, type NativeRichTextEditorCaretRect, type NativeRichTextEditorHeightBehavior, type NativeRichTextEditorToolbarPlacement, type NativeRichTextEditorAutoCapitalize, type NativeRichTextEditorKeyboardType, type RemoteSelectionDecoration, type LinkRequestContext, type ImageRequestContext, } from './NativeRichTextEditor';
+export { NativeRichTextEditor, type NativeRichTextEditorProps, type NativeRichTextEditorRef, type NativeRichTextEditorCaretRect, type NativeRichTextEditorHeightBehavior, type NativeRichTextEditorToolbarPlacement, type NativeRichTextEditorValueJSONUpdateMode, type NativeRichTextEditorAutoCapitalize, type NativeRichTextEditorKeyboardType, type RemoteSelectionDecoration, type LinkRequestContext, type ImageRequestContext, } from './NativeRichTextEditor';
 export { NativeProseViewer, type NativeProseViewerProps, type NativeProseViewerAddons, type NativeProseViewerMentionsAddonConfig, type NativeProseViewerMentionPrefix, type NativeProseViewerLinkPressEvent, type NativeProseViewerMentionRenderContext, type NativeProseViewerMentionPressEvent, } from './NativeProseViewer';
 export { EditorToolbar, DEFAULT_EDITOR_TOOLBAR_ITEMS, type EditorToolbarProps, type EditorToolbarItem, type EditorToolbarLeafItem, type EditorToolbarGroupChildItem, type EditorToolbarGroupItem, type EditorToolbarGroupPresentation, type EditorToolbarIcon, type EditorToolbarDefaultIconId, type EditorToolbarSFSymbolIcon, type EditorToolbarMaterialIcon, type EditorToolbarCommand, type EditorToolbarHeadingLevel, type EditorToolbarListType, } from './EditorToolbar';
 export type { EditorContentInsets, EditorTheme, EditorTextStyle, EditorLinkTheme, EditorHeadingTheme, EditorListTheme, EditorHorizontalRuleTheme, EditorMentionTheme, EditorToolbarTheme, EditorToolbarAppearance, EditorFontStyle, EditorFontWeight, } from './EditorTheme';