Merge pull request #153 from WideChat/multiple_newline_fix

[FIX] Markdown Rules for Multiple Newlines in Messages
WideChat · Sep 13, 2022 · cfbaaa0 · cfbaaa0
2 parents 3603799 + 62fced2
commit cfbaaa0
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 7 deletions.
diff --git a/build/5.chunk.bcb58.js.map b/build/5.chunk.bcb58.js.map
diff --git a/build/5.chunk.bcb58.js → build/5.chunk.d45dc.js b/build/5.chunk.bcb58.js → build/5.chunk.d45dc.js
diff --git a/build/5.chunk.d45dc.js.map b/build/5.chunk.d45dc.js.map
diff --git a/build/bundle.31a33.js → build/bundle.2fcbc.js b/build/bundle.31a33.js → build/bundle.2fcbc.js
diff --git a/build/bundle.31a33.js.map → build/bundle.2fcbc.js.map b/build/bundle.31a33.js.map → build/bundle.2fcbc.js.map
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"><title></title><meta name="viewport" content="width=device-width,initial-scale=1"></head><body><script src="livechat/0.chunk.7df7a.js"></script><script src="livechat/polyfills.b9285.js"></script><script src="livechat/vendors~bundle.chunk.b4ff7.js"></script><script src="livechat/bundle.31a33.js"></script></body></html>
+<!doctype html><html><head><meta charset="utf-8"><title></title><meta name="viewport" content="width=device-width,initial-scale=1"></head><body><script src="livechat/0.chunk.7df7a.js"></script><script src="livechat/polyfills.b9285.js"></script><script src="livechat/vendors~bundle.chunk.b4ff7.js"></script><script src="livechat/bundle.2fcbc.js"></script></body></html>
diff --git a/src/components/Messages/MessageText/markdown.js b/src/components/Messages/MessageText/markdown.js
@@ -8,6 +8,32 @@ const md = new MarkdownIt({
 	typographer: true,
 });
 
+function setNewlines(tokens, idx, previousInlinePos) {
+	let result = '';
+	if (idx > 1) {
+		let inline = tokens[idx - previousInlinePos];
+		const paragraph = tokens[idx];
+		if (inline.map && inline.map[1] && paragraph.map && paragraph.map[0]) {
+			const diff = paragraph.map[0] - inline.map[1];
+			if (diff > 0) {
+				result = '<br>'.repeat(diff);
+			}
+		}
+
+		const listClose = tokens[idx - previousInlinePos + 1];
+		if (listClose.type.includes('list_close')) {
+			inline = tokens[idx - previousInlinePos - 2];
+			if (inline.map && inline.map[1] && paragraph.map && paragraph.map[0]) {
+				const diff = paragraph.map[0] - inline.map[1];
+				if (diff > 0) {
+					result = '<br>'.repeat(diff);
+				}
+			}
+		}
+	}
+	return result;
+}
+
 const defaultRender = md.renderer.rules.link_open || ((tokens, idx, options, env, self) => self.renderToken(tokens, idx, options));
 
 md.renderer.rules.link_open = (tokens, idx, options, env, self) => {
@@ -29,6 +55,15 @@ md.renderer.rules.link_open = (tokens, idx, options, env, self) => {
 	return defaultRender(tokens, idx, options, env, self);
 };
 
+md.renderer.rules.paragraph_open = function(tokens, idx, options, env, self) {
+	return setNewlines(tokens, idx, 2) + defaultRender(tokens, idx, options, env, self);
+};
+
+md.renderer.rules.list_item_open = function(tokens, idx, options, env, self) {
+	return setNewlines(tokens, idx, 3) + defaultRender(tokens, idx, options, env, self);
+};
+
+
 md.use((md) => {
 	const renderStrong = (tokens, idx, opts, _, slf) => {
 		const token = tokens[idx];
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html><head><meta charset="utf-8"><title></title><meta name="viewport" content="width=device-width,initial-scale=1"></head><body><script src="livechat/0.chunk.7df7a.js"></script><script src="livechat/polyfills.b9285.js"></script><script src="livechat/vendors~bundle.chunk.b4ff7.js"></script><script src="livechat/bundle.31a33.js"></script></body></html>
		<!doctype html><html><head><meta charset="utf-8"><title></title><meta name="viewport" content="width=device-width,initial-scale=1"></head><body><script src="livechat/0.chunk.7df7a.js"></script><script src="livechat/polyfills.b9285.js"></script><script src="livechat/vendors~bundle.chunk.b4ff7.js"></script><script src="livechat/bundle.2fcbc.js"></script></body></html>