@apollohg/react-native-prose-editor 0.4.0 → 0.4.2

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/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

@@ -694,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.
  */
@@ -738,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
@@ -780,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.
  */
@@ -1296,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
     }
@@ -1308,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
     }
@@ -1320,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
     }

package/ios/NativeEditorExpoView.swift

@@ -1596,6 +1596,11 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     private var addons = NativeEditorAddons(mentions: nil)
     private var mentionQueryState: MentionQueryState?
     private var lastMentionEventJSON: String?
+    private var lastThemeJSON: String?
+    private var lastAddonsJSON: String?
+    private var lastRemoteSelectionsJSON: String?
+    private var lastToolbarItemsJSON: String?
+    private var lastToolbarFrameJSON: String?
     private var pendingEditorUpdateJSON: String?
     private var pendingEditorUpdateRevision = 0
     private var appliedEditorUpdateRevision = 0
@@ -1624,17 +1629,18 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     let onToolbarAction = EventDispatcher()
     let onAddonEvent = EventDispatcher()
     private var lastEmittedContentHeight: CGFloat = 0
+    private var cachedAutoGrowContentHeight: CGFloat = 0
 
     // MARK: - Initialization
 
     required init(appContext: AppContext? = nil) {
         richTextView = RichTextEditorView(frame: .zero)
         super.init(appContext: appContext)
-        richTextView.onHeightMayChange = { [weak self] in
+        richTextView.onHeightMayChange = { [weak self] measuredHeight in
             guard let self, self.heightBehavior == .autoGrow else { return }
+            self.cachedAutoGrowContentHeight = measuredHeight
             self.invalidateIntrinsicContentSize()
-            self.superview?.setNeedsLayout()
-            self.emitContentHeightIfNeeded(force: true)
+            self.emitContentHeightIfNeeded(force: true, measuredHeight: measuredHeight)
         }
         richTextView.textView.editorDelegate = self
         configureAccessoryToolbar()
@@ -1666,6 +1672,9 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         guard heightBehavior == .autoGrow else {
             return CGSize(width: UIView.noIntrinsicMetric, height: UIView.noIntrinsicMetric)
         }
+        if cachedAutoGrowContentHeight > 0 {
+            return CGSize(width: UIView.noIntrinsicMetric, height: cachedAutoGrowContentHeight)
+        }
         return richTextView.intrinsicContentSize
     }
 
@@ -1676,6 +1685,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         let currentWidth = bounds.width.rounded(.towardZero)
         guard currentWidth != lastAutoGrowWidth else { return }
         lastAutoGrowWidth = currentWidth
+        cachedAutoGrowContentHeight = 0
         invalidateIntrinsicContentSize()
         emitContentHeightIfNeeded(force: true)
     }
@@ -1711,6 +1721,8 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     func setThemeJson(_ themeJson: String?) {
+        guard lastThemeJSON != themeJson else { return }
+        lastThemeJSON = themeJson
         let theme = EditorTheme.from(json: themeJson)
         richTextView.applyTheme(theme)
         accessoryToolbar.apply(theme: theme?.toolbar)
@@ -1724,12 +1736,16 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     }
 
     func setAddonsJson(_ addonsJson: String?) {
+        guard lastAddonsJSON != addonsJson else { return }
+        lastAddonsJSON = addonsJson
         addons = NativeEditorAddons.from(json: addonsJson)
         accessoryToolbar.apply(mentionTheme: richTextView.textView.theme?.mentions ?? addons.mentions?.theme)
         refreshMentionQuery()
     }
 
     func setRemoteSelectionsJson(_ remoteSelectionsJson: String?) {
+        guard lastRemoteSelectionsJSON != remoteSelectionsJson else { return }
+        lastRemoteSelectionsJSON = remoteSelectionsJson
         richTextView.setRemoteSelections(RemoteSelectionDecoration.from(json: remoteSelectionsJson))
     }
 
@@ -1758,6 +1774,9 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         let nextBehavior = EditorHeightBehavior(rawValue: rawHeightBehavior) ?? .fixed
         guard nextBehavior != heightBehavior else { return }
         heightBehavior = nextBehavior
+        if nextBehavior != .autoGrow {
+            cachedAutoGrowContentHeight = 0
+        }
         richTextView.heightBehavior = nextBehavior
         invalidateIntrinsicContentSize()
         setNeedsLayout()
@@ -1770,22 +1789,29 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         richTextView.allowImageResizing = allowImageResizing
     }
 
-    private func emitContentHeightIfNeeded(force: Bool = false) {
+    private func emitContentHeightIfNeeded(force: Bool = false, measuredHeight: CGFloat? = nil) {
         guard heightBehavior == .autoGrow else { return }
-        let contentHeight = ceil(richTextView.intrinsicContentSize.height)
+        let resolvedHeight = measuredHeight
+            ?? (cachedAutoGrowContentHeight > 0 ? cachedAutoGrowContentHeight : richTextView.intrinsicContentSize.height)
+        let contentHeight = ceil(resolvedHeight)
         guard contentHeight > 0 else { return }
         guard force || abs(contentHeight - lastEmittedContentHeight) > 0.5 else { return }
+        cachedAutoGrowContentHeight = contentHeight
         lastEmittedContentHeight = contentHeight
         onContentHeightChange(["contentHeight": contentHeight])
     }
 
     func setToolbarButtonsJson(_ toolbarButtonsJson: String?) {
+        guard lastToolbarItemsJSON != toolbarButtonsJson else { return }
+        lastToolbarItemsJSON = toolbarButtonsJson
         toolbarItems = NativeToolbarItem.from(json: toolbarButtonsJson)
         accessoryToolbar.setItems(toolbarItems)
         refreshSystemAssistantToolbarIfNeeded()
     }
 
     func setToolbarFrameJson(_ toolbarFrameJson: String?) {
+        guard lastToolbarFrameJSON != toolbarFrameJson else { return }
+        lastToolbarFrameJSON = toolbarFrameJson
         guard let toolbarFrameJson,
               let data = toolbarFrameJson.data(using: .utf8),
               let raw = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
@@ -1917,11 +1943,15 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     // MARK: - EditorTextViewDelegate
 
     func editorTextView(_ textView: EditorTextView, selectionDidChange anchor: UInt32, head: UInt32) {
-        refreshToolbarStateFromEditorSelection()
+        let stateJSON = refreshToolbarStateFromEditorSelection()
         refreshSystemAssistantToolbarIfNeeded()
         refreshMentionQuery()
         richTextView.refreshRemoteSelections()
-        onSelectionChange(["anchor": Int(anchor), "head": Int(head)])
+        var event: [String: Any] = ["anchor": Int(anchor), "head": Int(head)]
+        if let stateJSON {
+            event["stateJson"] = stateJSON
+        }
+        onSelectionChange(event)
     }
 
     func editorTextView(_ textView: EditorTextView, didReceiveUpdate updateJSON: String) {
@@ -1936,12 +1966,14 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         onEditorUpdate(["updateJson": updateJSON])
     }
 
-    private func refreshToolbarStateFromEditorSelection() {
-        guard richTextView.editorId != 0 else { return }
-        let stateJSON = editorGetCurrentState(id: richTextView.editorId)
-        guard let state = NativeToolbarState(updateJSON: stateJSON) else { return }
+    @discardableResult
+    private func refreshToolbarStateFromEditorSelection() -> String? {
+        guard richTextView.editorId != 0 else { return nil }
+        let stateJSON = editorGetSelectionState(id: richTextView.editorId)
+        guard let state = NativeToolbarState(updateJSON: stateJSON) else { return nil }
         toolbarState = state
         accessoryToolbar.apply(state: state)
+        return stateJSON
     }
 
     private func configureAccessoryToolbar() {

package/ios/NativeEditorModule.swift

@@ -58,6 +58,9 @@ public class NativeEditorModule: Module {
         Function("editorGetJson") { (id: Int) -> String in
             editorGetJson(id: UInt64(id))
         }
+        Function("editorGetContentSnapshot") { (id: Int) -> String in
+            editorGetContentSnapshot(id: UInt64(id))
+        }
         Function("editorInsertText") { (id: Int, pos: Int, text: String) -> String in
             editorInsertText(id: UInt64(id), pos: UInt32(pos), text: text)
         }
@@ -234,6 +237,9 @@ public class NativeEditorModule: Module {
         Function("editorGetSelection") { (id: Int) -> String in
             editorGetSelection(id: UInt64(id))
         }
+        Function("editorGetSelectionState") { (id: Int) -> String in
+            editorGetSelectionState(id: UInt64(id))
+        }
         Function("editorDocToScalar") { (id: Int, docPos: Int) -> Int in
             Int(editorDocToScalar(id: UInt64(id), docPos: UInt32(docPos)))
         }