Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-13 02:34:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/9616

Browse source
This commit is contained in:
Vanessa 2023-11-10 20:01:31 +08:00
parent 2d99bf6a8f
commit 580a502714
2 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/plugin/commandPanel.ts
View file

@ -82,9 +82,15 @@ export const commandPanel = (app: App) => {
const filterList = (inputElement: HTMLInputElement, listElement: Element) => {
const inputValue = inputElement.value.toLowerCase();
listElement.querySelector(".b3-list-item--focus")?.classList.remove("b3-list-item--focus");
let hasFocus = false;
Array.from(listElement.children).forEach((element: HTMLElement) => {
const elementValue = element.querySelector(".b3-list-item__text").textContent.toLowerCase();
if (inputValue.indexOf(elementValue) > -1 || elementValue.indexOf(inputValue) > -1) {
if (!hasFocus) {
element.classList.add("b3-list-item--focus");
}
hasFocus = true
element.classList.remove("fn__none");
} else {
element.classList.add("fn__none");

53
app/src/util/upDownHint.ts
View file

@ -1,20 +1,31 @@
export const upDownHint = (listElement: Element, event: KeyboardEvent, classActiveName = "b3-list-item--focus") => {
let currentHintElement: HTMLElement = listElement.querySelector("." + classActiveName);
if (!currentHintElement) {
return
}
const className = classActiveName.split("--")[0];
if (event.key === "ArrowDown") {
event.preventDefault();
event.stopPropagation();
currentHintElement.classList.remove(classActiveName);
if (!currentHintElement.nextElementSibling) {
listElement.children[0].classList.add(classActiveName);
} else {
if (currentHintElement.nextElementSibling.classList.contains(className)) {
currentHintElement.nextElementSibling.classList.add(classActiveName);
} else {
currentHintElement.nextElementSibling.nextElementSibling.classList.add(classActiveName);
currentHintElement = currentHintElement.nextElementSibling as HTMLElement;
while (currentHintElement &&
(currentHintElement.classList.contains("fn__none") || !currentHintElement.classList.contains(className))) {
currentHintElement = currentHintElement.nextElementSibling as HTMLElement;
}
if (!currentHintElement) {
currentHintElement = listElement.children[0] as HTMLElement;
while (currentHintElement &&
(currentHintElement.classList.contains("fn__none") || !currentHintElement.classList.contains(className))) {
currentHintElement = currentHintElement.nextElementSibling as HTMLElement;
}
}
currentHintElement = listElement.querySelector("." + classActiveName);
if (!currentHintElement) {
return
}
currentHintElement.classList.add(classActiveName);
if (listElement.scrollTop < currentHintElement.offsetTop - listElement.clientHeight + currentHintElement.clientHeight ||
listElement.scrollTop > currentHintElement.offsetTop) {
currentHintElement.scrollIntoView(listElement.scrollTop > currentHintElement.offsetTop);
@ -24,17 +35,25 @@ export const upDownHint = (listElement: Element, event: KeyboardEvent, classActi
event.preventDefault();
event.stopPropagation();
currentHintElement.classList.remove(classActiveName);
if (!currentHintElement.previousElementSibling) {
const length = listElement.children.length;
listElement.children[length - 1].classList.add(classActiveName);
} else {
if (currentHintElement.previousElementSibling.classList.contains(className)) {
currentHintElement.previousElementSibling.classList.add(classActiveName);
} else {
currentHintElement.previousElementSibling.previousElementSibling.classList.add(classActiveName);
currentHintElement = currentHintElement.previousElementSibling as HTMLElement;
while (currentHintElement &&
(currentHintElement.classList.contains("fn__none") || !currentHintElement.classList.contains(className))) {
currentHintElement = currentHintElement.previousElementSibling as HTMLElement;
}
if (!currentHintElement) {
currentHintElement = listElement.children[listElement.children.length - 1] as HTMLElement
while (currentHintElement &&
(currentHintElement.classList.contains("fn__none") || !currentHintElement.classList.contains(className))) {
currentHintElement = currentHintElement.previousElementSibling as HTMLElement;
}
}
currentHintElement = listElement.querySelector("." + classActiveName);
if (!currentHintElement) {
return
}
currentHintElement.classList.add(classActiveName);
const overTop = listElement.scrollTop > currentHintElement.offsetTop - (currentHintElement.previousElementSibling?.clientHeight || 0);
if (listElement.scrollTop < currentHintElement.offsetTop - listElement.clientHeight + currentHintElement.clientHeight || overTop) {
currentHintElement.scrollIntoView(overTop);