🎨 fix siyuan-note#9396

Zuoqiu-Yingyi · Oct 11, 2023 · acd2eb1 · acd2eb1
1 parent 30b0dd0
commit acd2eb1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts
@@ -1147,10 +1147,10 @@ export class Toolbar {
         const id = nodeElement.getAttribute("data-node-id");
         let oldHtml = nodeElement.outerHTML;
 
-        let html = `<div class="b3-list-item b3-list-item--focus">${window.siyuan.languages.clear}</div>`;
+        let html = `<div class="b3-list-item">${window.siyuan.languages.clear}</div>`;
         const hljsLanguages = Constants.ALIAS_CODE_LANGUAGES.concat(window.hljs?.listLanguages() ?? []).sort();
-        hljsLanguages.forEach((item) => {
-            html += `<div class="b3-list-item">${item}</div>`;
+        hljsLanguages.forEach((item, index) => {
+            html += `<div class="b3-list-item${index === 0 ? " b3-list-item--focus" : ""}">${item}</div>`;
         });
 
         this.subElement.style.width = "";

diff --git a/app/src/util/upDownHint.ts b/app/src/util/upDownHint.ts
@@ -35,9 +35,9 @@ export const upDownHint = (listElement: Element, event: KeyboardEvent, classActi
             }
         }
         currentHintElement = listElement.querySelector("." + classActiveName);
-        if (listElement.scrollTop < currentHintElement.offsetTop - listElement.clientHeight + currentHintElement.clientHeight ||
-            listElement.scrollTop > currentHintElement.offsetTop - currentHintElement.clientHeight * 2) {
-            currentHintElement.scrollIntoView(listElement.scrollTop > currentHintElement.offsetTop - currentHintElement.clientHeight * 2);
+        const overTop = listElement.scrollTop > currentHintElement.offsetTop - (currentHintElement.previousElementSibling?.clientHeight || 0)
+        if (listElement.scrollTop < currentHintElement.offsetTop - listElement.clientHeight + currentHintElement.clientHeight || overTop) {
+            currentHintElement.scrollIntoView(overTop);
         }
         return currentHintElement;
     }