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

package/dist/YjsCollaboration.js

@@ -17,11 +17,119 @@ const EMPTY_DOCUMENT = {
     ],
 };
 const SELECTION_AWARENESS_DEBOUNCE_MS = 40;
-function cloneDocument(doc) {
-    return JSON.parse(JSON.stringify(doc ?? EMPTY_DOCUMENT));
+function cloneJsonValue(value) {
+    if (Array.isArray(value)) {
+        return value.map((item) => cloneJsonValue(item));
+    }
+    if (value != null && typeof value === 'object') {
+        const clone = {};
+        for (const [key, nestedValue] of Object.entries(value)) {
+            clone[key] = cloneJsonValue(nestedValue);
+        }
+        return clone;
+    }
+    return value;
+}
+function acceptingGroupsForContent(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) {
+    if (!schema) {
+        return {
+            type: 'doc',
+            content: [{ type: 'paragraph' }],
+        };
+    }
+    const docNode = schema.nodes.find((node) => node.role === 'doc' || node.name === 'doc');
+    const acceptingGroups = docNode == null ? [] : acceptingGroupsForContent(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');
+    if (!preferredTextBlock) {
+        return {
+            type: 'doc',
+            content: [{ type: 'paragraph' }],
+        };
+    }
+    return {
+        type: 'doc',
+        content: [{ type: preferredTextBlock.name }],
+    };
+}
+function initialFallbackDocument(options) {
+    return options.initialDocumentJson
+        ? cloneJsonValue(options.initialDocumentJson)
+        : defaultEmptyDocument(options.schema);
+}
+function shouldUseFallbackForNativeDocument(doc, options) {
+    if (options.initialDocumentJson != null || options.initialEncodedState != null) {
+        return false;
+    }
+    if (doc.type !== 'doc') {
+        return false;
+    }
+    return !Array.isArray(doc.content) || doc.content.length === 0;
 }
 function awarenessToRecord(awareness) {
-    return JSON.parse(JSON.stringify(awareness));
+    return awareness;
+}
+function localAwarenessEquals(left, right) {
+    const leftSelection = left.selection;
+    const rightSelection = right.selection;
+    if (leftSelection == null || rightSelection == null) {
+        if (leftSelection !== rightSelection) {
+            return false;
+        }
+    }
+    else if (leftSelection.anchor !== rightSelection.anchor ||
+        leftSelection.head !== rightSelection.head) {
+        return false;
+    }
+    const leftUser = left.user;
+    const rightUser = right.user;
+    return (left.focused === right.focused &&
+        leftUser.userId === rightUser.userId &&
+        leftUser.name === rightUser.name &&
+        leftUser.color === rightUser.color &&
+        leftUser.avatarUrl === rightUser.avatarUrl &&
+        JSON.stringify(leftUser.extra ?? null) === JSON.stringify(rightUser.extra ?? null));
 }
 function normalizeMessageBytes(data) {
     if (data instanceof ArrayBuffer) {
@@ -109,11 +217,6 @@ function encodeInitialStateKey(encodedState) {
         return '';
     return (0, NativeEditorBridge_1.encodeCollaborationStateBase64)(encodedState);
 }
-function encodeDocumentKey(doc) {
-    if (doc == null)
-        return '';
-    return JSON.stringify(doc);
-}
 class YjsCollaborationControllerImpl {
     constructor(options, callbacks = {}) {
         this.socket = null;
@@ -126,23 +229,26 @@ class YjsCollaborationControllerImpl {
         this.callbacks = callbacks;
         this.createWebSocket = options.createWebSocket;
         this.retryIntervalMs = options.retryIntervalMs;
-        const hasInitialEncodedState = options.initialEncodedState != null;
         this.localAwarenessState = {
             user: options.localAwareness,
             focused: false,
         };
         this.bridge = NativeEditorBridge_1.NativeCollaborationBridge.create({
             fragmentName: options.fragmentName ?? DEFAULT_YJS_FRAGMENT_NAME,
+            schema: options.schema,
             initialEncodedState: options.initialEncodedState,
             localAwareness: awarenessToRecord(this.localAwarenessState),
         });
+        const nativeDocumentJson = this.bridge.getDocumentJson();
         this._state = {
             documentId: options.documentId,
             status: 'idle',
             isConnected: false,
-            documentJson: hasInitialEncodedState
-                ? this.bridge.getDocumentJson()
-                : cloneDocument(options.initialDocumentJson),
+            documentJson: options.initialDocumentJson != null
+                ? cloneJsonValue(options.initialDocumentJson)
+                : shouldUseFallbackForNativeDocument(nativeDocumentJson, options)
+                    ? defaultEmptyDocument(options.schema)
+                    : nativeDocumentJson,
         };
         this._peers = this.bridge.getPeers();
         if (options.connect !== false) {
@@ -314,10 +420,10 @@ class YjsCollaborationControllerImpl {
     destroy() {
         if (this.destroyed)
             return;
-        this.destroyed = true;
         this.cancelRetry();
         this.cancelPendingAwarenessSync();
         this.disconnect();
+        this.destroyed = true;
         this.bridge.destroy();
     }
     updateLocalAwareness(partial) {
@@ -336,22 +442,33 @@ class YjsCollaborationControllerImpl {
     handleSelectionChange(selection) {
         if (this.destroyed)
             return;
-        this.localAwarenessState = this.mergeLocalAwareness({
+        const nextAwareness = this.mergeLocalAwareness({
             focused: true,
             selection: selectionToAwarenessRange(selection),
         });
+        if (localAwarenessEquals(nextAwareness, this.localAwarenessState)) {
+            return;
+        }
+        this.localAwarenessState = nextAwareness;
         this.scheduleAwarenessSync();
     }
     handleFocusChange(focused) {
         if (this.destroyed)
             return;
-        this.localAwarenessState = this.mergeLocalAwareness({ focused });
+        const nextAwareness = this.mergeLocalAwareness({ focused });
+        if (localAwarenessEquals(nextAwareness, this.localAwarenessState)) {
+            if (this.pendingAwarenessTimer != null) {
+                this.commitLocalAwareness();
+            }
+            return;
+        }
+        this.localAwarenessState = nextAwareness;
         this.commitLocalAwareness();
     }
     applyResult(result) {
         if (result.documentChanged && result.documentJson) {
             this.setState({
-                documentJson: cloneDocument(result.documentJson),
+                documentJson: result.documentJson,
             });
         }
         if (result.peersChanged && result.peers) {
@@ -489,14 +606,14 @@ function useYjsCollaboration(options) {
     const createWebSocketRef = (0, react_1.useRef)(options.createWebSocket);
     createWebSocketRef.current = options.createWebSocket;
     const controllerRef = (0, react_1.useRef)(null);
-    const initialDocumentKey = encodeDocumentKey(options.initialDocumentJson);
     const initialEncodedStateKey = encodeInitialStateKey(options.initialEncodedState);
     const localAwarenessKey = JSON.stringify(options.localAwareness);
+    const schemaKey = JSON.stringify(options.schema ?? null);
     const [state, setState] = (0, react_1.useState)({
         documentId: options.documentId,
         status: 'idle',
         isConnected: false,
-        documentJson: cloneDocument(options.initialDocumentJson),
+        documentJson: initialFallbackDocument(options),
     });
     const [peers, setPeers] = (0, react_1.useState)([]);
     (0, react_1.useEffect)(() => {
@@ -529,7 +646,7 @@ function useYjsCollaboration(options) {
                 documentId: options.documentId,
                 status: 'error',
                 isConnected: false,
-                documentJson: cloneDocument(options.initialDocumentJson),
+                documentJson: initialFallbackDocument(options),
                 lastError: nextError,
             };
             controllerRef.current = null;
@@ -543,7 +660,12 @@ function useYjsCollaboration(options) {
             controllerRef.current = null;
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [options.documentId, options.fragmentName, initialDocumentKey, initialEncodedStateKey]);
+    }, [
+        options.documentId,
+        options.fragmentName,
+        schemaKey,
+        initialEncodedStateKey,
+    ]);
     (0, react_1.useEffect)(() => {
         controllerRef.current?.updateLocalAwareness({
             user: options.localAwareness,

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { NativeRichTextEditor, type NativeRichTextEditorProps, type NativeRichTextEditorRef, type NativeRichTextEditorHeightBehavior, type NativeRichTextEditorToolbarPlacement, type RemoteSelectionDecoration, type LinkRequestContext, type ImageRequestContext, } from './NativeRichTextEditor';
-export { EditorToolbar, DEFAULT_EDITOR_TOOLBAR_ITEMS, type EditorToolbarProps, type EditorToolbarItem, type EditorToolbarIcon, type EditorToolbarDefaultIconId, type EditorToolbarSFSymbolIcon, type EditorToolbarMaterialIcon, type EditorToolbarCommand, type EditorToolbarListType, } from './EditorToolbar';
+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, EditorHeadingTheme, EditorListTheme, EditorHorizontalRuleTheme, EditorMentionTheme, EditorToolbarTheme, EditorToolbarAppearance, EditorFontStyle, EditorFontWeight, } from './EditorTheme';
 export { MENTION_NODE_NAME, mentionNodeSpec, withMentionsSchema, buildMentionFragmentJson, type EditorAddons, type MentionsAddonConfig, type MentionSuggestion, type MentionQueryChangeEvent, type MentionSelectEvent, type EditorAddonEvent, } from './addons';
 export { tiptapSchema, prosemirrorSchema, IMAGE_NODE_NAME, imageNodeSpec, withImagesSchema, buildImageFragmentJson, type SchemaDefinition, type NodeSpec, type MarkSpec, type AttrSpec, type ImageNodeAttributes, } from './schemas';

package/dist/schemas.js

@@ -5,6 +5,7 @@ exports.imageNodeSpec = imageNodeSpec;
 exports.withImagesSchema = withImagesSchema;
 exports.buildImageFragmentJson = buildImageFragmentJson;
 exports.IMAGE_NODE_NAME = 'image';
+const HEADING_LEVELS = [1, 2, 3, 4, 5, 6];
 function imageNodeSpec(name = exports.IMAGE_NODE_NAME) {
     return {
         name,
@@ -22,6 +23,15 @@ function imageNodeSpec(name = exports.IMAGE_NODE_NAME) {
         isVoid: true,
     };
 }
+function headingNodeSpec(level) {
+    return {
+        name: `h${level}`,
+        content: 'inline*',
+        group: 'block',
+        role: 'textBlock',
+        htmlTag: `h${level}`,
+    };
+}
 function withImagesSchema(schema) {
     const hasImageNode = schema.nodes.some((node) => node.name === exports.IMAGE_NODE_NAME);
     if (hasImageNode) {
@@ -64,6 +74,7 @@ exports.tiptapSchema = {
             role: 'textBlock',
             htmlTag: 'p',
         },
+        ...HEADING_LEVELS.map((level) => headingNodeSpec(level)),
         {
             name: 'blockquote',
             content: 'block+',
@@ -132,6 +143,7 @@ exports.prosemirrorSchema = {
             role: 'textBlock',
             htmlTag: 'p',
         },
+        ...HEADING_LEVELS.map((level) => headingNodeSpec(level)),
         {
             name: 'blockquote',
             content: 'block+',

package/dist/useNativeEditor.d.ts

@@ -30,6 +30,8 @@ export interface UseNativeEditorReturn {
     redo: () => void;
     /** Toggle blockquote wrapping around the current block selection. */
     toggleBlockquote: () => void;
+    /** Toggle a heading level on the current block selection. */
+    toggleHeading: (level: 1 | 2 | 3 | 4 | 5 | 6) => void;
     /** Insert text at a position. */
     insertText: (pos: number, text: string) => void;
     /** Delete a range [from, to). */

package/dist/useNativeEditor.js

@@ -82,6 +82,12 @@ function useNativeEditor(options = {}) {
         const update = bridgeRef.current.toggleBlockquote();
         applyUpdate(update);
     }, [applyUpdate]);
+    const toggleHeading = (0, react_1.useCallback)((level) => {
+        if (!bridgeRef.current || bridgeRef.current.isDestroyed)
+            return;
+        const update = bridgeRef.current.toggleHeading(level);
+        applyUpdate(update);
+    }, [applyUpdate]);
     const insertText = (0, react_1.useCallback)((pos, text) => {
         if (!bridgeRef.current || bridgeRef.current.isDestroyed)
             return;
@@ -110,6 +116,7 @@ function useNativeEditor(options = {}) {
         undo,
         redo,
         toggleBlockquote,
+        toggleHeading,
         insertText,
         deleteRange,
         getHtml,

package/ios/EditorLayoutManager.swift

@@ -23,7 +23,7 @@ final class EditorLayoutManager: NSLayoutManager {
         textStorage.enumerateAttribute(
             RenderBridgeAttributes.blockquoteBorderColor,
             in: characterRange,
-            options: []
+            options: [.longestEffectiveRangeNotRequired]
         ) { value, range, _ in
             guard range.length > 0, let color = value as? UIColor else { return }
 
@@ -68,7 +68,7 @@ final class EditorLayoutManager: NSLayoutManager {
         textStorage.enumerateAttribute(
             RenderBridgeAttributes.listMarkerContext,
             in: characterRange,
-            options: []
+            options: [.longestEffectiveRangeNotRequired]
         ) { value, range, _ in
             guard range.length > 0, let listContext = value as? [String: Any] else { return }
 
@@ -90,7 +90,7 @@ final class EditorLayoutManager: NSLayoutManager {
         textStorage.enumerateAttribute(
             RenderBridgeAttributes.blockquoteBorderColor,
             in: characterRange,
-            options: []
+            options: [.longestEffectiveRangeNotRequired]
         ) { value, range, _ in
             guard range.length > 0, let color = value as? UIColor else { return }
 

package/ios/Generated_editor_core.swift

@@ -397,6 +397,22 @@ fileprivate final class UniffiHandleMap<T>: @unchecked Sendable {
 // Public interface members begin here.
 
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+fileprivate struct FfiConverterUInt8: FfiConverterPrimitive {
+    typealias FfiType = UInt8
+    typealias SwiftType = UInt8
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> UInt8 {
+        return try lift(readInt(&buf))
+    }
+
+    public static func write(_ value: UInt8, into buf: inout [UInt8]) {
+        writeInt(&buf, lower(value))
+    }
+}
+
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
@@ -678,6 +694,18 @@ public func editorDeleteAndSplitScalar(id: UInt64, scalarFrom: UInt32, scalarTo:
     )
 })
 }
+/**
+ * Delete backward relative to an explicit scalar selection. Returns an update JSON string.
+ */
+public func editorDeleteBackwardAtSelectionScalar(id: UInt64, scalarAnchor: UInt32, scalarHead: UInt32) -> String  {
+    return try!  FfiConverterString.lift(try! rustCall() {
+    uniffi_editor_core_fn_func_editor_delete_backward_at_selection_scalar(
+        FfiConverterUInt64.lower(id),
+        FfiConverterUInt32.lower(scalarAnchor),
+        FfiConverterUInt32.lower(scalarHead),$0
+    )
+})
+}
 /**
  * Delete a range. Returns an update JSON string.
  */
@@ -722,6 +750,16 @@ public func editorDocToScalar(id: UInt64, docPos: UInt32) -> UInt32  {
     )
 })
 }
+/**
+ * Get both HTML and ProseMirror JSON content in one payload.
+ */
+public func editorGetContentSnapshot(id: UInt64) -> String  {
+    return try!  FfiConverterString.lift(try! rustCall() {
+    uniffi_editor_core_fn_func_editor_get_content_snapshot(
+        FfiConverterUInt64.lower(id),$0
+    )
+})
+}
 /**
  * Get the current editor state (render elements, selection, active state,
  * history state) without performing any edits. Used by native views to pull
@@ -764,6 +802,16 @@ public func editorGetSelection(id: UInt64) -> String  {
     )
 })
 }
+/**
+ * Get the current selection-related editor state without render elements.
+ */
+public func editorGetSelectionState(id: UInt64) -> String  {
+    return try!  FfiConverterString.lift(try! rustCall() {
+    uniffi_editor_core_fn_func_editor_get_selection_state(
+        FfiConverterUInt64.lower(id),$0
+    )
+})
+}
 /**
  * Indent the current list item into a nested list. Returns an update JSON string.
  */
@@ -1085,6 +1133,30 @@ public func editorToggleBlockquoteAtSelectionScalar(id: UInt64, scalarAnchor: UI
     )
 })
 }
+/**
+ * Toggle a heading level on the current text-block selection. Returns an update JSON string.
+ */
+public func editorToggleHeading(id: UInt64, level: UInt8) -> String  {
+    return try!  FfiConverterString.lift(try! rustCall() {
+    uniffi_editor_core_fn_func_editor_toggle_heading(
+        FfiConverterUInt64.lower(id),
+        FfiConverterUInt8.lower(level),$0
+    )
+})
+}
+/**
+ * Toggle a heading level at an explicit scalar selection. Returns an update JSON string.
+ */
+public func editorToggleHeadingAtSelectionScalar(id: UInt64, scalarAnchor: UInt32, scalarHead: UInt32, level: UInt8) -> String  {
+    return try!  FfiConverterString.lift(try! rustCall() {
+    uniffi_editor_core_fn_func_editor_toggle_heading_at_selection_scalar(
+        FfiConverterUInt64.lower(id),
+        FfiConverterUInt32.lower(scalarAnchor),
+        FfiConverterUInt32.lower(scalarHead),
+        FfiConverterUInt8.lower(level),$0
+    )
+})
+}
 /**
  * Toggle a mark on the current selection. Returns an update JSON string.
  */
@@ -1256,6 +1328,9 @@ private let initializationResult: InitializationResult = {
     if (uniffi_editor_core_checksum_func_editor_delete_and_split_scalar() != 13764) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_editor_core_checksum_func_editor_delete_backward_at_selection_scalar() != 7697) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_editor_core_checksum_func_editor_delete_range() != 6109) {
         return InitializationResult.apiChecksumMismatch
     }
@@ -1268,6 +1343,9 @@ private let initializationResult: InitializationResult = {
     if (uniffi_editor_core_checksum_func_editor_doc_to_scalar() != 48291) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_editor_core_checksum_func_editor_get_content_snapshot() != 32837) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_editor_core_checksum_func_editor_get_current_state() != 13946) {
         return InitializationResult.apiChecksumMismatch
     }
@@ -1280,6 +1358,9 @@ private let initializationResult: InitializationResult = {
     if (uniffi_editor_core_checksum_func_editor_get_selection() != 20571) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_editor_core_checksum_func_editor_get_selection_state() != 16471) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_editor_core_checksum_func_editor_indent_list_item() != 10818) {
         return InitializationResult.apiChecksumMismatch
     }
@@ -1364,6 +1445,12 @@ private let initializationResult: InitializationResult = {
     if (uniffi_editor_core_checksum_func_editor_toggle_blockquote_at_selection_scalar() != 58523) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_editor_core_checksum_func_editor_toggle_heading() != 7099) {
+        return InitializationResult.apiChecksumMismatch
+    }
+    if (uniffi_editor_core_checksum_func_editor_toggle_heading_at_selection_scalar() != 54315) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_editor_core_checksum_func_editor_toggle_mark() != 30661) {
         return InitializationResult.apiChecksumMismatch
     }