@apollohg/react-native-prose-editor 0.5.19 → 0.5.20

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

@@ -3779,8 +3779,13 @@ class EditorEditText @JvmOverloads constructor(
      *
      * @param updateJSON The JSON string from editor_insert_text, etc.
      */
-    fun applyUpdateJSON(updateJSON: String, notifyListener: Boolean = true) {
+    fun applyUpdateJSON(
+        updateJSON: String,
+        notifyListener: Boolean = true,
+        refreshInputConnectionForExternalUpdate: Boolean = false
+    ) {
         val totalStartedAt = System.nanoTime()
+        val previousVisibleText = text?.toString().orEmpty()
         val parseStartedAt = totalStartedAt
         val update = try {
             org.json.JSONObject(updateJSON)
@@ -3891,6 +3896,10 @@ class EditorEditText @JvmOverloads constructor(
         } else {
             preserveScrollPosition(previousScrollX, previousScrollY)
         }
+        refreshInputConnectionAfterExternalTextReplacementIfNeeded(
+            enabled = refreshInputConnectionForExternalUpdate,
+            previousVisibleText = previousVisibleText
+        )
         val postApplyNanos = System.nanoTime() - postApplyStartedAt
 
         val totalNanos = System.nanoTime() - totalStartedAt
@@ -3916,6 +3925,17 @@ class EditorEditText @JvmOverloads constructor(
         }
     }
 
+    private fun refreshInputConnectionAfterExternalTextReplacementIfNeeded(
+        enabled: Boolean,
+        previousVisibleText: String
+    ) {
+        if (!enabled || !hasFocus()) return
+        val currentVisibleText = text?.toString().orEmpty()
+        if (currentVisibleText == previousVisibleText) return
+        retireInputConnectionForEditor()
+        restartInputForEditor("externalUpdate")
+    }
+
     /**
      * Apply a render JSON string (just render elements, no update wrapper).
      *

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

@@ -1744,7 +1744,10 @@ class NativeEditorExpoView(
         }
         isApplyingJSUpdate = true
         return try {
-            richTextView.editorEditText.applyUpdateJSON(updateJson)
+            richTextView.editorEditText.applyUpdateJSON(
+                updateJson,
+                refreshInputConnectionForExternalUpdate = true
+            )
             clearPendingEditorUpdateDispatchQueue("jsUpdate")
             true
         } catch (error: Throwable) {

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

@@ -209,13 +209,21 @@ class RichTextEditorView @JvmOverloads constructor(
     fun setContent(html: String) {
         if (editorId == 0L) return
         editorSetHtml(editorId.toULong(), html)
-        editorEditText.applyUpdateJSON(editorGetCurrentState(editorId.toULong()), notifyListener = false)
+        editorEditText.applyUpdateJSON(
+            editorGetCurrentState(editorId.toULong()),
+            notifyListener = false,
+            refreshInputConnectionForExternalUpdate = true
+        )
     }
 
     fun setContent(json: org.json.JSONObject) {
         if (editorId == 0L) return
         editorSetJson(editorId.toULong(), json.toString())
-        editorEditText.applyUpdateJSON(editorGetCurrentState(editorId.toULong()), notifyListener = false)
+        editorEditText.applyUpdateJSON(
+            editorGetCurrentState(editorId.toULong()),
+            notifyListener = false,
+            refreshInputConnectionForExternalUpdate = true
+        )
     }
 
     internal fun rebindEditorIfNeeded(notifyListener: Boolean = true) {

package/package.json

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