From ab038b1f311103dc1407f5b14e87e758e3cf6bc2 Mon Sep 17 00:00:00 2001
From: ozone <802146+o-3@users.noreply.github.com>
Date: Fri, 4 May 2018 00:44:22 -0400
Subject: [PATCH] Add configuration to render line breaks as <br> or not

---
 browser/components/MarkdownEditor.js          |   1 +
 browser/components/MarkdownPreview.js         |  12 ++++++++----
 browser/components/MarkdownSplitEditor.js     |   1 +
 browser/lib/markdown.js                       |   2 +-
 browser/main/lib/ConfigManager.js             |   1 +
 browser/main/modals/PreferencesModal/UiTab.js |  11 +++++++++++
 tests/fixtures/markdowns.js                   |   5 ++++-
 tests/lib/markdown-test.js                    |   9 +++++++++
 tests/lib/snapshots/markdown-test.js.md       |  14 ++++++++++++++
 tests/lib/snapshots/markdown-test.js.snap     | Bin 1665 -> 3060 bytes
 10 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 2c98f18e..2bd5d951 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -283,6 +283,7 @@ class MarkdownEditor extends React.Component {
           indentSize={editorIndentSize}
           scrollPastEnd={config.preview.scrollPastEnd}
           smartQuotes={config.preview.smartQuotes}
+          breaks={config.preview.breaks}
           sanitize={config.preview.sanitize}
           ref='preview'
           onContextMenu={(e) => this.handleContextMenu(e)}
diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 058dce19..9d457238 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -145,10 +145,11 @@ export default class MarkdownPreview extends React.Component {
   }
 
   initMarkdown () {
-    const { smartQuotes, sanitize } = this.props
+    const { smartQuotes, sanitize, breaks } = this.props
     this.markdown = new Markdown({
       typographer: smartQuotes,
-      sanitize
+      sanitize,
+      breaks
     })
   }
 
@@ -340,7 +341,9 @@ export default class MarkdownPreview extends React.Component {
 
   componentDidUpdate (prevProps) {
     if (prevProps.value !== this.props.value) this.rewriteIframe()
-    if (prevProps.smartQuotes !== this.props.smartQuotes || prevProps.sanitize !== this.props.sanitize) {
+    if (prevProps.smartQuotes !== this.props.smartQuotes ||
+        prevProps.sanitize !== this.props.sanitize ||
+        prevProps.breaks !== this.props.breaks) {
       this.initMarkdown()
       this.rewriteIframe()
     }
@@ -599,5 +602,6 @@ MarkdownPreview.propTypes = {
   value: PropTypes.string,
   showCopyNotification: PropTypes.bool,
   storagePath: PropTypes.string,
-  smartQuotes: PropTypes.bool
+  smartQuotes: PropTypes.bool,
+  breaks: PropTypes.bool
 }
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 27505a5a..2bee5c24 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -131,6 +131,7 @@ class MarkdownSplitEditor extends React.Component {
           lineNumber={config.preview.lineNumber}
           scrollPastEnd={config.preview.scrollPastEnd}
           smartQuotes={config.preview.smartQuotes}
+          breaks={config.preview.breaks}
           sanitize={config.preview.sanitize}
           ref='preview'
           tabInde='0'
diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index 1ef488a7..e5923790 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -25,7 +25,7 @@ class Markdown {
       linkify: true,
       html: true,
       xhtmlOut: true,
-      breaks: true,
+      breaks: config.preview.breaks,
       highlight: function (str, lang) {
         const delimiter = ':'
         const langInfo = lang.split(delimiter)
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index ee8a57c7..166e7181 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -55,6 +55,7 @@ export const DEFAULT_CONFIG = {
     latexBlockClose: '$$',
     scrollPastEnd: false,
     smartQuotes: true,
+    breaks: true,
     sanitize: 'STRICT' // 'STRICT', 'ALLOW_STYLES', 'NONE'
   },
   blog: {
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index a607f548..42f1503c 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -96,6 +96,7 @@ class UiTab extends React.Component {
         latexBlockClose: this.refs.previewLatexBlockClose.value,
         scrollPastEnd: this.refs.previewScrollPastEnd.checked,
         smartQuotes: this.refs.previewSmartQuotes.checked,
+        breaks: this.refs.previewBreaks.checked,
         sanitize: this.refs.previewSanitize.value
       }
     }
@@ -475,6 +476,16 @@ class UiTab extends React.Component {
               Enable smart quotes
             </label>
           </div>
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.preview.breaks}
+                ref='previewBreaks'
+                type='checkbox'
+              />&nbsp;
+              Render newlines in Markdown paragraphs as &lt;br&gt;
+            </label>
+          </div>
 
           <div styleName='group-section'>
             <div styleName='group-section-label'>
diff --git a/tests/fixtures/markdowns.js b/tests/fixtures/markdowns.js
index 8db35485..69e335e0 100644
--- a/tests/fixtures/markdowns.js
+++ b/tests/fixtures/markdowns.js
@@ -48,10 +48,13 @@ const checkboxes = `
 
 const smartQuotes = 'This is a "QUOTE".'
 
+const breaks = 'This is the first line.\nThis is the second line.'
+
 export default {
   basic,
   codeblock,
   katex,
   checkboxes,
-  smartQuotes
+  smartQuotes,
+  breaks
 }
diff --git a/tests/lib/markdown-test.js b/tests/lib/markdown-test.js
index b2a81fdf..73b68799 100644
--- a/tests/lib/markdown-test.js
+++ b/tests/lib/markdown-test.js
@@ -34,3 +34,12 @@ test('Markdown.render() should text with quotes correctly', t => {
   const renderedNonSmartQuotes = newmd.render(markdownFixtures.smartQuotes)
   t.snapshot(renderedNonSmartQuotes)
 })
+
+test('Markdown.render() should render line breaks correctly', t => {
+  const renderedBreaks = md.render(markdownFixtures.breaks)
+  t.snapshot(renderedBreaks)
+
+  const newmd = new Markdown({ breaks: false })
+  const renderedNonBreaks = newmd.render(markdownFixtures.breaks)
+  t.snapshot(renderedNonBreaks)
+})
diff --git a/tests/lib/snapshots/markdown-test.js.md b/tests/lib/snapshots/markdown-test.js.md
index d4f0469e..0c3e317b 100644
--- a/tests/lib/snapshots/markdown-test.js.md
+++ b/tests/lib/snapshots/markdown-test.js.md
@@ -73,4 +73,18 @@ Generated by [AVA](https://ava.li).
 > Snapshot 2
 
     `<p data-line="0">This is a &quot;QUOTE&quot;.</p>␊
+    
+
+## Markdown.render() should render line breaks correctly
+
+> Snapshot 1
+
+    `<p data-line="0">This is the first line.<br />␊
+    This is the second line.</p>␊
     `
+
+> Snapshot 2
+
+    `<p data-line="0">This is the first line.␊
+    This is the second line.</p>␊
+    `
\ No newline at end of file
diff --git a/tests/lib/snapshots/markdown-test.js.snap b/tests/lib/snapshots/markdown-test.js.snap
index 71ff221d9f61036d05dda745e42bdb820e08eda5..1dc64bba756effea535593a01693be463c95a26a 100644
GIT binary patch
literal 3060
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

literal 1665
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
Lf>1$nsS*GH)B7ad