Fixed TextInput

status-im · Oct 9, 2018 · c571cf7 · c571cf7
1 parent 3737d0a
commit c571cf7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/ReactQt/runtime/src/qml/ReactTextInput.qml b/ReactQt/runtime/src/qml/ReactTextInput.qml
@@ -8,7 +8,7 @@ Item {
     property var textInputManager: null
     property var textInputControl: null
 
-    property string p_text: textInputControl ? textInputControl.text : ""
+    property string p_text
     property color p_color
     property bool p_multiline: false
     property bool p_onChange: false
@@ -30,9 +30,23 @@ Item {
 
 
     property var flexbox: React.Flexbox {control: textInputRoot; viewManager: textInputManager}
+    property bool sendTextChanged: true
 
     objectName: p_nativeID
 
+    onP_textChanged: {
+        if(textInputControl) {
+            sendTextChanged = false
+
+            var cursorPos = textInputControl.cursorPosition
+            textInputControl.text = p_text
+            cursorPos = Math.min(cursorPos+1, p_text.length)
+            textInputControl.cursorPosition = cursorPos
+
+            sendTextChanged = true
+        }
+    }
+
     onP_fontWeightChanged: {
         switch(p_fontWeight) {
         case "100": p_fontWeightEnum = Font.Thin; break;

diff --git a/ReactQt/runtime/src/qml/ReactTextInputArea.qml b/ReactQt/runtime/src/qml/ReactTextInputArea.qml
@@ -7,14 +7,14 @@ import  "../js/utils.js" as Utils
 Flickable {
     id: textField
     property var textInputRoot: parent
+    property alias cursorPosition: textArea.cursorPosition
     property alias text: textArea.text
     anchors.fill: textInputRoot
     ScrollBar.vertical: ScrollBar {}
 
     TextArea.flickable: TextArea {
 
         id: textArea
-        text: textInputRoot.p_text
         color: textInputRoot.p_color
         placeholderText: textInputRoot.p_placeholderText
         selectionColor: textInputRoot.p_selectionColor
@@ -37,7 +37,11 @@ Flickable {
             radius: textInputRoot.p_borderRadius
         }
 
-        onTextChanged: textInputRoot.textInputManager.sendTextEditedToJs(textField)
+        onTextChanged: {
+            if(textInputRoot.sendTextChanged) {
+                textInputRoot.textInputManager.sendTextEditedToJs(textField)
+            }
+        }
         onCursorPositionChanged: textInputRoot.textInputManager.sendSelectionChangeToJs(textField)
         Keys.onPressed: textInputManager.sendOnKeyPressToJs(textField,
                                                             textInputRoot.keyText(event.key, event.text),

diff --git a/ReactQt/runtime/src/qml/ReactTextInputField.qml b/ReactQt/runtime/src/qml/ReactTextInputField.qml
@@ -10,7 +10,6 @@ TextField {
     property var textInputRoot: parent
 
     anchors.fill: textInputRoot
-    text: textInputRoot.p_text
     color: textInputRoot.p_color
     placeholderText: textInputRoot.p_placeholderText
     selectionColor: textInputRoot.p_selectionColor
@@ -32,7 +31,11 @@ TextField {
         radius: textInputRoot.p_borderRadius
     }
 
-    onTextChanged:              textInputManager.sendTextEditedToJs(textField)
+    onTextChanged: {
+        if(textInputRoot.sendTextChanged) {
+            textInputRoot.textInputManager.sendTextEditedToJs(textField)
+        }
+    }
     onCursorPositionChanged:    textInputManager.sendSelectionChangeToJs(textField)
     onAccepted:                 textInputManager.sendOnSubmitEditingToJs(textField)
     onEditingFinished:          textInputManager.sendOnEndEditingToJs(textField)