diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts
index b5d7cec63..a498e65d9 100644
--- a/app/src/protyle/toolbar/index.ts
+++ b/app/src/protyle/toolbar/index.ts
@@ -1155,17 +1155,19 @@ export class Toolbar {
this.subElement.style.width = "";
this.subElement.style.padding = "";
- this.subElement.innerHTML = `
-
${html}
+ this.subElement.innerHTML = `
`;
+ const listElement = this.subElement.lastElementChild.lastElementChild as HTMLElement
const inputElement = this.subElement.querySelector("input");
inputElement.addEventListener("keydown", (event: KeyboardEvent) => {
event.stopPropagation();
if (event.isComposing) {
return;
}
- upDownHint(this.subElement.lastElementChild.lastElementChild as HTMLElement, event);
+ upDownHint(listElement, event);
if (event.key === "Enter") {
const activeText = this.subElement.querySelector(".b3-list-item--focus").textContent;
languageElement.textContent = activeText === window.siyuan.languages.clear ? "" : activeText;
@@ -1223,12 +1225,16 @@ export class Toolbar {
if (inputElement.value.trim() && !matchInput) {
html = `
${inputElement.value.replace(/`| /g, "_")}
${html}`;
}
- html = `
${window.siyuan.languages.clear}
` + html;
- this.subElement.firstElementChild.lastElementChild.innerHTML = html;
- this.subElement.firstElementChild.lastElementChild.firstElementChild.classList.add("b3-list-item--focus");
+ html = `
${window.siyuan.languages.clear}
` + html;
+ listElement.innerHTML = html;
+ if ( listElement.firstElementChild.nextElementSibling) {
+ listElement.firstElementChild.nextElementSibling.classList.add("b3-list-item--focus");
+ } else {
+ listElement.firstElementChild.classList.add("b3-list-item--focus");
+ }
event.stopPropagation();
});
- this.subElement.lastElementChild.lastElementChild.addEventListener("click", (event) => {
+ listElement.addEventListener("click", (event) => {
const target = event.target as HTMLElement;
const listElement = hasClosestByClassName(target, "b3-list-item");
if (!listElement) {
@@ -1453,17 +1459,18 @@ export class Toolbar {
window.siyuan.menus.menu.remove();
this.subElement.style.width = "";
this.subElement.style.padding = "";
- this.subElement.innerHTML = `
-
+ this.subElement.innerHTML = `
`;
-
+ const listElement = this.subElement.lastElementChild.lastElementChild as HTMLElement
const inputElement = this.subElement.querySelector("input");
inputElement.addEventListener("keydown", (event: KeyboardEvent) => {
event.stopPropagation();
if (event.isComposing) {
return;
}
- upDownHint(this.subElement.lastElementChild.lastElementChild as HTMLElement, event);
+ upDownHint(listElement, event);
if (event.key === "Enter") {
hintRenderWidget(this.subElement.querySelector(".b3-list-item--focus").textContent, protyle);
this.subElement.classList.add("fn__none");
@@ -1482,7 +1489,7 @@ export class Toolbar {
response.data.blocks.forEach((item: { path: string, content: string }, index: number) => {
searchHTML += `
${item.content}
`;
});
- this.subElement.firstElementChild.lastElementChild.innerHTML = searchHTML;
+ listElement.innerHTML = searchHTML;
});
});
this.subElement.lastElementChild.addEventListener("click", (event) => {