@apollohg/react-native-prose-editor 0.5.16 → 0.5.17

package/dist/NativeEditorBridge.d.ts

@@ -3,6 +3,7 @@ import { type SchemaDefinition } from './schemas';
 export interface NativeEditorModule {
     editorCreate(configJson: string): number;
     editorDestroy(editorId: number): void;
+    editorPrepareForCommand?(editorId: number): string;
     collaborationSessionCreate(configJson: string): number;
     collaborationSessionDestroy(sessionId: number): void;
     collaborationSessionGetDocumentJson(sessionId: number): string;
@@ -123,6 +124,10 @@ export interface EditorUpdate {
     historyState: HistoryState;
     documentVersion?: number;
 }
+export interface ParseUpdateOptions {
+    rejectSameDocumentVersion?: boolean;
+    rejectVersionlessAfterDocumentVersion?: boolean;
+}
 export interface ContentSnapshot {
     html: string;
     json: DocumentJSON;
@@ -142,6 +147,11 @@ export interface CollaborationResult {
     peersChanged: boolean;
     peers?: CollaborationPeer[];
 }
+export type CommandBlockedReason = 'composition' | 'detached' | 'pendingUpdate' | 'destroyed' | 'unknown';
+export interface CommandBlockedInfo {
+    blocked: boolean;
+    reason: CommandBlockedReason | null;
+}
 export type EncodedCollaborationStateInput = Uint8Array | readonly number[] | string;
 export declare function normalizeActiveState(raw: unknown): ActiveState;
 export declare function parseEditorUpdateJson(json: string, previousRenderBlocks?: RenderElement[][]): EditorUpdate | null;
@@ -159,6 +169,11 @@ export declare class NativeEditorBridge {
     private _cachedHtml;
     private _cachedJsonString;
     private _renderBlocksCache;
+    private _lastCommandBlocked;
+    private _lastCommandBlockedReason;
+    private _lastCommandPreflightUpdate;
+    private _lastAcceptedUpdateJson;
+    private _hasSeenDocumentVersion;
     private constructor();
     /** Create a new editor instance backed by the Rust engine. */
     static create(config?: {
@@ -170,18 +185,29 @@ export declare class NativeEditorBridge {
     get editorId(): number;
     /** Whether this bridge has been destroyed. */
     get isDestroyed(): boolean;
+    consumeLastCommandBlocked(): boolean;
+    consumeLastCommandBlockedReason(): CommandBlockedReason | null;
+    consumeLastCommandBlockedInfo(): CommandBlockedInfo;
+    consumeLastCommandPreflightUpdate(): EditorUpdate | null;
+    prepareForNativeCommand(): boolean;
     /** Destroy the editor instance and free native resources. */
     destroy(): void;
     /** Set content from HTML. Returns render elements for display. */
     setHtml(html: string): RenderElement[];
     /** Get content as HTML. */
     getHtml(): string;
+    /** Get cached HTML without making a native roundtrip. */
+    getCachedHtml(): string | null;
     /** Set content from ProseMirror JSON. Returns render elements. */
     setJson(doc: DocumentJSON): RenderElement[];
     /** Set content from a serialized ProseMirror JSON string. Returns render elements. */
     setJsonString(jsonString: string): RenderElement[];
     /** Get content as raw ProseMirror JSON string. */
     getJsonString(): string;
+    /** Get cached raw ProseMirror JSON without making a native roundtrip. */
+    getCachedJsonString(): string | null;
+    /** Get cached ProseMirror JSON without making a native roundtrip. */
+    getCachedJson(): DocumentJSON | null;
     /** Get content as ProseMirror JSON. */
     getJson(): DocumentJSON;
     /** Get both HTML and JSON content in one native roundtrip. */
@@ -200,6 +226,8 @@ export declare class NativeEditorBridge {
     setMarkAtSelectionScalar(scalarAnchor: number, scalarHead: number, markType: string, attrs: Record<string, unknown>): EditorUpdate | null;
     /** Remove a mark from the current selection. */
     unsetMark(markType: string): EditorUpdate | null;
+    /** Remove a mark at an explicit scalar selection. */
+    unsetMarkAtSelectionScalar(scalarAnchor: number, scalarHead: number, markType: string): EditorUpdate | null;
     /** Toggle blockquote wrapping for the current block selection. */
     toggleBlockquote(): EditorUpdate | null;
     /** Toggle a heading level on the current block selection. */
@@ -228,6 +256,8 @@ export declare class NativeEditorBridge {
     insertContentJson(doc: DocumentJSON): EditorUpdate | null;
     /** Insert JSON content at an explicit scalar selection. */
     insertContentJsonAtSelectionScalar(scalarAnchor: number, scalarHead: number, doc: DocumentJSON): EditorUpdate | null;
+    /** Insert lazily-built JSON content at an explicit scalar selection. */
+    insertContentJsonAtSelectionScalarLazy(scalarAnchor: number, scalarHead: number, resolveDoc: () => DocumentJSON): EditorUpdate | null;
     /** Replace entire document with HTML via transaction (preserves undo history). */
     replaceHtml(html: string): EditorUpdate | null;
     /** Replace entire document with JSON via transaction (preserves undo history). */
@@ -252,9 +282,12 @@ export declare class NativeEditorBridge {
     outdentListItem(): EditorUpdate | null;
     /** Insert a void node (e.g. 'horizontalRule') at the current selection. */
     insertNode(nodeType: string): EditorUpdate | null;
-    parseUpdateJson(json: string): EditorUpdate | null;
+    parseUpdateJson(json: string, options?: ParseUpdateOptions): EditorUpdate | null;
     private noteUpdate;
+    private shouldRejectUpdate;
     private parseAndNoteUpdate;
+    private prepareForCommand;
+    private runPreparedCommand;
     private invalidateContentCaches;
     private assertNotDestroyed;
     private currentScalarSelection;

package/dist/NativeEditorBridge.js

@@ -8,6 +8,7 @@ exports.decodeCollaborationStateBase64 = decodeCollaborationStateBase64;
 exports.parseCollaborationResultJson = parseCollaborationResultJson;
 exports._resetNativeModuleCache = _resetNativeModuleCache;
 const expo_modules_core_1 = require("expo-modules-core");
+const react_native_1 = require("react-native");
 const schemas_1 = require("./schemas");
 const ERR_DESTROYED = 'NativeEditorBridge: editor has been destroyed';
 const ERR_NATIVE_RESPONSE = 'NativeEditorBridge: invalid JSON response from native module';
@@ -244,6 +245,34 @@ function normalizeDocumentJsonString(jsonString, schema) {
         return jsonString;
     }
 }
+function parseCommandPreparationJson(json) {
+    if (!json)
+        return { ready: true };
+    let parsed;
+    try {
+        parsed = JSON.parse(json);
+    }
+    catch {
+        throw new Error(ERR_NATIVE_RESPONSE);
+    }
+    if (typeof parsed.error === 'string') {
+        throw new Error(`NativeEditorBridge: ${parsed.error}`);
+    }
+    const rawBlockedReason = parsed.blockedReason;
+    const blockedReason = rawBlockedReason === 'composition' ||
+        rawBlockedReason === 'detached' ||
+        rawBlockedReason === 'pendingUpdate' ||
+        rawBlockedReason === 'destroyed'
+        ? rawBlockedReason
+        : rawBlockedReason === 'unknown'
+            ? 'unknown'
+            : undefined;
+    return {
+        ready: parsed.ready !== false,
+        updateJSON: typeof parsed.updateJSON === 'string' ? parsed.updateJSON : undefined,
+        blockedReason,
+    };
+}
 function parseCollaborationResultJson(json) {
     if (!json || json === '') {
         return {
@@ -293,6 +322,11 @@ class NativeEditorBridge {
         this._cachedHtml = null;
         this._cachedJsonString = null;
         this._renderBlocksCache = null;
+        this._lastCommandBlocked = false;
+        this._lastCommandBlockedReason = null;
+        this._lastCommandPreflightUpdate = null;
+        this._lastAcceptedUpdateJson = null;
+        this._hasSeenDocumentVersion = false;
         this._editorId = editorId;
         this._schema = schema;
     }
@@ -325,12 +359,45 @@ class NativeEditorBridge {
     get isDestroyed() {
         return this._destroyed;
     }
+    consumeLastCommandBlocked() {
+        const blocked = this._lastCommandBlocked;
+        this._lastCommandBlocked = false;
+        this._lastCommandBlockedReason = null;
+        return blocked;
+    }
+    consumeLastCommandBlockedReason() {
+        const reason = this._lastCommandBlockedReason;
+        this._lastCommandBlocked = false;
+        this._lastCommandBlockedReason = null;
+        return reason;
+    }
+    consumeLastCommandBlockedInfo() {
+        const info = {
+            blocked: this._lastCommandBlocked,
+            reason: this._lastCommandBlockedReason,
+        };
+        this._lastCommandBlocked = false;
+        this._lastCommandBlockedReason = null;
+        return info;
+    }
+    consumeLastCommandPreflightUpdate() {
+        const update = this._lastCommandPreflightUpdate;
+        this._lastCommandPreflightUpdate = null;
+        return update;
+    }
+    prepareForNativeCommand() {
+        this.assertNotDestroyed();
+        return this.prepareForCommand();
+    }
     /** Destroy the editor instance and free native resources. */
     destroy() {
         if (this._destroyed)
             return;
         this._destroyed = true;
         this._renderBlocksCache = null;
+        this._lastCommandBlocked = false;
+        this._lastCommandBlockedReason = null;
+        this._lastCommandPreflightUpdate = null;
         getNativeModule().editorDestroy(this._editorId);
     }
     /** Set content from HTML. Returns render elements for display. */
@@ -351,6 +418,11 @@ class NativeEditorBridge {
         this._cachedHtml = { version: this._documentVersion, value: html };
         return html;
     }
+    /** Get cached HTML without making a native roundtrip. */
+    getCachedHtml() {
+        this.assertNotDestroyed();
+        return this._cachedHtml?.value ?? null;
+    }
     /** Set content from ProseMirror JSON. Returns render elements. */
     setJson(doc) {
         return this.setJsonString(JSON.stringify((0, schemas_1.normalizeDocumentJson)(doc, this._schema)));
@@ -374,6 +446,16 @@ class NativeEditorBridge {
         this._cachedJsonString = { version: this._documentVersion, value: json };
         return json;
     }
+    /** Get cached raw ProseMirror JSON without making a native roundtrip. */
+    getCachedJsonString() {
+        this.assertNotDestroyed();
+        return this._cachedJsonString?.value ?? null;
+    }
+    /** Get cached ProseMirror JSON without making a native roundtrip. */
+    getCachedJson() {
+        const json = this.getCachedJsonString();
+        return json == null ? null : parseDocumentJSON(json);
+    }
     /** Get content as ProseMirror JSON. */
     getJson() {
         return parseDocumentJSON(this.getJsonString());
@@ -399,63 +481,68 @@ class NativeEditorBridge {
     /** Insert text at a document position. Returns the full update. */
     insertText(pos, text) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorInsertText(this._editorId, pos, text);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorInsertText(this._editorId, pos, text));
     }
     /** Delete a range [from, to). Returns the full update. */
     deleteRange(from, to) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorDeleteRange(this._editorId, from, to);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorDeleteRange(this._editorId, from, to));
     }
     /** Replace the current selection with text atomically. */
     replaceSelectionText(text) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorReplaceSelectionText(this._editorId, text);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorReplaceSelectionText(this._editorId, text));
     }
     /** Toggle a mark (bold, italic, etc.) on the current selection. */
     toggleMark(markType) {
         this.assertNotDestroyed();
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorToggleMarkAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, markType)
-            : getNativeModule().editorToggleMark(this._editorId, markType);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorToggleMarkAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, markType)
+                : getNativeModule().editorToggleMark(this._editorId, markType);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Set a mark with attrs on the current selection. */
     setMark(markType, attrs) {
         this.assertNotDestroyed();
         const attrsJson = JSON.stringify(attrs);
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorSetMarkAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, markType, attrsJson)
-            : getNativeModule().editorSetMark(this._editorId, markType, attrsJson);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorSetMarkAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, markType, attrsJson)
+                : getNativeModule().editorSetMark(this._editorId, markType, attrsJson);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Set a mark with attrs at an explicit scalar selection. */
     setMarkAtSelectionScalar(scalarAnchor, scalarHead, markType, attrs) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorSetMarkAtSelectionScalar(this._editorId, scalarAnchor, scalarHead, markType, JSON.stringify(attrs));
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorSetMarkAtSelectionScalar(this._editorId, scalarAnchor, scalarHead, markType, JSON.stringify(attrs)), { cancelIfPreflightUpdated: true });
     }
     /** Remove a mark from the current selection. */
     unsetMark(markType) {
         this.assertNotDestroyed();
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorUnsetMarkAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, markType)
-            : getNativeModule().editorUnsetMark(this._editorId, markType);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorUnsetMarkAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, markType)
+                : getNativeModule().editorUnsetMark(this._editorId, markType);
+        }, { refreshSelectionAfterPreflight: true });
+    }
+    /** Remove a mark at an explicit scalar selection. */
+    unsetMarkAtSelectionScalar(scalarAnchor, scalarHead, markType) {
+        this.assertNotDestroyed();
+        return this.runPreparedCommand(() => getNativeModule().editorUnsetMarkAtSelectionScalar(this._editorId, scalarAnchor, scalarHead, markType), { cancelIfPreflightUpdated: true });
     }
     /** Toggle blockquote wrapping for the current block selection. */
     toggleBlockquote() {
         this.assertNotDestroyed();
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorToggleBlockquoteAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
-            : getNativeModule().editorToggleBlockquote(this._editorId);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorToggleBlockquoteAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
+                : getNativeModule().editorToggleBlockquote(this._editorId);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Toggle a heading level on the current block selection. */
     toggleHeading(level) {
@@ -463,11 +550,12 @@ class NativeEditorBridge {
         if (!Number.isInteger(level) || level < 1 || level > 6) {
             throw new Error('NativeEditorBridge: invalid heading level');
         }
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorToggleHeadingAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, level)
-            : getNativeModule().editorToggleHeading(this._editorId, level);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorToggleHeadingAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, level)
+                : getNativeModule().editorToggleHeading(this._editorId, level);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Set the document selection by anchor and head positions. */
     setSelection(anchor, head) {
@@ -522,32 +610,31 @@ class NativeEditorBridge {
     /** Split the block at a position (Enter key). */
     splitBlock(pos) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorSplitBlock(this._editorId, pos);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorSplitBlock(this._editorId, pos));
     }
     /** Insert HTML content at the current selection. */
     insertContentHtml(html) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorInsertContentHtml(this._editorId, html);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorInsertContentHtml(this._editorId, html));
     }
     /** Insert JSON content at the current selection. */
     insertContentJson(doc) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorInsertContentJson(this._editorId, JSON.stringify(doc));
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorInsertContentJson(this._editorId, JSON.stringify(doc)));
     }
     /** Insert JSON content at an explicit scalar selection. */
     insertContentJsonAtSelectionScalar(scalarAnchor, scalarHead, doc) {
+        return this.insertContentJsonAtSelectionScalarLazy(scalarAnchor, scalarHead, () => doc);
+    }
+    /** Insert lazily-built JSON content at an explicit scalar selection. */
+    insertContentJsonAtSelectionScalarLazy(scalarAnchor, scalarHead, resolveDoc) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorInsertContentJsonAtSelectionScalar(this._editorId, scalarAnchor, scalarHead, JSON.stringify(doc));
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorInsertContentJsonAtSelectionScalar(this._editorId, scalarAnchor, scalarHead, JSON.stringify(resolveDoc())), { cancelIfPreflightUpdated: true });
     }
     /** Replace entire document with HTML via transaction (preserves undo history). */
     replaceHtml(html) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorReplaceHtml(this._editorId, html);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorReplaceHtml(this._editorId, html));
     }
     /** Replace entire document with JSON via transaction (preserves undo history). */
     replaceJson(doc) {
@@ -557,20 +644,17 @@ class NativeEditorBridge {
     replaceJsonString(jsonString) {
         this.assertNotDestroyed();
         const normalizedJsonString = normalizeDocumentJsonString(jsonString, this._schema);
-        const json = getNativeModule().editorReplaceJson(this._editorId, normalizedJsonString);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorReplaceJson(this._editorId, normalizedJsonString));
     }
     /** Undo the last operation. Returns update or null if nothing to undo. */
     undo() {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorUndo(this._editorId);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorUndo(this._editorId));
     }
     /** Redo the last undone operation. Returns update or null if nothing to redo. */
     redo() {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorRedo(this._editorId);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => getNativeModule().editorRedo(this._editorId));
     }
     /** Check if undo is available. */
     canUndo() {
@@ -585,56 +669,61 @@ class NativeEditorBridge {
     /** Toggle a list type on the current selection. Wraps if not in list, unwraps if already in that list type. */
     toggleList(listType) {
         this.assertNotDestroyed();
-        const isActive = this.getCurrentState()?.activeState?.nodes?.[listType] === true;
-        const scalarSelection = this.currentScalarSelection();
-        const json = isActive
-            ? scalarSelection
-                ? getNativeModule().editorUnwrapFromListAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
-                : getNativeModule().editorUnwrapFromList(this._editorId)
-            : scalarSelection
-                ? getNativeModule().editorWrapInListAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, listType)
-                : getNativeModule().editorWrapInList(this._editorId, listType);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const isActive = this.getCurrentState()?.activeState?.nodes?.[listType] === true;
+            const scalarSelection = this.currentScalarSelection();
+            return isActive
+                ? scalarSelection
+                    ? getNativeModule().editorUnwrapFromListAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
+                    : getNativeModule().editorUnwrapFromList(this._editorId)
+                : scalarSelection
+                    ? getNativeModule().editorWrapInListAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, listType)
+                    : getNativeModule().editorWrapInList(this._editorId, listType);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Unwrap the current list item back to a paragraph. */
     unwrapFromList() {
         this.assertNotDestroyed();
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorUnwrapFromListAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
-            : getNativeModule().editorUnwrapFromList(this._editorId);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorUnwrapFromListAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
+                : getNativeModule().editorUnwrapFromList(this._editorId);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Indent the current list item into a nested list. */
     indentListItem() {
         this.assertNotDestroyed();
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorIndentListItemAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
-            : getNativeModule().editorIndentListItem(this._editorId);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorIndentListItemAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
+                : getNativeModule().editorIndentListItem(this._editorId);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Outdent the current list item to the parent list level. */
     outdentListItem() {
         this.assertNotDestroyed();
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorOutdentListItemAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
-            : getNativeModule().editorOutdentListItem(this._editorId);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorOutdentListItemAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head)
+                : getNativeModule().editorOutdentListItem(this._editorId);
+        }, { refreshSelectionAfterPreflight: true });
     }
     /** Insert a void node (e.g. 'horizontalRule') at the current selection. */
     insertNode(nodeType) {
         this.assertNotDestroyed();
-        const scalarSelection = this.currentScalarSelection();
-        const json = scalarSelection
-            ? getNativeModule().editorInsertNodeAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, nodeType)
-            : getNativeModule().editorInsertNode(this._editorId, nodeType);
-        return this.parseAndNoteUpdate(json);
+        return this.runPreparedCommand(() => {
+            const scalarSelection = this.currentScalarSelection();
+            return scalarSelection
+                ? getNativeModule().editorInsertNodeAtSelectionScalar(this._editorId, scalarSelection.anchor, scalarSelection.head, nodeType)
+                : getNativeModule().editorInsertNode(this._editorId, nodeType);
+        }, { refreshSelectionAfterPreflight: true });
     }
-    parseUpdateJson(json) {
+    parseUpdateJson(json, options) {
         this.assertNotDestroyed();
-        return this.parseAndNoteUpdate(json);
+        return this.parseAndNoteUpdate(json, options);
     }
     noteUpdate(update) {
         if (!update) {
@@ -648,17 +737,88 @@ class NativeEditorBridge {
             this.invalidateContentCaches();
             return;
         }
+        this._hasSeenDocumentVersion = true;
         if (update.documentVersion !== this._documentVersion) {
             this._documentVersion = update.documentVersion;
             this.invalidateContentCaches();
         }
     }
-    parseAndNoteUpdate(json) {
+    shouldRejectUpdate(update, json, options) {
+        if (!update) {
+            return false;
+        }
+        if (typeof update.documentVersion !== 'number') {
+            return (options?.rejectVersionlessAfterDocumentVersion === true &&
+                react_native_1.Platform.OS === 'android' &&
+                this._hasSeenDocumentVersion);
+        }
+        if (react_native_1.Platform.OS === 'android') {
+            this._hasSeenDocumentVersion = true;
+        }
+        if (update.documentVersion < this._documentVersion) {
+            return true;
+        }
+        if (options?.rejectSameDocumentVersion === true) {
+            return (update.documentVersion === this._documentVersion &&
+                json === this._lastAcceptedUpdateJson);
+        }
+        return false;
+    }
+    parseAndNoteUpdate(json, options) {
         let update = parseEditorUpdateJson(json, this._renderBlocksCache ?? undefined);
+        if (this.shouldRejectUpdate(update, json, options)) {
+            return null;
+        }
         if (update?.renderPatch && !update.renderBlocks) {
-            update = parseEditorUpdateJson(getNativeModule().editorGetCurrentState(this._editorId), this._renderBlocksCache ?? undefined);
+            json = getNativeModule().editorGetCurrentState(this._editorId);
+            update = parseEditorUpdateJson(json, this._renderBlocksCache ?? undefined);
+            if (this.shouldRejectUpdate(update, json, options)) {
+                return null;
+            }
         }
         this.noteUpdate(update);
+        if (update) {
+            this._lastAcceptedUpdateJson = json;
+        }
+        return update;
+    }
+    prepareForCommand() {
+        this._lastCommandBlocked = false;
+        this._lastCommandBlockedReason = null;
+        this._lastCommandPreflightUpdate = null;
+        const nativeModule = getNativeModule();
+        const prepareForCommand = nativeModule.editorPrepareForCommand;
+        if (typeof prepareForCommand !== 'function') {
+            return true;
+        }
+        const preparation = parseCommandPreparationJson(prepareForCommand(this._editorId));
+        if (preparation.updateJSON) {
+            this._lastCommandPreflightUpdate = this.parseAndNoteUpdate(preparation.updateJSON, {
+                rejectVersionlessAfterDocumentVersion: true,
+            });
+        }
+        if (!preparation.ready) {
+            this._lastCommandBlocked = true;
+            this._lastCommandBlockedReason = preparation.blockedReason ?? 'unknown';
+            return false;
+        }
+        return true;
+    }
+    runPreparedCommand(mutate, options) {
+        if (!this.prepareForCommand()) {
+            return null;
+        }
+        if (options?.cancelIfPreflightUpdated === true &&
+            this._lastCommandPreflightUpdate != null) {
+            return null;
+        }
+        if (options?.refreshSelectionAfterPreflight === true && react_native_1.Platform.OS === 'android') {
+            this.getSelection();
+        }
+        const update = this.parseAndNoteUpdate(mutate());
+        if (update) {
+            this._lastCommandPreflightUpdate = null;
+        }
         return update;
     }
     invalidateContentCaches() {