fix(mention-plugin): avoid infinite loop while mentionTrigger is empty and supportWhiteSpace is on. fix replace issue while mentionTrigger is empty

freedomlang · freedomlang · commit d2acc28ea428 · 2018-09-10T21:00:52.000+08:00
diff --git a/draft-js-mention-plugin/CHANGELOG.md b/draft-js-mention-plugin/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.1.3
+- Force update regex's `lastIndex` to avoid infinite loop
+- Fixed replace issue while `mentionTrigger` is empty
+
 ## 3.1.2
 - Allow empty `mentionTrigger` with `supportWhitespace: true` #1182
 
diff --git a/draft-js-mention-plugin/package.json b/draft-js-mention-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draft-js-mention-plugin",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Mention Plugin for DraftJS",
   "author": {
     "name": "Nik Graf",
diff --git a/draft-js-mention-plugin/src/mentionSuggestionsStrategy.js b/draft-js-mention-plugin/src/mentionSuggestionsStrategy.js
@@ -12,9 +12,15 @@ const findWithRegex = (regex, contentBlock, callback) => {
       const text = contentBlockText.slice(nonEntityStart, nonEntityEnd);
       let matchArr;
       let start;
+      let prevLastIndex = regex.lastIndex;
 
       // Go through all matches in the text and return the indices to the callback
+      // Force update regex's lastIndex to avoid Infinite loop
       while ((matchArr = regex.exec(text)) !== null) { // eslint-disable-line
+        if (regex.lastIndex === prevLastIndex) {
+          regex.lastIndex += 1;
+        }
+        prevLastIndex = regex.lastIndex;
         start = nonEntityStart + matchArr.index;
         callback(start, start + matchArr[0].length);
       }
diff --git a/draft-js-mention-plugin/src/utils/getSearchTextAt.js b/draft-js-mention-plugin/src/utils/getSearchTextAt.js
@@ -5,7 +5,7 @@
  */
 export default (blockText: string, position: number, trigger: string) => {
   const str = blockText.substr(0, position);
-  const begin = str.lastIndexOf(trigger);
+  const begin = trigger.length === 0 ? 0 : str.lastIndexOf(trigger);
   const matchingString = trigger.length === 0 ? str : str.slice(begin + trigger.length);
   const end = str.length;
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "draft-js-mention-plugin",`
`3`		`- "version": "3.1.2",`
	`3`	`+ "version": "3.1.3",`
`4`	`4`	`"description": "Mention Plugin for DraftJS",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Nik Graf",`