Markdown newlines Fixes #562 (#773)

* Implementing markdown-newlines.
* Implementing markdown newlines test.
* Fixing regex and test.
* Cleaning testOnly array.
* Markdown newlines tests.

Author: Carlos Reyes

src/FormattedText.tsx

@@ -26,7 +26,7 @@ const renderPlainText = (text: string) => {
     return <span className="format-plain">{elements}</span>;
 }
 
-const markdownIt = new MarkdownIt({ html: false, linkify: true, typographer: true });
+const markdownIt = new MarkdownIt({ html: false, xhtmlOut: true, breaks: true, linkify: true, typographer: true });
 
 //configure MarkdownIt to open links in new tab
 //from https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
@@ -58,11 +58,15 @@ const renderMarkdown = (
 
     if (text.trim()) {
         const src = text
-                // convert <br> tags to blank lines for markdown
-                 .replace(/<br\s*\/?>/ig, '\r\n\r\n')
-                // URL encode all links
-                 .replace(/\[(.*?)\]\((.*?)\)/ig, (match, text, url) => `[${text}](${markdownIt.normalizeLink(url)})`);
-        __html = markdownIt.render(src);        
+          // convert <br> tags to blank lines for markdown
+          .replace(/<br\s*\/?>/ig, '\n')
+          // URL encode all links
+          .replace(/\[(.*?)\]\((.*?)\)/ig, (match, text, url) => `[${text}](${markdownIt.normalizeLink(url)})`);
+
+        const arr = src.split(/\n *\n|\r\n *\r\n|\r *\r/);
+        const ma = arr.map(a => markdownIt.render(a));
+
+        __html = ma.join('<br/>');
     } else {
         // replace spaces with non-breaking space Unicode characters
         __html = text.replace(/ */, '\u00A0');

test/commands_map.ts

@@ -203,7 +203,7 @@ var commands_map: CommandValuesMap = {
             if (!link) return false;
 
             //check if value is encoded
-            var is_file =  link.href.indexOf("test.txt") >= 0;
+            var is_file = link.href.indexOf("test.txt") >= 0;
             link.click();
 
             return is_file && window.location.href.indexOf("localhost") !== -1;
@@ -265,6 +265,33 @@ var commands_map: CommandValuesMap = {
             sendActivity(conversationId, server_content.mar_card);
         }
     },
+    "markdown-newlines-single": {
+        client: function () {
+            var last_bubble = document.querySelector('.wc-message-wrapper:last-child .wc-message.wc-message-from-bot .format-markdown');
+            return last_bubble.getElementsByTagName('p').length === 2 && last_bubble.getElementsByTagName('br').length === 3;
+        },
+        server: function (conversationId, sendActivity) {
+            sendActivity(conversationId, server_content.mar_newlines_single_card);
+        }
+    },
+    "markdown-newlines-double": {
+        client: function () {
+            var last_bubble = document.querySelector('.wc-message-wrapper:last-child .wc-message.wc-message-from-bot .format-markdown');
+            return last_bubble.getElementsByTagName('p').length === 4 && last_bubble.getElementsByTagName('br').length === 3;
+        },
+        server: function (conversationId, sendActivity) {
+            sendActivity(conversationId, server_content.mar_newlines_double_card);
+        }
+    },
+    "markdown-newlines-double-double": {
+        client: function () {
+            var last_bubble = document.querySelector('.wc-message-wrapper:last-child .wc-message.wc-message-from-bot .format-markdown');
+            return last_bubble.getElementsByTagName('p').length === 4 && last_bubble.getElementsByTagName('br').length === 5;
+        },
+        server: function (conversationId, sendActivity) {
+            sendActivity(conversationId, server_content.mar_newlines_ddouble_card);
+        }
+    },
     "markdown-url-needs-encoding": {
         client: function () {
             var links = document.querySelectorAll('.wc-message-wrapper:last-child .wc-message.wc-message-from-bot a');
@@ -377,7 +404,7 @@ var commands_map: CommandValuesMap = {
     "upload": {
         do: function (nightmare) {
             try {
-                const upload = <(selector: string, paths: string[]) => Nightmare>(<any> nightmare.upload.bind(nightmare));
+                const upload = <(selector: string, paths: string[]) => Nightmare>(<any>nightmare.upload.bind(nightmare));
 
                 upload('#wc-upload-input', [
                     path.resolve(__dirname, 'assets', 'surface1.jpg'),
@@ -393,7 +420,7 @@ var commands_map: CommandValuesMap = {
             var img = document.querySelectorAll('.wc-message-wrapper:last-child .wc-message.wc-message-from-bot img')[0] as HTMLImageElement;
             return img.src.indexOf('/uploads') >= 0;
         },
-        server: function(conversationId, sendActivity){
+        server: function (conversationId, sendActivity) {
             sendActivity(conversationId, server_content.upload_txt);
         }
     },

test/server_content.ts

@@ -341,6 +341,33 @@ export var mar_encode_card: dl.Message = {
     text: "Some links are [already encoded](https://bing.com?q=some%20value) and some have [query strings that need encoding](https://bing.com?q=some value) and these can occur [multiple](https://bing.com?q=some%20value) [times](https://bing.com?q=some value) in one message. (Links can even appear [within](https://bing.com?q=some%20value) [parentheses](https://bing.com?q=some value) too.)"
 }
 
+export var mar_newlines_single_card: dl.Message = {
+    type: "message",
+    from: bot,
+    timestamp: new Date().toUTCString(),
+    channelId: "webchat",
+    textFormat: "markdown",
+    text: "**Windows** single newline->\r\n<-finish. \r\n\r\n**Unix** single newline->\n<-finish."
+}
+
+export var mar_newlines_double_card: dl.Message = {
+    type: "message",
+    from: bot,
+    timestamp: new Date().toUTCString(),
+    channelId: "webchat",
+    textFormat: "markdown",
+    text: "**Windows** double newline->\r\n \r\n<-finish. \r\n\r\n**Unix** double newline->\n \n<-finish."
+}
+
+export var mar_newlines_ddouble_card: dl.Message = {
+    type: "message",
+    from: bot,
+    timestamp: new Date().toUTCString(),
+    channelId: "webchat",
+    textFormat: "markdown",
+    text: "**Windows** double-double newline->\r\n \r\n \r\n \r\n<-finish. \r\n\r\n**Unix** double-double newline->\n \n \n \n<-finish."
+}
+
 /*
  * Activity for SignIn
  *