diff --git a/app/src/assets/scss/component/_menu.scss b/app/src/assets/scss/component/_menu.scss
index c188a7439..ed539660b 100644
--- a/app/src/assets/scss/component/_menu.scss
+++ b/app/src/assets/scss/component/_menu.scss
@@ -210,7 +210,7 @@
color: var(--b3-theme-primary);
}
- &--current {
+ &--current:not(.b3-menu__item--readonly) {
background-color: var(--b3-list-hover);
& > .b3-menu__action {
diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts
index 1ab21339f..a99250a0f 100644
--- a/app/src/menus/Menu.ts
+++ b/app/src/menus/Menu.ts
@@ -234,6 +234,9 @@ export class MenuItem {
const getActionMenu = (element: Element, next: boolean) => {
let actionMenuElement = element;
while (actionMenuElement && (actionMenuElement.classList.contains("b3-menu__separator") || actionMenuElement.classList.contains("b3-menu__item--readonly"))) {
+ if (actionMenuElement.querySelector(".b3-text-field")) {
+ break;
+ }
if (next) {
actionMenuElement = actionMenuElement.nextElementSibling;
} else {
@@ -278,7 +281,6 @@ export const bindMenuKeydown = (event: KeyboardEvent) => {
if (actionMenuElement) {
actionMenuElement.classList.add("b3-menu__item--current");
actionMenuElement.classList.remove("b3-menu__item--show");
-
const parentRect = actionMenuElement.parentElement.getBoundingClientRect();
const actionMenuRect = actionMenuElement.getBoundingClientRect();
if (parentRect.top > actionMenuRect.top || parentRect.bottom < actionMenuRect.bottom) {
diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts
index f38912b32..e2700f696 100644
--- a/app/src/menus/protyle.ts
+++ b/app/src/menus/protyle.ts
@@ -1074,11 +1074,19 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
const linkAddress = linkElement.getAttribute("data-href");
window.siyuan.menus.menu.append(new MenuItem({
iconHTML: "",
- label: ``,
+ type: "readonly",
+ label: `
+
+
+
+
+
+
+`,
bind(element) {
- const inputElement = element.querySelector("textarea");
- inputElement.value = Lute.UnEscapeHTMLStr(linkAddress) || "";
- inputElement.addEventListener("keydown", (event) => {
+ const inputElements = element.querySelectorAll("textarea");
+ inputElements[0].value = Lute.UnEscapeHTMLStr(linkAddress) || "";
+ inputElements[0].addEventListener("keydown", (event) => {
if ((event.key === "Enter" || event.key === "Escape") && !event.isComposing) {
event.preventDefault();
event.stopPropagation();
@@ -1086,18 +1094,12 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
} else if (event.key === "Tab" && !event.isComposing) {
event.preventDefault();
event.stopPropagation();
- element.nextElementSibling.querySelector("textarea").focus();
+ inputElements[1].focus();
} else if (electronUndo(event)) {
return;
}
});
- }
- }).element);
- window.siyuan.menus.menu.append(new MenuItem({
- iconHTML: "",
- label: ``,
- bind(element) {
- const inputElement = element.querySelector("textarea");
+
// https://github.com/siyuan-note/siyuan/issues/6798
let anchor = linkElement.textContent.replace(Constants.ZWSP, "");
if (!anchor && linkAddress) {
@@ -1107,17 +1109,17 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
}
linkElement.innerHTML = Lute.EscapeHTMLStr(anchor);
}
- inputElement.value = anchor;
- inputElement.addEventListener("compositionend", () => {
- linkElement.innerHTML = Lute.EscapeHTMLStr(inputElement.value.replace(/\n|\r\n|\r|\u2028|\u2029/g, "") || "*");
+ inputElements[1].value = anchor;
+ inputElements[1].addEventListener("compositionend", () => {
+ linkElement.innerHTML = Lute.EscapeHTMLStr(inputElements[1].value.replace(/\n|\r\n|\r|\u2028|\u2029/g, "") || "*");
});
- inputElement.addEventListener("input", (event: KeyboardEvent) => {
+ inputElements[1].addEventListener("input", (event: KeyboardEvent) => {
if (!event.isComposing) {
// https://github.com/siyuan-note/siyuan/issues/4511
- linkElement.innerHTML = Lute.EscapeHTMLStr(inputElement.value.replace(/\n|\r\n|\r|\u2028|\u2029/g, "")) || "*";
+ linkElement.innerHTML = Lute.EscapeHTMLStr(inputElements[1].value.replace(/\n|\r\n|\r|\u2028|\u2029/g, "")) || "*";
}
});
- inputElement.addEventListener("keydown", (event) => {
+ inputElements[1].addEventListener("keydown", (event) => {
if ((event.key === "Enter" || event.key === "Escape") && !event.isComposing) {
event.preventDefault();
event.stopPropagation();
@@ -1126,23 +1128,17 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
event.preventDefault();
event.stopPropagation();
if (event.shiftKey) {
- element.previousElementSibling.querySelector("textarea").focus();
+ inputElements[0].focus();
} else {
- element.nextElementSibling.querySelector("textarea").focus();
+ inputElements[2].focus();
}
} else if (electronUndo(event)) {
return;
}
});
- }
- }).element);
- window.siyuan.menus.menu.append(new MenuItem({
- iconHTML: "",
- label: ``,
- bind(element) {
- const inputElement = element.querySelector("textarea");
- inputElement.value = Lute.UnEscapeHTMLStr(linkElement.getAttribute("data-title") || "");
- inputElement.addEventListener("keydown", (event) => {
+
+ inputElements[2].value = Lute.UnEscapeHTMLStr(linkElement.getAttribute("data-title") || "");
+ inputElements[2].addEventListener("keydown", (event) => {
if ((event.key === "Enter" || event.key === "Escape") && !event.isComposing) {
event.preventDefault();
event.stopPropagation();
@@ -1150,13 +1146,14 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
} else if (event.key === "Tab" && event.shiftKey && !event.isComposing) {
event.preventDefault();
event.stopPropagation();
- element.previousElementSibling.querySelector("textarea").focus();
+ inputElements[1].focus();
} else if (electronUndo(event)) {
return;
}
});
}
}).element);
+ window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
window.siyuan.menus.menu.append(new MenuItem({
icon: "iconTrashcan",
label: window.siyuan.languages.remove,
@@ -1208,7 +1205,6 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
}).element);
}
if (linkAddress) {
- window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
openMenu(protyle.app, linkAddress, false, true);
/// #if !BROWSER
if (linkAddress?.startsWith("assets/")) {