react-native-typerich 0.1.11 → 0.1.13

package/android/src/main/java/com/typerich/TypeRichTextInputView.kt

@@ -45,7 +45,6 @@ class TypeRichTextInputView : AppCompatEditText {
   lateinit var layoutManager: TypeRichTextInputViewLayoutManager
 
   var isDuringTransaction: Boolean = false
-  var isRemovingMany: Boolean = false
   var scrollEnabled: Boolean = true
 
   var experimentalSynchronousEvents: Boolean = false
@@ -60,10 +59,11 @@ class TypeRichTextInputView : AppCompatEditText {
   private var fontWeight: Int = ReactConstants.UNSET
   private var defaultValue: CharSequence? = null
   private var defaultValueDirty: Boolean = false
-  private var keyboardAppearance: String = "default"
+//  private var keyboardAppearance: String = "default" // used in ios only
   private var inputMethodManager: InputMethodManager? = null
   private var lineHeightPx: Int? = null
   private var isSettingTextFromJS = false
+  private var isInitialized = false
 
 
   constructor(context: Context) : super(context) {
@@ -106,8 +106,14 @@ class TypeRichTextInputView : AppCompatEditText {
       override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { if (isSettingTextFromJS) return}
 
       override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-        if (!isDuringTransaction) {
-          if (isSettingTextFromJS) return
+        if (isSettingTextFromJS) return
+
+        if (!isInitialized) {
+          layoutManager.invalidateLayout()
+          return
+        }
+
+        if (!isDuringTransaction ) {
 
           val reactContext = context as ReactContext
           val surfaceId = UIManagerHelper.getSurfaceId(reactContext)
@@ -211,7 +217,12 @@ class TypeRichTextInputView : AppCompatEditText {
 
       // text
       val text = item.coerceToText(context).toString()
-      this.append(text)
+      val editable = editableText
+      val start = selectionStart.coerceAtLeast(0)
+      val end = selectionEnd.coerceAtLeast(0)
+
+      editable.replace(minOf(start, end), maxOf(start, end), text)
+
       return true
     }
 
@@ -290,6 +301,7 @@ class TypeRichTextInputView : AppCompatEditText {
 
   override fun onSelectionChanged(selStart: Int, selEnd: Int) {
     super.onSelectionChanged(selStart, selEnd)
+    if (isDuringTransaction) return
 
     val reactContext = context as? ReactContext ?: return
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
@@ -541,6 +553,8 @@ class TypeRichTextInputView : AppCompatEditText {
     updateTypeface()
     updateDefaultValue()
     applyLineHeight()
+
+    isInitialized = true
   }
 
   fun setDefaultValue(value: CharSequence?) {
@@ -551,7 +565,7 @@ class TypeRichTextInputView : AppCompatEditText {
   private fun updateDefaultValue() {
     if (!defaultValueDirty) return
     defaultValueDirty = false
-   setText(defaultValue?.toString() ?: "")
+    setValue(defaultValue)
   }
 
   private fun updateTypeface() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-typerich",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Textinput replacement",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",