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

package/android/src/main/java/com/apollohg/editor/EditorEditText.kt

@@ -18,6 +18,7 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.inputmethod.BaseInputConnection
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputConnection
 import android.view.inputmethod.InputMethodManager
@@ -107,6 +108,13 @@ class EditorEditText @JvmOverloads constructor(
         val end: Int
     )
 
+    private data class NativeTextMutation(
+        val scalarFrom: Int,
+        val scalarTo: Int,
+        val replacementText: String,
+        val resultingText: String
+    )
+
     /**
      * Listener interface for editor events, parallel to iOS's EditorTextViewDelegate.
      */
@@ -1223,6 +1231,66 @@ class EditorEditText @JvmOverloads constructor(
         applyUpdateJSON(updateJSON)
     }
 
+    private fun nativeTextMutationFromAuthorizedDiff(currentText: String): NativeTextMutation? {
+        val authorizedText = lastAuthorizedText
+        if (currentText == authorizedText) return null
+
+        var prefix = 0
+        val sharedLength = minOf(authorizedText.length, currentText.length)
+        while (
+            prefix < sharedLength &&
+            authorizedText[prefix] == currentText[prefix]
+        ) {
+            prefix++
+        }
+
+        var authorizedEnd = authorizedText.length
+        var currentEnd = currentText.length
+        while (
+            authorizedEnd > prefix &&
+            currentEnd > prefix &&
+            authorizedText[authorizedEnd - 1] == currentText[currentEnd - 1]
+        ) {
+            authorizedEnd--
+            currentEnd--
+        }
+
+        val replacementText = currentText.substring(prefix, currentEnd)
+        return NativeTextMutation(
+            scalarFrom = PositionBridge.utf16ToScalar(prefix, authorizedText),
+            scalarTo = PositionBridge.utf16ToScalar(authorizedEnd, authorizedText),
+            replacementText = replacementText,
+            resultingText = currentText
+        )
+    }
+
+    private fun shouldAdoptNativeTextMutation(editable: Editable?): Boolean {
+        if (!isEditable || !hasFocus()) return false
+        if (editable == null) return true
+
+        val composingStart = BaseInputConnection.getComposingSpanStart(editable)
+        val composingEnd = BaseInputConnection.getComposingSpanEnd(editable)
+        return composingStart < 0 || composingEnd < 0 || composingStart == composingEnd
+    }
+
+    private fun commitNativeTextMutation(mutation: NativeTextMutation) {
+        if ((text?.toString() ?: "") != mutation.resultingText) return
+
+        if (mutation.scalarFrom == mutation.scalarTo) {
+            if (mutation.replacementText.isNotEmpty()) {
+                insertTextInRust(mutation.replacementText, mutation.scalarFrom)
+            }
+        } else if (mutation.replacementText.isEmpty()) {
+            deleteRangeInRust(mutation.scalarFrom, mutation.scalarTo)
+        } else {
+            replaceTextRangeInRust(
+                mutation.scalarFrom,
+                mutation.scalarTo,
+                mutation.replacementText
+            )
+        }
+    }
+
     /**
      * Delete a scalar range via the Rust editor.
      *
@@ -2018,6 +2086,12 @@ class EditorEditText @JvmOverloads constructor(
             val currentText = s?.toString() ?: ""
             if (currentText == lastAuthorizedText) return
 
+            val mutation = nativeTextMutationFromAuthorizedDiff(currentText)
+            if (mutation != null && shouldAdoptNativeTextMutation(s)) {
+                commitNativeTextMutation(mutation)
+                return
+            }
+
             // Text has diverged from Rust's authorized state.
             reconciliationCount++
             Log.w(

package/ios/EditorCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<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>
 		<dict>
 			<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>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/RichTextEditorView.swift

@@ -819,6 +819,13 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         let entries: [TopLevelChildMetadata]
     }
 
+    private struct NativeTextMutation {
+        let from: UInt32
+        let to: UInt32
+        let replacementText: String
+        let resultingText: String
+    }
+
     private enum PositionCacheUpdate {
         case scan
         case invalidate
@@ -964,6 +971,8 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// trailing UIKit text-storage callbacks that arrive on the next run loop.
     private var interceptedInputDepth = 0
     private var reconciliationWorkScheduled = false
+    private var nativeTextMutationCommitScheduled = false
+    private var pendingNativeTextMutation: NativeTextMutation?
 
     /// Coalesces selection sync until UIKit has finished resolving the
     /// current tap/drag gesture's final caret position.
@@ -2209,7 +2218,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     func textViewDidChangeSelection(_ textView: UITextView) {
         guard textView === self else { return }
         ensureInternalTextViewDelegate()
-        guard !isApplyingRustState, !isComposing else { return }
+        guard !isApplyingRustState, !isComposing, !nativeTextMutationCommitScheduled else { return }
         if normalizeSelectionForEmptyBlockAutocapitalizationIfNeeded() {
             return
         }
@@ -2390,7 +2399,13 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     }
 
     private func syncSelectionToRustAndNotifyDelegate() {
-        guard !isApplyingRustState, !isComposing, editorId != 0 else { return }
+        guard !isApplyingRustState,
+              !isComposing,
+              !nativeTextMutationCommitScheduled,
+              editorId != 0
+        else {
+            return
+        }
         guard let range = selectedTextRange else { return }
 
         let anchor = PositionBridge.textViewToScalar(range.start, in: self)
@@ -2997,6 +3012,94 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         applyUpdateJSON(updateJSON)
     }
 
+    private func nativeTextMutationFromAuthorizedDiff(
+        currentText: String
+    ) -> NativeTextMutation? {
+        let authorizedText = lastAuthorizedText
+        guard currentText != authorizedText else { return nil }
+
+        let authorized = authorizedText as NSString
+        let current = currentText as NSString
+        let sharedLength = min(authorized.length, current.length)
+        var prefix = 0
+        while prefix < sharedLength,
+              authorized.character(at: prefix) == current.character(at: prefix) {
+            prefix += 1
+        }
+
+        var authorizedEnd = authorized.length
+        var currentEnd = current.length
+        while authorizedEnd > prefix,
+              currentEnd > prefix,
+              authorized.character(at: authorizedEnd - 1) == current.character(at: currentEnd - 1) {
+            authorizedEnd -= 1
+            currentEnd -= 1
+        }
+
+        let replacementLength = currentEnd - prefix
+        guard replacementLength >= 0 else { return nil }
+        let replacementText = current.substring(
+            with: NSRange(location: prefix, length: replacementLength)
+        )
+
+        return NativeTextMutation(
+            from: PositionBridge.utf16OffsetToScalar(prefix, in: authorizedText),
+            to: PositionBridge.utf16OffsetToScalar(authorizedEnd, in: authorizedText),
+            replacementText: replacementText,
+            resultingText: currentText
+        )
+    }
+
+    private func shouldAdoptNativeTextStorageMutation() -> Bool {
+        isFirstResponder && isEditable
+    }
+
+    private func scheduleNativeTextMutationCommit(_ mutation: NativeTextMutation) {
+        pendingNativeTextMutation = mutation
+        guard !nativeTextMutationCommitScheduled else { return }
+
+        nativeTextMutationCommitScheduled = true
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            self.nativeTextMutationCommitScheduled = false
+            guard let mutation = self.pendingNativeTextMutation else { return }
+            self.pendingNativeTextMutation = nil
+
+            guard self.editorId != 0,
+                  !self.isApplyingRustState,
+                  !self.isInterceptingInput,
+                  !self.isComposing,
+                  self.shouldAdoptNativeTextStorageMutation()
+            else {
+                if self.textStorage.string != self.lastAuthorizedText {
+                    self.scheduleReconciliationFromRust()
+                }
+                return
+            }
+            guard self.textStorage.string == mutation.resultingText else {
+                if self.textStorage.string != self.lastAuthorizedText {
+                    self.scheduleReconciliationFromRust()
+                }
+                return
+            }
+
+            self.performInterceptedInput {
+                if mutation.from == mutation.to {
+                    guard !mutation.replacementText.isEmpty else { return }
+                    self.insertTextInRust(mutation.replacementText, at: mutation.from)
+                } else if mutation.replacementText.isEmpty {
+                    self.deleteScalarRangeInRust(from: mutation.from, to: mutation.to)
+                } else {
+                    self.replaceTextRangeInRust(
+                        from: mutation.from,
+                        to: mutation.to,
+                        with: mutation.replacementText
+                    )
+                }
+            }
+        }
+    }
+
     private func insertNodeInRust(_ nodeType: String) {
         guard let selection = currentScalarSelection() else { return }
         Self.inputLog.debug(
@@ -4443,6 +4546,13 @@ extension EditorTextView: NSTextStorageDelegate {
         let currentText = textStorage.string
         guard currentText != lastAuthorizedText else { return }
         currentTopLevelChildMetadata = nil
+
+        if shouldAdoptNativeTextStorageMutation(),
+           let mutation = nativeTextMutationFromAuthorizedDiff(currentText: currentText) {
+            scheduleNativeTextMutationCommit(mutation)
+            return
+        }
+
         let authorizedPreview = preview(lastAuthorizedText)
         let storagePreview = preview(currentText)
 

package/package.json

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