@onekeyfe/react-native-auto-size-input 3.0.32 → 3.0.33

package/android/src/main/java/com/margelo/nitro/autosizeinput/AutoSizeInput.kt

@@ -5,6 +5,7 @@ import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.Typeface
 import android.graphics.drawable.GradientDrawable
+import android.os.Looper
 import android.text.Editable
 import android.text.InputType
 import android.view.inputmethod.EditorInfo
@@ -753,16 +754,36 @@ class HybridAutoSizeInput(val context: ThemedReactContext) : HybridAutoSizeInput
 
   // MARK: - Methods
 
+  // Nitro hybrid view methods may be invoked off the UI thread. Android view
+  // operations (`requestFocus` / `clearFocus`) and `InputMethodManager` calls
+  // must run on the view's looper — otherwise we hit
+  // `CalledFromWrongThreadException`. `View.post` is thread-safe and queues
+  // onto the main looper.
+  private fun runOnViewThread(action: () -> Unit) {
+    if (Looper.myLooper() == Looper.getMainLooper()) {
+      action()
+    } else {
+      inputView.post {
+        if (isDisposed) return@post
+        action()
+      }
+    }
+  }
+
   override fun focus() {
     if (isDisposed) return
-    requestInputFocus()
+    runOnViewThread {
+      requestInputFocus()
+    }
   }
 
   override fun blur() {
     if (isDisposed) return
-    inputView.clearFocus()
-    val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager
-    imm?.hideSoftInputFromWindow(inputView.windowToken, 0)
+    runOnViewThread {
+      inputView.clearFocus()
+      val imm = context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager
+      imm?.hideSoftInputFromWindow(inputView.windowToken, 0)
+    }
   }
 
   // MARK: - Helpers

package/ios/AutoSizeInput.swift

@@ -509,19 +509,37 @@ class HybridAutoSizeInput: HybridAutoSizeInputSpec {
 
   // MARK: - Methods
 
-  func focus() throws {
-    if multiline == true {
-      multiLineInput.becomeFirstResponder()
+  // Nitro hybrid view methods are invoked on the JS thread. UIKit responder
+  // changes (becomeFirstResponder / resignFirstResponder) must run on the
+  // main thread — otherwise FrontBoardServices' `assertBarrierOnQueue`
+  // trips and the process is killed with SIGTRAP.
+  private func runOnMain(_ block: @escaping () -> Void) {
+    if Thread.isMainThread {
+      block()
     } else {
-      singleLineInput.becomeFirstResponder()
+      DispatchQueue.main.async(execute: block)
+    }
+  }
+
+  func focus() throws {
+    runOnMain { [weak self] in
+      guard let self else { return }
+      if self.multiline == true {
+        self.multiLineInput.becomeFirstResponder()
+      } else {
+        self.singleLineInput.becomeFirstResponder()
+      }
     }
   }
 
   func blur() throws {
-    if multiline == true {
-      multiLineInput.resignFirstResponder()
-    } else {
-      singleLineInput.resignFirstResponder()
+    runOnMain { [weak self] in
+      guard let self else { return }
+      if self.multiline == true {
+        self.multiLineInput.resignFirstResponder()
+      } else {
+        self.singleLineInput.resignFirstResponder()
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-auto-size-input",
-  "version": "3.0.32",
+  "version": "3.0.33",
   "description": "Auto-sizing text input with font scaling, prefix and suffix support",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",