Merge pull request draft-js-plugins#181 from draft-js-plugins/improve-emoji-and-mention-regex

nikgraf · nikgraf · commit 8ccbd1a993d3 · 2016-04-04T21:37:16.000-07:00
improve regex for emoji &amp; mention plugins to avoid issues when combin…
diff --git a/draft-js-emoji-plugin/CHANGELOG.md b/draft-js-emoji-plugin/CHANGELOG.md
@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Move to a flat configuration. Instead of plugin properties (decorators & hooks) being stored within pluginProps they now moved to the root object. See the changes here [#150](https://github.com/draft-js-plugins/draft-js-plugins/pull/150/files) as well as the initial discussion here [#143](https://github.com/draft-js-plugins/draft-js-plugins/issues/143)
+- Improved the regex and now test for a whitespace in front of the `:` to make sure it doesn't match on normal text like a link [#104](https://github.com/draft-js-plugins/draft-js-plugins/issues/104)
 
 ### Fixed
 
diff --git a/draft-js-emoji-plugin/src/emojiSearchStrategy.js b/draft-js-emoji-plugin/src/emojiSearchStrategy.js
@@ -2,7 +2,7 @@
 
 import findWithRegex from 'find-with-regex';
 
-const EMOJI_REGEX = /:[\w]*/g;
+const EMOJI_REGEX = /\s:[\w]*/g;
 
 export default (contentBlock: Object, callback: Function) => {
   findWithRegex(EMOJI_REGEX, contentBlock, callback);
diff --git a/draft-js-mention-plugin/CHANGELOG.md b/draft-js-mention-plugin/CHANGELOG.md
@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Move to a flat configuration. Instead of plugin properties (decorators & hooks) being stored within pluginProps they now moved to the root object. See the changes here [#150](https://github.com/draft-js-plugins/draft-js-plugins/pull/150/files) as well as the initial discussion here [#143](https://github.com/draft-js-plugins/draft-js-plugins/issues/143)
+- Improved the regex and now test for a whitespace in front of the `@` to make sure it doesn't match on normal text like an email [#104](https://github.com/draft-js-plugins/draft-js-plugins/issues/104)
 
 ### Fixed
 
diff --git a/draft-js-mention-plugin/src/mentionSearchStrategy.js b/draft-js-mention-plugin/src/mentionSearchStrategy.js
@@ -2,7 +2,7 @@
 
 import findWithRegex from 'find-with-regex';
 
-const MENTION_REGEX = /\@[\w]*/g;
+const MENTION_REGEX = /\s\@[\w]*/g;
 
 export default (contentBlock: Object, callback: Function) => {
   findWithRegex(MENTION_REGEX, contentBlock, callback);
