Vanessa пре 2 година
родитељ
комит
05958328f5
2 измењених фајлова са 10 додато и 9 уклоњено
  1. 2 1
      app/src/menus/Menu.ts
  2. 8 8
      app/src/protyle/markdown/highlightRender.ts

+ 2 - 1
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 {

+ 8 - 8
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");