Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 00:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/10769

Browse source
This commit is contained in:
Vanessa 2024-08-15 11:03:16 +08:00
parent 19ceaf050a
commit 7d455d70a3
5 changed files with 16 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/src/protyle/render/highlightRender.ts
View file

@ -86,23 +86,16 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) =
} else {
block.style.fontVariantLigatures = "none";
}
const languageElement = block.parentElement.querySelector(".protyle-action__language") as HTMLElement;
const codeText = block.textContent;
if (!isPreview && (lineNumber === "true" || (lineNumber !== "false" && window.siyuan.config.editor.codeSyntaxHighlightLineNum))) {
// 需要先添加 class 以防止抖动 https://ld246.com/article/1648116585443
block.classList.add("protyle-linenumber");
block.innerHTML = '<div class="protyle-linenumber__rows"></div><div style="flex: 1"></div>'
lineNumberRender(block);
if (languageElement) {
languageElement.style.marginLeft = "3.6em";
}
} else if (block.nextElementSibling?.classList.contains("protyle-linenumber__rows")) {
block.classList.remove("protyle-linenumber");
block.nextElementSibling.remove();
if (languageElement) {
languageElement.style.marginLeft = "";
}
}
block.innerHTML = window.hljs.highlight(
block.textContent + (block.textContent.endsWith("\n") ? "" : "\n"), // https://github.com/siyuan-note/siyuan/issues/4609
(block.childElementCount === 2 ? block.lastElementChild : block).innerHTML = window.hljs.highlight(
codeText + (codeText.endsWith("\n") ? "" : "\n"), // https://github.com/siyuan-note/siyuan/issues/4609
{
language,
ignoreIllegals: true
@ -133,7 +126,7 @@ export const lineNumberRender = (block: HTMLElement) => {
block.insertAdjacentElement("afterend", lineNumberTemp);
let lineNumberHTML = "";
const lineList = block.textContent.split(/\r\n|\r|\n|\u2028|\u2029/g);
const lineList = block.lastElementChild.textContent.split(/\r\n|\r|\n|\u2028|\u2029/g);
if (lineList[lineList.length - 1] === "" && lineList.length > 1) {
lineList.pop();
}
@ -141,7 +134,7 @@ export const lineNumberRender = (block: HTMLElement) => {
lineList.map((line) => {
let lineHeight = "";
if (isWrap) {
lineNumberTemp.textContent = line || "\n";
lineNumberTemp.textContent = line || "<br>";
// 不能使用 lineNumberTemp.getBoundingClientRect().height.toFixed(1) 否则
// windows 需等待字体下载完成再计算，否则导致不换行，高度计算错误
// https://github.com/siyuan-note/siyuan/issues/9029
@ -152,9 +145,5 @@ export const lineNumberRender = (block: HTMLElement) => {
});
lineNumberTemp.remove();
if (block.nextElementSibling?.classList.contains("protyle-linenumber__rows")) {
block.nextElementSibling.innerHTML = lineNumberHTML;
} else {
block.insertAdjacentHTML("afterend", `<span contenteditable="false" class="protyle-linenumber__rows">${lineNumberHTML}</span>`);
}
block.firstElementChild.innerHTML = lineNumberHTML;
};