Use linkify to match links

mxstbr · mxstbr · commit 983961d851d5 · 2016-03-03T09:32:53.000+01:00
Closes draft-js-plugins#18
diff --git a/package.json b/package.json
@@ -91,6 +91,8 @@
     "classnames": "^2.2.3",
     "draft-js": "^0.1.0",
     "extract-text-webpack-plugin": "^1.0.1",
-    "immutable": "^3.7.6"
+    "immutable": "^3.7.6",
+    "linkify-it": "1.2.0",
+    "tlds": "1.96.0"
   }
 }
diff --git a/src/linkifyPlugin/findWithRegex.js b/src/linkifyPlugin/findWithRegex.js
diff --git a/src/linkifyPlugin/linkStrategy.js b/src/linkifyPlugin/linkStrategy.js
@@ -1,10 +1,16 @@
 /* @flow */
 
-import findWithRegex from './findWithRegex';
+import linkifyIt from 'linkify-it';
+import tlds from 'tlds';
 
-// http://stackoverflow.com/a/19696443/837709
-const LINK_REGEX = /((?:(http|https|Http|Https|rtsp|Rtsp):\/\/(?:(?:[a-zA-Z0-9\$\-\_\.\+\!\*\'\(\)\,\;\?\&\=]|(?:\%[a-fA-F0-9]{2})){1,64}(?:\:(?:[a-zA-Z0-9\$\-\_\.\+\!\*\'\(\)\,\;\?\&\=]|(?:\%[a-fA-F0-9]{2})){1,25})?\@)?)?((?:(?:[a-zA-Z0-9][a-zA-Z0-9\-]{0,64}\.)+(?:(?:aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(?:biz|b[abdefghijmnorstvwyz])|(?:cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(?:edu|e[cegrstu])|f[ijkmor]|(?:gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(?:info|int|i[delmnoqrst])|(?:jobs|j[emop])|k[eghimnrwyz]|l[abcikrstuvy]|(?:mil|mobi|museum|m[acdghklmnopqrstuvwxyz])|(?:name|net|n[acefgilopruz])|(?:org|om)|(?:pro|p[aefghklmnrstwy])|qa|r[eouw]|s[abcdeghijklmnortuvyz]|(?:tel|travel|t[cdfghjklmnoprtvwz])|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw]))|(?:(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\.(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\.(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\.(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[0-9])))(?:\:\d{1,5})?)(\/(?:(?:[a-zA-Z0-9\;\/\?\:\@\&\=\#\~\-\.\+\!\*\'\(\)\,\_])|(?:\%[a-fA-F0-9]{2}))*)?(?:\b|$)/gi;
+const linkify = linkifyIt();
+linkify.tlds(tlds);
 
 export default (contentBlock: Object, callback: Function) => {
-  findWithRegex(LINK_REGEX, contentBlock, callback);
+  const links = linkify.match(contentBlock.get('text'));
+  if (typeof links !== 'undefined' && links !== null) {
+    for (let i = 0; i < links.length; i++) {
+      callback(links[i].index, links[i].lastIndex);
+    }
+  }
 };

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,8 @@`
`91`	`91`	`"classnames": "^2.2.3",`
`92`	`92`	`"draft-js": "^0.1.0",`
`93`	`93`	`"extract-text-webpack-plugin": "^1.0.1",`
`94`		`- "immutable": "^3.7.6"`
	`94`	`+ "immutable": "^3.7.6",`
	`95`	`+ "linkify-it": "1.2.0",`
	`96`	`+ "tlds": "1.96.0"`
`95`	`97`	`}`
`96`	`98`	`}`