expo-rich-input 0.1.0 → 0.1.2

package/android/src/main/java/expo/modules/richinput/ExpoRichInputModule.kt

@@ -5,11 +5,16 @@ import expo.modules.kotlin.modules.ModuleDefinition
 
 class ExpoRichInputModule : Module() {
     override fun definition() = ModuleDefinition {
+
         Name("ExpoRichInput")
 
         View(RichInputView::class) {
 
-            Events("onEditEvent", "onKeyboardAction")
+            Events(
+                "onEditEvent",
+                "onKeyboardAction",
+                "onSelectionChange"
+            )
 
             AsyncFunction("focus") {
                 view: RichInputView ->
@@ -20,19 +25,6 @@ class ExpoRichInputModule : Module() {
                 view: RichInputView ->
                 view.blurInput()
             }
-
-            // Wire up event dispatchers into the view
-            OnViewDidUpdateProps {
-                view ->
-                view.onEditEvent = {
-                    payload ->
-                    view.dispatchEvent("onEditEvent", payload)
-                }
-                view.onKeyboardAction = {
-                    payload ->
-                    view.dispatchEvent("onKeyboardAction", payload)
-                }
-            }
         }
     }
 }

package/android/src/main/java/expo/modules/richinput/ExpoRichInputView.kt

@@ -5,126 +5,150 @@ import android.os.Build
 import android.text.InputType
 import android.view.KeyEvent
 import android.view.View
-import android.view.inputmethod.BaseInputConnection
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputConnection
-import android.view.inputmethod.InputMethodManager
+import android.view.inputmethod.*
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.views.ExpoView
 
 class RichInputView(context: Context, appContext: AppContext) : ExpoView(context, appContext) {
 
-  // Events dispatched to JS
-  var onEditEvent: ((Map<String, Any>) -> Unit)? = null
-  var onKeyboardAction: ((Map<String, Any>) -> Unit)? = null
+    private var cursorPosition = 0
+    private var selectionStart = 0
+    private var selectionEnd = 0
 
-  init {
-    // View must be focusable to receive InputConnection
-    isFocusable = true
-    isFocusableInTouchMode = true
-  }
+    init {
+        isFocusable = true
+        isFocusableInTouchMode = true
+    }
 
-  // MARK: InputConnection — this is where all text input flows through
-  override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection {
-    outAttrs.inputType = InputType.TYPE_CLASS_TEXT or
-      InputType.TYPE_TEXT_FLAG_MULTI_LINE or
-      InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
+    override fun onCheckIsTextEditor(): Boolean = true
 
-    outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN or
-      EditorInfo.IME_ACTION_NONE
+    override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection {
+        outAttrs.inputType = InputType.TYPE_CLASS_TEXT or
+        InputType.TYPE_TEXT_FLAG_MULTI_LINE or
+        InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
 
-    // Disable autocorrect suggestions bar
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      outAttrs.initialCapsMode = 0
-    }
+        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN or
+        EditorInfo.IME_ACTION_NONE
 
-    return EditorInputConnection(this)
-  }
-
-  override fun onCheckIsTextEditor(): Boolean = true
-
-  // MARK: Hardware key events (physical keyboard, back key etc.)
-  override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-    if (event.isCtrlPressed) {
-      when (keyCode) {
-        KeyEvent.KEYCODE_Z -> {
-          if (event.isShiftPressed) {
-            onKeyboardAction?.invoke(mapOf("action" to "redo"))
-          } else {
-            onKeyboardAction?.invoke(mapOf("action" to "undo"))
-          }
-          return true
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            outAttrs.initialCapsMode = 0
         }
-        KeyEvent.KEYCODE_SLASH -> {
-          onKeyboardAction?.invoke(mapOf("action" to "toggleComment"))
-          return true
-        }
-      }
-    }
-    return super.onKeyDown(keyCode, event)
-  }
-
-  // MARK: Focus control called from JS
-  fun focusInput() {
-    requestFocus()
-    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
-  }
-
-  fun blurInput() {
-    clearFocus()
-    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    imm.hideSoftInputFromWindow(windowToken, 0)
-  }
-
-  // MARK: InputConnection inner class
-  inner class EditorInputConnection(view: View) : BaseInputConnection(view, false) {
-
-    // Regular text commit — typing, paste, swipe keyboard word
-    override fun commitText(text: CharSequence?, newCursorPosition: Int): Boolean {
-      val str = text?.toString() ?: return false
-      onEditEvent?.invoke(mapOf(
-        "type" to "insert",
-        "text" to str
-      ))
-      return true
+
+        return EditorInputConnection(this)
     }
 
-    // IME composing (Gboard swipe intermediate states, CJK input)
-    override fun setComposingText(text: CharSequence?, newCursorPosition: Int): Boolean {
-      val str = text?.toString() ?: ""
-      onEditEvent?.invoke(mapOf(
-        "type" to "compose",
-        "text" to str
-      ))
-      return true
+    // 🔥 Hardware keyboard support
+    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
+        if (event.isCtrlPressed) {
+            val action = when (keyCode) {
+                KeyEvent.KEYCODE_Z -> if (event.isShiftPressed) "redo" else "undo"
+                KeyEvent.KEYCODE_A -> "selectAll"
+                KeyEvent.KEYCODE_C -> "copy"
+                KeyEvent.KEYCODE_V -> "paste"
+                KeyEvent.KEYCODE_X -> "cut"
+                KeyEvent.KEYCODE_SLASH -> "toggleComment"
+                else -> null
+            }
+
+            action?.let {
+                sendEvent("onKeyboardAction", mapOf("action" to it))
+                return true
+            }
+        }
+
+        return super.onKeyDown(keyCode, event)
     }
 
-    // IME composition confirmed
-    override fun finishComposingText(): Boolean {
-      onEditEvent?.invoke(mapOf(
-        "type" to "composeCommit"
-      ))
-      return true
+    fun focusInput() {
+        requestFocus()
+        val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
     }
 
-    // Backspace — beforeLength is almost always 1
-    override fun deleteSurroundingText(beforeLength: Int, afterLength: Int): Boolean {
-      if (beforeLength > 0) {
-        onEditEvent?.invoke(mapOf(
-          "type" to "delete",
-          "count" to beforeLength
-        ))
-      }
-      return true
+    fun blurInput() {
+        clearFocus()
+        val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.hideSoftInputFromWindow(windowToken, 0)
     }
 
-    // Disable autocorrect suggestions — return null to tell the OS
-    // there is no surrounding text context to work with
-    override fun getExtractedText(request: android.view.inputmethod.ExtractedTextRequest?, flags: Int)
-      : android.view.inputmethod.ExtractedText? = null
+    // 🔥 Core Input Engine
+    inner class EditorInputConnection(view: View) : BaseInputConnection(view, false) {
+
+        override fun commitText(text: CharSequence?, newCursorPosition: Int): Boolean {
+            val str = text?.toString() ?: return false
+
+            sendEvent("onEditEvent", mapOf(
+                "type" to "insert",
+                "text" to str,
+                "cursor" to cursorPosition
+            ))
+
+            cursorPosition += str.length
+            selectionStart = cursorPosition
+            selectionEnd = cursorPosition
+
+            return true
+        }
+
+        override fun setComposingText(text: CharSequence?, newCursorPosition: Int): Boolean {
+            val str = text?.toString() ?: ""
 
-    override fun getSurroundingText(beforeLength: Int, afterLength: Int, flags: Int)
-      : android.view.inputmethod.SurroundingText? = null
-  }
-}
+            sendEvent("onEditEvent", mapOf(
+                "type" to "compose",
+                "text" to str,
+                "cursor" to cursorPosition
+            ))
+
+            return true
+        }
+
+        override fun finishComposingText(): Boolean {
+            sendEvent("onEditEvent", mapOf(
+                "type" to "composeCommit",
+                "cursor" to cursorPosition
+            ))
+            return true
+        }
+
+        override fun deleteSurroundingText(beforeLength: Int, afterLength: Int): Boolean {
+            if (beforeLength > 0) {
+                val deleteCount = minOf(beforeLength, cursorPosition)
+
+                sendEvent("onEditEvent", mapOf(
+                    "type" to "delete",
+                    "count" to deleteCount,
+                    "cursor" to cursorPosition
+                ))
+
+                cursorPosition -= deleteCount
+                selectionStart = cursorPosition
+                selectionEnd = cursorPosition
+            }
+            return true
+        }
+
+        override fun setSelection(start: Int, end: Int): Boolean {
+            selectionStart = start
+            selectionEnd = end
+            cursorPosition = end
+
+            sendEvent("onSelectionChange", mapOf(
+                "start" to start,
+                "end" to end
+            ))
+
+            return true
+        }
+
+        override fun getExtractedText(
+            request: ExtractedTextRequest?,
+            flags: Int
+        ): ExtractedText? = null
+
+        override fun getSurroundingText(
+            beforeLength: Int,
+            afterLength: Int,
+            flags: Int
+        ): SurroundingText? = null
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-rich-input",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A native Expo module that replaces `TextInput` entirely, giving the editor raw OS-level edit deltas — insert, delete, and IME compose events — directly from `UIKeyInput` on iOS and `InputConnection` on Android, so the Rope never has to diff a full string.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -15,7 +15,7 @@
     "open:ios": "xed example/ios",
     "open:android": "open -a \"Android Studio\" example/android"
   },
- "files": [
+  "files": [
     "build",
     "android",
     "ios",