Reduce number of nodes created when using linkify

Author: kycutler

__tests__/index.spec.tsx

@@ -135,6 +135,34 @@ describe("Ansi", () => {
     );
   });
 
+  test("can linkify multiple links", () => {
+    const el = shallow(
+      React.createElement(
+        Ansi,
+        { linkify: true },
+        "this is a link: www.google.com and this is a second link: www.microsoft.com"
+      )
+    );
+    expect(el).not.toBeNull();
+    expect(el.text()).toBe("this is a link: www.google.com and this is a second link: www.microsoft.com");
+    expect(el.html()).toBe(
+      '<code><span>this is a link: <a href=\"http://www.google.com\" target=\"_blank\">www.google.com</a> and this is a second link: <a href=\"http://www.microsoft.com\" target=\"_blank\">www.microsoft.com</a></span></code>'
+    );
+  });
+
+  test("creates a minimal number of nodes when using linkify", () => {
+    const el = shallow(
+      React.createElement(
+        Ansi,
+        { linkify: true },
+        "this is a link: www.google.com and this is text after"
+      )
+    );
+    expect(el).not.toBeNull();
+    expect(el.text()).toBe("this is a link: www.google.com and this is text after");
+    expect(el.childAt(0).children()).toHaveLength(3);
+  });
+
   describe("useClasses options", () => {
     test("can add the font color class", () => {
       const el = shallow(

src/index.ts

@@ -2,8 +2,6 @@ import Anser, { AnserJsonEntry } from "anser";
 import { escapeCarriageReturn } from "escape-carriage";
 import * as React from "react";
 
-const LINK_REGEX = /^(https?:\/\/(?:www\.|(?!www))[^\s.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})$/;
-
 /**
  * Converts ANSI strings into JSON output.
  * @name ansiToJSON
@@ -102,37 +100,41 @@ function convertBundleIntoReact(
     );
   }
 
-  const content = bundle.content
-    .split(/(\s+)/)
-    .reduce((words: React.ReactNode[], word: string, index: number) => {
-      // If this is a separator, re-add the space removed from split.
-      if (index % 2 === 1) {
-        words.push(word);
-        return words;
-      }
-
-      // If  this isn't a link, just return the word as-is.
-      if (!LINK_REGEX.test(word)) {
-        words.push(word);
-        return words;
-      }
-
-      // Make sure the href we generate from the link is fully qualified. We assume http
-      // if it starts with a www because many sites don't support https
-      const href = word.startsWith("www.") ? `http://${word}` : word;
-      words.push(
-        React.createElement(
-          "a",
-          {
-            key: index,
-            href,
-            target: "_blank"
-          },
-          `${word}`
-        )
-      );
-      return words;
-    }, [] as React.ReactNode[]);
+  const content: React.ReactNode[] = [];
+  const linkRegex = /(\s+|^)(https?:\/\/(?:www\.|(?!www))[^\s.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})(\s+|$)/g;
+
+  let index = 0;
+  let match: RegExpExecArray | null;
+  while ((match = linkRegex.exec(bundle.content)) !== null) {
+    const startIndex = match.index + match[1].length;
+    if (startIndex > index) {
+      content.push(bundle.content.substring(index, startIndex));
+    }
+
+    const link = match[2];
+    // Make sure the href we generate from the link is fully qualified. We assume http
+    // if it starts with a www because many sites don't support https
+    const href = link.startsWith("www.") ? `http://${link}` : link;
+    content.push(
+      React.createElement(
+        "a",
+        {
+          key: index,
+          href,
+          target: "_blank"
+        },
+        `${link}`
+      )
+    );
+
+    const endIndex = linkRegex.lastIndex - match[3].length;
+    index = endIndex;
+  }
+
+  if (index < bundle.content.length) {
+    content.push(bundle.content.substring(index));
+  }
+
   return React.createElement("span", { style, key, className }, content);
 }