@apollohg/react-native-prose-editor 0.4.1 → 0.4.3

package/README.md

@@ -49,7 +49,6 @@ The minimum tested Expo version is SDK 54.
 Required peer dependencies:
 
 - `expo`
-- `expo-modules-core`
 - `react`
 - `react-native`
 - `@expo/vector-icons`
@@ -57,7 +56,7 @@ Required peer dependencies:
 Install the package:
 
 ```sh
-npm install @apollohg/react-native-prose-editor
+npm install @apollohg/react-native-prose-editor@0.4.3
 ```
 
 For local package development in this repo:
@@ -111,6 +110,8 @@ For setup and customization details, start with the [Documentation Index](./docs
 
 For realtime collaboration, including the correct `useYjsCollaboration()` wiring, encoded-state persistence, remote cursors, and automatic reconnect behavior, see the [Collaboration Guide](./docs/modules/collaboration.md).
 
+For whole-document JSON loads, `initialJSON`, controlled `valueJSON`, and `setContentJson()` will normalize an empty root document like `{ type: 'doc', content: [] }` to the active schema's empty text block so block-constrained schemas still load a valid empty document.
+
 ## Development
 
 Common commands:

package/dist/NativeEditorBridge.d.ts

@@ -1,4 +1,4 @@
-import type { SchemaDefinition } from './schemas';
+import { type SchemaDefinition } from './schemas';
 export interface NativeEditorModule {
     editorCreate(configJson: string): number;
     editorDestroy(editorId: number): void;
@@ -150,6 +150,7 @@ export declare function parseCollaborationResultJson(json: string): Collaboratio
 export declare function _resetNativeModuleCache(): void;
 export declare class NativeEditorBridge {
     private _editorId;
+    private _schema?;
     private _destroyed;
     private _lastSelection;
     private _documentVersion;

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 schemas_1 = require("./schemas");
 const ERR_DESTROYED = 'NativeEditorBridge: editor has been destroyed';
 const ERR_NATIVE_RESPONSE = 'NativeEditorBridge: invalid JSON response from native module';
 const ERR_INVALID_ENCODED_STATE = 'NativeEditorBridge: invalid encoded collaboration state';
@@ -233,6 +234,16 @@ function encodeCollaborationStateBase64(encodedState) {
 function decodeCollaborationStateBase64(base64) {
     return base64ToBytes(base64);
 }
+function normalizeDocumentJsonString(jsonString, schema) {
+    try {
+        const parsed = JSON.parse(jsonString);
+        const normalized = (0, schemas_1.normalizeDocumentJson)(parsed, schema);
+        return normalized === parsed ? jsonString : JSON.stringify(normalized);
+    }
+    catch {
+        return jsonString;
+    }
+}
 function parseCollaborationResultJson(json) {
     if (!json || json === '') {
         return {
@@ -275,7 +286,7 @@ function _resetNativeModuleCache() {
     _nativeModule = null;
 }
 class NativeEditorBridge {
-    constructor(editorId) {
+    constructor(editorId, schema) {
         this._destroyed = false;
         this._lastSelection = { type: 'text', anchor: 0, head: 0 };
         this._documentVersion = 0;
@@ -283,10 +294,12 @@ class NativeEditorBridge {
         this._cachedJsonString = null;
         this._renderBlocksCache = null;
         this._editorId = editorId;
+        this._schema = schema;
     }
     /** Create a new editor instance backed by the Rust engine. */
     static create(config) {
         const configObj = {};
+        let parsedSchema;
         if (config?.maxLength != null)
             configObj.maxLength = config.maxLength;
         if (config?.allowBase64Images != null) {
@@ -294,14 +307,15 @@ class NativeEditorBridge {
         }
         if (config?.schemaJson != null) {
             try {
-                configObj.schema = JSON.parse(config.schemaJson);
+                parsedSchema = JSON.parse(config.schemaJson);
+                configObj.schema = parsedSchema;
             }
             catch {
                 // Fall back to the default schema when the provided JSON is invalid.
             }
         }
         const id = getNativeModule().editorCreate(JSON.stringify(configObj));
-        return new NativeEditorBridge(id);
+        return new NativeEditorBridge(id, parsedSchema);
     }
     /** The underlying native editor ID. */
     get editorId() {
@@ -339,14 +353,15 @@ class NativeEditorBridge {
     }
     /** Set content from ProseMirror JSON. Returns render elements. */
     setJson(doc) {
-        return this.setJsonString(JSON.stringify(doc));
+        return this.setJsonString(JSON.stringify((0, schemas_1.normalizeDocumentJson)(doc, this._schema)));
     }
     /** Set content from a serialized ProseMirror JSON string. Returns render elements. */
     setJsonString(jsonString) {
         this.assertNotDestroyed();
         this.invalidateContentCaches();
         this._renderBlocksCache = null;
-        const json = getNativeModule().editorSetJson(this._editorId, jsonString);
+        const normalizedJsonString = normalizeDocumentJsonString(jsonString, this._schema);
+        const json = getNativeModule().editorSetJson(this._editorId, normalizedJsonString);
         return parseRenderElements(json);
     }
     /** Get content as raw ProseMirror JSON string. */
@@ -520,12 +535,13 @@ class NativeEditorBridge {
     }
     /** Replace entire document with JSON via transaction (preserves undo history). */
     replaceJson(doc) {
-        return this.replaceJsonString(JSON.stringify(doc));
+        return this.replaceJsonString(JSON.stringify((0, schemas_1.normalizeDocumentJson)(doc, this._schema)));
     }
     /** Replace entire document with a serialized JSON transaction. */
     replaceJsonString(jsonString) {
         this.assertNotDestroyed();
-        const json = getNativeModule().editorReplaceJson(this._editorId, jsonString);
+        const normalizedJsonString = normalizeDocumentJsonString(jsonString, this._schema);
+        const json = getNativeModule().editorReplaceJson(this._editorId, normalizedJsonString);
         return this.parseAndNoteUpdate(json);
     }
     /** Undo the last operation. Returns update or null if nothing to undo. */

package/dist/NativeRichTextEditor.d.ts

@@ -4,8 +4,7 @@ import { type ActiveState, type DocumentJSON, type HistoryState, type Selection
 import { type EditorToolbarHeadingLevel, type EditorToolbarItem } from './EditorToolbar';
 import { type EditorTheme } from './EditorTheme';
 import { type EditorAddons } from './addons';
-import { type SchemaDefinition } from './schemas';
-import { type ImageNodeAttributes } from './schemas';
+import { type ImageNodeAttributes, type SchemaDefinition } from './schemas';
 export type NativeRichTextEditorHeightBehavior = 'fixed' | 'autoGrow';
 export type NativeRichTextEditorToolbarPlacement = 'keyboard' | 'inline';
 export interface RemoteSelectionDecoration {

package/dist/NativeRichTextEditor.js

@@ -10,7 +10,6 @@ const EditorToolbar_1 = require("./EditorToolbar");
 const EditorTheme_1 = require("./EditorTheme");
 const addons_1 = require("./addons");
 const schemas_1 = require("./schemas");
-const schemas_2 = require("./schemas");
 const NativeEditorView = (0, expo_modules_core_1.requireNativeViewManager)('NativeEditor');
 const DEV_NATIVE_VIEW_KEY = __DEV__
     ? `native-editor-dev:${Math.random().toString(36).slice(2)}`
@@ -35,7 +34,7 @@ function mapToolbarChildForNative(item, activeState, editable, onRequestLink, on
             label: item.label,
             icon: item.icon,
             isActive: false,
-            isDisabled: !editable || !onRequestImage || !activeState.insertableNodes.includes(schemas_2.IMAGE_NODE_NAME),
+            isDisabled: !editable || !onRequestImage || !activeState.insertableNodes.includes(schemas_1.IMAGE_NODE_NAME),
         };
     }
     return item;
@@ -188,9 +187,11 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         : undefined;
     const mentionSuggestionsByKeyRef = (0, react_1.useRef)(new Map());
     mentionSuggestionsByKeyRef.current = new Map((addons?.mentions?.suggestions ?? []).map((suggestion) => [suggestion.key, suggestion]));
-    const serializedSchemaJson = useSerializedValue(addons?.mentions != null ? (0, addons_1.withMentionsSchema)(schema ?? schemas_1.tiptapSchema) : schema, (nextSchema) => stringifyCachedJson(nextSchema));
-    const serializedInitialJson = useSerializedValue(initialJSON, stringifyCachedJson);
-    const serializedValueJson = useSerializedValue(valueJSON, stringifyCachedJson, valueJSONRevision);
+    const bridgeSchema = addons?.mentions != null ? (0, addons_1.withMentionsSchema)(schema ?? schemas_1.tiptapSchema) : schema;
+    const documentSchema = bridgeSchema ?? schemas_1.tiptapSchema;
+    const serializedSchemaJson = useSerializedValue(bridgeSchema, (nextSchema) => stringifyCachedJson(nextSchema));
+    const serializedInitialJson = useSerializedValue(initialJSON, (doc) => stringifyCachedJson((0, schemas_1.normalizeDocumentJson)(doc, documentSchema)));
+    const serializedValueJson = useSerializedValue(valueJSON, (doc) => stringifyCachedJson((0, schemas_1.normalizeDocumentJson)(doc, documentSchema)), valueJSONRevision);
     const themeJson = useSerializedValue(theme, EditorTheme_1.serializeEditorTheme);
     const addonsJson = useSerializedValue(addons, addons_1.serializeEditorAddons);
     const remoteSelectionsJson = useSerializedValue(remoteSelections, (selections) => serializeRemoteSelections(selections));
@@ -493,7 +494,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
             if (selection) {
                 restoreSelection(selection);
             }
-            return (bridgeRef.current?.insertContentJson((0, schemas_2.buildImageFragmentJson)({
+            return (bridgeRef.current?.insertContentJson((0, schemas_1.buildImageFragmentJson)({
                 src: trimmedSrc,
                 ...(attrs ?? {}),
             })) ?? null);
@@ -668,7 +669,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         return null;
     const isLinkActive = activeState.marks.link === true;
     const allowsLink = activeState.allowedMarks.includes('link');
-    const canInsertImage = activeState.insertableNodes.includes(schemas_2.IMAGE_NODE_NAME);
+    const canInsertImage = activeState.insertableNodes.includes(schemas_1.IMAGE_NODE_NAME);
     const canRequestLink = typeof onRequestLink === 'function';
     const canRequestImage = typeof onRequestImage === 'function';
     const cachedToolbarItems = toolbarItemsSerializationCacheRef.current;

package/dist/schemas.d.ts

@@ -32,4 +32,6 @@ export declare function imageNodeSpec(name?: string): NodeSpec;
 export declare function withImagesSchema(schema: SchemaDefinition): SchemaDefinition;
 export declare function buildImageFragmentJson(attrs: ImageNodeAttributes): DocumentJSON;
 export declare const tiptapSchema: SchemaDefinition;
+export declare function defaultEmptyDocument(schema?: SchemaDefinition): DocumentJSON;
+export declare function normalizeDocumentJson(doc: DocumentJSON, schema?: SchemaDefinition): DocumentJSON;
 export declare const prosemirrorSchema: SchemaDefinition;

package/dist/schemas.js

@@ -4,6 +4,8 @@ exports.prosemirrorSchema = exports.tiptapSchema = exports.IMAGE_NODE_NAME = voi
 exports.imageNodeSpec = imageNodeSpec;
 exports.withImagesSchema = withImagesSchema;
 exports.buildImageFragmentJson = buildImageFragmentJson;
+exports.defaultEmptyDocument = defaultEmptyDocument;
+exports.normalizeDocumentJson = normalizeDocumentJson;
 exports.IMAGE_NODE_NAME = 'image';
 const HEADING_LEVELS = [1, 2, 3, 4, 5, 6];
 function imageNodeSpec(name = exports.IMAGE_NODE_NAME) {
@@ -129,6 +131,67 @@ exports.tiptapSchema = {
     ],
     marks: MARKS,
 };
+function acceptingGroupsForChildCount(content, existingChildCount) {
+    const tokens = content
+        .trim()
+        .split(/\s+/)
+        .filter(Boolean)
+        .map((token) => {
+        const quantifier = token[token.length - 1];
+        if (quantifier === '+' || quantifier === '*' || quantifier === '?') {
+            return {
+                group: token.slice(0, -1),
+                min: quantifier === '+' ? 1 : 0,
+                max: quantifier === '?' ? 1 : null,
+            };
+        }
+        return {
+            group: token,
+            min: 1,
+            max: 1,
+        };
+    });
+    let remaining = existingChildCount;
+    const acceptingGroups = [];
+    for (const token of tokens) {
+        if (remaining >= token.min) {
+            const consumed = token.max == null ? remaining : Math.min(remaining, token.max);
+            remaining = Math.max(0, remaining - consumed);
+            const atMax = token.max != null && consumed >= token.max;
+            if (!atMax) {
+                acceptingGroups.push(token.group);
+            }
+            continue;
+        }
+        acceptingGroups.push(token.group);
+        break;
+    }
+    return acceptingGroups;
+}
+function defaultEmptyDocument(schema = exports.tiptapSchema) {
+    const docNode = schema.nodes.find((node) => node.role === 'doc' || node.name === 'doc');
+    const acceptingGroups = docNode == null ? [] : acceptingGroupsForChildCount(docNode.content ?? '', 0);
+    const matchingTextBlocks = schema.nodes.filter((node) => node.role === 'textBlock' &&
+        acceptingGroups.some((group) => node.name === group || node.group === group));
+    const preferredTextBlock = matchingTextBlocks.find((node) => node.htmlTag === 'p' || node.name === 'paragraph') ??
+        matchingTextBlocks[0] ??
+        schema.nodes.find((node) => node.htmlTag === 'p' || node.name === 'paragraph') ??
+        schema.nodes.find((node) => node.role === 'textBlock');
+    return {
+        type: 'doc',
+        content: [{ type: preferredTextBlock?.name ?? 'paragraph' }],
+    };
+}
+function normalizeDocumentJson(doc, schema = exports.tiptapSchema) {
+    const root = doc;
+    if (root?.type !== 'doc') {
+        return doc;
+    }
+    if (Array.isArray(root.content) && root.content.length > 0) {
+        return doc;
+    }
+    return defaultEmptyDocument(schema);
+}
 exports.prosemirrorSchema = {
     nodes: [
         {

package/ios/EditorCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/RichTextEditorView.swift

@@ -1153,6 +1153,15 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         }
     }
 
+    override func becomeFirstResponder() -> Bool {
+        let didBecomeFirstResponder = super.becomeFirstResponder()
+        if didBecomeFirstResponder {
+            _ = normalizeSelectionForEmptyBlockAutocapitalizationIfNeeded()
+            refreshTypingAttributesForSelection()
+        }
+        return didBecomeFirstResponder
+    }
+
     private func isRenderedContentEmpty() -> Bool {
         let renderedText = textStorage.string
         guard !renderedText.isEmpty else { return true }
@@ -1169,6 +1178,23 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         return true
     }
 
+    @discardableResult
+    private func normalizeSelectionForEmptyBlockAutocapitalizationIfNeeded() -> Bool {
+        guard textStorage.length == 1 else { return false }
+        guard textStorage.string.unicodeScalars.elementsEqual([Self.emptyBlockPlaceholderScalar]) else {
+            return false
+        }
+
+        let currentRange = selectedRange
+        guard currentRange.location != NSNotFound, currentRange.length == 0 else { return false }
+        guard currentRange.location == textStorage.length else { return false }
+
+        let adjustedRange = NSRange(location: 0, length: 0)
+        guard currentRange != adjustedRange else { return false }
+        selectedRange = adjustedRange
+        return true
+    }
+
     private func refreshPlaceholderVisibility() {
         placeholderLabel.isHidden = placeholder.isEmpty || !isRenderedContentEmpty()
     }
@@ -1947,6 +1973,9 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     func textViewDidChangeSelection(_ textView: UITextView) {
         guard textView === self else { return }
         guard !isApplyingRustState else { return }
+        if normalizeSelectionForEmptyBlockAutocapitalizationIfNeeded() {
+            return
+        }
         refreshNativeSelectionChromeVisibility()
         onSelectionOrContentMayChange?()
         scheduleSelectionSync()
@@ -2099,7 +2128,9 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     }
 
     func refreshSelectionVisualState() {
+        _ = normalizeSelectionForEmptyBlockAutocapitalizationIfNeeded()
         refreshNativeSelectionChromeVisibility()
+        refreshTypingAttributesForSelection()
         onSelectionOrContentMayChange?()
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apollohg/react-native-prose-editor",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "description": "Native rich text editor with Rust core for React Native",
     "license": "Apache-2.0",
     "homepage": "https://github.com/apollohg/react-native-prose-editor",