Merge branch 'master' of github.com:iansinnott/react-string-replace

Author: iansinnott

readme.md

@@ -54,7 +54,7 @@ const HighlightNumbers = React.createClass({
     const content = 'Hey my number is 555-555-5555.';
     return (
       <div>
-        {reactStringReplace(this.props.content, /(\d+)/g, (match, i) => (
+        {reactStringReplace(content, /(\d+)/g, (match, i) => (
           <span key={i} style={{ color: 'red' }}>{match}</span>
         ))}
       </div>
@@ -74,18 +74,18 @@ const text = 'Hey @ian_sinn, check out this link https://github.com/iansinnott/
 let replacedText;
 
 // Match URLs
-replacedText = replaceString(text, /(https?:\/\/\S+)/g, match => (
-  <a href={match}>{match}</a>
+replacedText = reactStringReplace(text, /(https?:\/\/\S+)/g, (match, i) => (
+  <a key={match + i} href={match}>{match}</a>
 ));
 
 // Match @-mentions
-replacedText = replaceString(replacedText, /@(\w+)/g, match => (
-  <a href={`https://twitter.com/${match}`}>@{match}</a>
+replacedText = reactStringReplace(replacedText, /@(\w+)/g, (match, i) => (
+  <a key={match + i} href={`https://twitter.com/${match}`}>@{match}</a>
 ));
 
 // Match hashtags
-replacedText = replaceString(replacedText, /#(\w+)/g, match => (
-  <a href={`https://twitter.com/hashtag/${match}`}>#{match}</a>
+replacedText = reactStringReplace(replacedText, /#(\w+)/g, (match, i) => (
+  <a key={match + i} href={`https://twitter.com/hashtag/${match}`}>#{match}</a>
 ));
 
 // => [