From 3f69da2455452ba5285d476c3b6e92d231789b64 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 17 Feb 2017 10:06:35 -0800 Subject: [PATCH] Support query string in linkifier --- src/Linkifier.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Linkifier.ts b/src/Linkifier.ts index b5b3247c..74c03adc 100644 --- a/src/Linkifier.ts +++ b/src/Linkifier.ts @@ -15,8 +15,9 @@ const ipClause = '((\\d{1,3}\\.){3}\\d{1,3})'; const portClause = '(:\\d{1,5})'; const hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + ')' + portClause + '?'; const pathClause = '(\\/[\\/\\w\\.-]*)*'; +const queryStringClause = '(\\?[\\w\\[\\]\\(\\)\\/\\?\\!#@$&\'*+,:;]*)?'; const negatedPathCharacterSet = '[^\\/\\w\\.-]+'; -const bodyClause = hostClause + pathClause; +const bodyClause = hostClause + pathClause + queryStringClause; const start = '(?:^|' + negatedDomainCharacterSet + ')('; const end = ')($|' + negatedPathCharacterSet + ')'; const strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);