Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 23:19:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: newline artifacts during codeblock migration

Browse Source
This commit is contained in:
thecodrr
2022-07-26 13:25:06 +05:00
parent 5198dcdcc6
commit d17e7f384e
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/core/migrations.js
View File

@@ -1,5 +1,5 @@
import { parseHTML } from "./utils/html-parser";
import { decodeHTML5, encodeHTML5 } from "entities";
import { decodeHTML5 } from "entities";
export const migrations = {
5.0: {},
@@ -94,18 +94,24 @@ function decodeWrappedTableHtml(html) {
});
}
const NEWLINE_TOKEN = "[[%NN_NEWLINE_IN_PRE%]]";
const NEWLINE_TOKEN_REGEX = /\[\[%NN_NEWLINE_IN_PRE%\]\]/gm;
const NEWLINE_REPLACEMENT_REGEX = /\n|<br>|<br\/>/gm;
const PREBLOCK_REGEX = /<pre.*<\/pre>/gm;
const PREBLOCK_REGEX = /(<pre.*?>)(.*?)(<\/pre>)/gm;
const SPAN_REGEX = /<span class=.*?>(.*?)<\/span>/gm;
export function tinyToTiptap(html) {
if (typeof html !== "string") return html;
// Preserve newlines in pre blocks
html = html.replace(PREBLOCK_REGEX, (pre) => {
return pre.replace(NEWLINE_REPLACEMENT_REGEX, NEWLINE_TOKEN);
});
html = html
.replace(/\n/gm, "<br/>")
.replace(PREBLOCK_REGEX, (_pre, start, inner, end) => {
let codeblock = start;
codeblock += inner
.replace(NEWLINE_REPLACEMENT_REGEX, "<br/>")
.replace(SPAN_REGEX, (_span, inner) => inner);
codeblock += end;
return codeblock;
});
const document = parseHTML(html);
@@ -125,14 +131,6 @@ export function tinyToTiptap(html) {
image.parentElement.replaceWith(image.cloneNode());
}
const codeblocks = document.querySelectorAll("pre");
for (const pre of codeblocks) {
pre.innerHTML = encodeHTML5(pre.innerText).replace(
NEWLINE_TOKEN_REGEX,
"<br/>"
);
}
const bogus = document.querySelectorAll("[data-mce-bogus]");
for (const element of bogus) {
element.remove();