Fixed native undo/redo (signavio#676)

* Fixed native undo/redo * uneeded .gitignore additions removed * readded *.log to gitignore, was removed by accident --------- Co-authored-by: Sigrsig <[email protected]>
project-lp · Jun 29, 2023 · 4ef52dd · 4ef52dd
1 parent 32d9728
commit 4ef52dd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.changeset/seven-kangaroos-remember.md b/.changeset/seven-kangaroos-remember.md
@@ -0,0 +1,5 @@
+---
+"react-mentions": patch
+---
+
+Fixed native undo/redo in case the input was not focused before the operation
diff --git a/src/MentionsInput.js b/src/MentionsInput.js
@@ -517,13 +517,23 @@ class MentionsInput extends React.Component {
 
     let newPlainTextValue = ev.target.value
 
+    let selectionStartBefore = this.state.selectionStart;
+    if(selectionStartBefore == null) {
+      selectionStartBefore = ev.target.selectionStart;
+    }
+
+    let selectionEndBefore = this.state.selectionEnd;
+    if(selectionEndBefore == null) {
+      selectionEndBefore = ev.target.selectionEnd;
+    }
+
     // Derive the new value to set by applying the local change in the textarea's plain text
     let newValue = applyChangeToValue(
       value,
       newPlainTextValue,
       {
-        selectionStartBefore: this.state.selectionStart,
-        selectionEndBefore: this.state.selectionEnd,
+        selectionStartBefore,
+        selectionEndBefore,
         selectionEndAfter: ev.target.selectionEnd,
       },
       config