Rendering spaces for markdown format. Fixes #596 (#775)

* #764 making ja-jp consistent with other langs #764 making ja-jp consistent with other langs * Adding spaces directly without markdownIt rendering. * Implementing text-empty test validation. * Adding space character.
microsoft · Nov 17, 2017 · dcb3b32 · dcb3b32
1 parent 8c730fa
commit dcb3b32
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/FormattedText.tsx b/src/FormattedText.tsx
@@ -54,11 +54,19 @@ const renderMarkdown = (
     text: string,
     onImageLoad: () => void
 ) => {
-    const src = text
+    let __html;
+
+    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)})`);
-    const __html = markdownIt.render(src);
+        __html = markdownIt.render(src);        
+    } else {
+        // replace spaces with non-breaking space Unicode characters
+        __html = text.replace(/ */, '\u00A0');
+    }
+
     return <div className="format-markdown" dangerouslySetInnerHTML={{ __html }} />;
 }
diff --git a/test/commands_map.ts b/test/commands_map.ts
@@ -356,6 +356,15 @@ var commands_map: CommandValuesMap = {
             sendActivity(conversationId, server_content.receipt_card);
         }
     },
+    "text-empty": {
+        client: function () {
+            var last_message = document.querySelectorAll('.wc-message-wrapper:last-child .wc-message.wc-message-from-bot .format-markdown')[0];
+            return last_message.innerHTML === '&nbsp;';
+        },
+        server: function (conversationId, sendActivity) {
+            sendActivity(conversationId, server_content.text_empty_card);
+        }
+    },    
     "thumbnailcard": {
         client: function () {
             var source = document.querySelectorAll('img')[0].src;

diff --git a/test/server_content.ts b/test/server_content.ts
@@ -477,6 +477,19 @@ export var receipt_card: dl.Message = {
     ]
 }
 
+/*
+ * Activity for Text
+ * 
+ */
+export var text_empty_card: dl.Message = {
+    type: "message",
+    from: bot,
+    timestamp: new Date().toUTCString(),
+    channelId: "webchat",
+    textFormat: "markdown",
+    text: " "
+}
+
 /*
  * Activity for Thumbnail Card
  *