Merge pull request #3434 from aliabbasmalik8/IS-3218-cursor-issue-edi…

…t-comment-box [IS-3218] Fixed cursor issue on edit comment box
Expensify · Jun 9, 2021 · 5ead572 · 5ead572
2 parents 072fd90 + d530a94
commit 5ead572
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -36,12 +36,26 @@ class ReportActionItemMessageEdit extends React.Component {
         this.debouncedSaveDraft = _.debounce(this.debouncedSaveDraft.bind(this), 1000, true);
         this.publishDraft = this.publishDraft.bind(this);
         this.triggerSaveOrCancel = this.triggerSaveOrCancel.bind(this);
+        this.onSelectionChange = this.onSelectionChange.bind(this);
 
         this.state = {
             draft: this.props.draftMessage,
+            selection: {
+                start: this.props.draftMessage.length,
+                end: this.props.draftMessage.length,
+            },
         };
     }
 
+    /**
+     * Update Selection on change cursor position.
+     *
+     * @param {Event} e
+     */
+    onSelectionChange(e) {
+        this.setState({selection: e.nativeEvent.selection});
+    }
+
     /**
      * Update the value of the draft in Onyx
      *
@@ -109,6 +123,8 @@ class ReportActionItemMessageEdit extends React.Component {
                             toggleReportActionComposeView(false);
                         }}
                         autoFocus
+                        selection={this.state.selection}
+                        onSelectionChange={this.onSelectionChange}
                     />
                 </View>
                 <View style={[styles.flexRow, styles.mt1]}>