From 05958328f549cf4bccd630b92c289072f044e631 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 27 Jul 2022 01:33:12 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=AD=90=E8=8F=9C=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/menus/Menu.ts | 3 ++- app/src/protyle/markdown/highlightRender.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts index 5fc8a75b4..610266bf0 100644 --- a/app/src/menus/Menu.ts +++ b/app/src/menus/Menu.ts @@ -34,7 +34,8 @@ export class Menu { const rect = subMenuElement.getBoundingClientRect(); let style = ""; const leftPosition = rect.left - this.element.clientWidth - rect.width - if (rect.right > window.innerWidth && Math.abs(leftPosition) < (rect.right - window.innerWidth)) { + if (rect.right > window.innerWidth && ( + leftPosition > 0 || Math.abs(leftPosition) < (rect.right - window.innerWidth))) { if (leftPosition >= 0) { style = "left:auto;right:100%;"; } else { diff --git a/app/src/protyle/markdown/highlightRender.ts b/app/src/protyle/markdown/highlightRender.ts index bf70a8a49..c5c4725c1 100644 --- a/app/src/protyle/markdown/highlightRender.ts +++ b/app/src/protyle/markdown/highlightRender.ts @@ -64,15 +64,15 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN) = language = "plaintext"; } block.classList.add("hljs"); - block.innerHTML = hljs.highlight( - block.textContent + (block.textContent.endsWith("\n") ? "" : "\n"), // https://github.com/siyuan-note/siyuan/issues/4609 - { - language, - ignoreIllegals: true - }).value; - + // TODO 等待讨论是否需要渲染 if (!hasClosestByAttribute(block, "id", "searchPreview", true) || isPreview) { + block.innerHTML = hljs.highlight( + block.textContent + (block.textContent.endsWith("\n") ? "" : "\n"), // https://github.com/siyuan-note/siyuan/issues/4609 + { + language, + ignoreIllegals: true + }).value; + // } block.setAttribute("data-render", "true"); - const autoEnter = block.parentElement.getAttribute("linewrap"); const ligatures = block.parentElement.getAttribute("ligatures"); const lineNumber = block.parentElement.getAttribute("linenumber");