diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts
index 913e90340..47c1d13bc 100644
--- a/app/src/menus/Menu.ts
+++ b/app/src/menus/Menu.ts
@@ -50,8 +50,6 @@ export class Menu {
itemElement.classList.add("b3-menu__item--show");
if (!this.element.classList.contains("b3-menu--fullscreen")) {
this.showSubMenu(subMenuElement);
- } else {
- this.element.scrollTop = 0
}
});
}
diff --git a/app/src/mobile/util/MobileBackFoward.ts b/app/src/mobile/util/MobileBackFoward.ts
index 9e43e933e..20d916a79 100644
--- a/app/src/mobile/util/MobileBackFoward.ts
+++ b/app/src/mobile/util/MobileBackFoward.ts
@@ -98,6 +98,16 @@ export const pushBack = () => {
};
export const goForward = () => {
+ if (window.siyuan.menus.menu.element.classList.contains("b3-menu--fullscreen") &&
+ !window.siyuan.menus.menu.element.classList.contains("fn__none")) {
+ window.siyuan.menus.menu.element.dispatchEvent(new CustomEvent("click", {detail: "back"}));
+ return;
+ } else if (document.getElementById("model").style.top === "0px" ||
+ document.getElementById("menu").style.right === "0px" ||
+ document.getElementById("sidebar").style.left === "0px") {
+ closePanel();
+ return;
+ }
if (window.JSAndroid && forwardStack.length < 2) {
window.JSAndroid.returnDesktop();
return;
@@ -110,17 +120,19 @@ export const goForward = () => {
};
export const goBack = () => {
- if (window.JSAndroid) {
- if (window.siyuan.menus.menu.element.classList.contains("b3-menu--fullscreen") && !window.siyuan.menus.menu.element.classList.contains("fn__none")) {
- window.siyuan.menus.menu.element.dispatchEvent(new CustomEvent("click", {detail: "back"}));
- return;
- } else if (document.getElementById("model").style.top === "0px") {
- closePanel();
- return;
- } else if (window.siyuan.backStack.length < 1) {
- window.JSAndroid.returnDesktop();
- return;
- }
+ if (window.siyuan.menus.menu.element.classList.contains("b3-menu--fullscreen") &&
+ !window.siyuan.menus.menu.element.classList.contains("fn__none")) {
+ window.siyuan.menus.menu.element.dispatchEvent(new CustomEvent("click", {detail: "back"}));
+ return;
+ } else if (document.getElementById("model").style.top === "0px" ||
+ document.getElementById("menu").style.right === "0px" ||
+ document.getElementById("sidebar").style.left === "0px") {
+ closePanel();
+ return;
+ }
+ if (window.JSAndroid && window.siyuan.backStack.length < 1) {
+ window.JSAndroid.returnDesktop();
+ return;
}
if (window.siyuan.backStack.length < 1) {
return;
diff --git a/app/src/mobile/util/closePanel.ts b/app/src/mobile/util/closePanel.ts
index 4369038c3..6048d3573 100644
--- a/app/src/mobile/util/closePanel.ts
+++ b/app/src/mobile/util/closePanel.ts
@@ -2,5 +2,4 @@ export const closePanel = () => {
document.getElementById("menu").style.right = "-100vw";
document.getElementById("sidebar").style.left = "-100vw";
document.getElementById("model").style.top = "-200vh";
- document.querySelector(".scrim").classList.add("fn__none");
};
diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts
index 017d5982f..b83b45d7f 100644
--- a/app/src/mobile/util/initFramework.ts
+++ b/app/src/mobile/util/initFramework.ts
@@ -23,7 +23,6 @@ export const initFramework = () => {
setInlineStyle();
renderSnippet();
initKeyboardToolbar();
- const scrimElement = document.querySelector(".scrim");
const sidebarElement = document.getElementById("sidebar");
let outline: MobileOutline;
let backlink: MobileBacklinks;
@@ -37,6 +36,10 @@ export const initFramework = () => {
return;
}
const type = svgElement.getAttribute("data-type");
+ if (!type) {
+ closePanel();
+ return;
+ }
sidebarElement.querySelectorAll(".toolbar--border svg").forEach(item => {
const itemType = item.getAttribute("data-type");
if (itemType === type) {
@@ -78,7 +81,6 @@ export const initFramework = () => {
hideKeyboardToolbar();
activeBlur();
sidebarElement.style.left = "0";
- document.querySelector(".scrim").classList.remove("fn__none");
const type = sidebarElement.querySelector(".toolbar--border .toolbar__icon--active").getAttribute("data-type");
if (type === "sidebar-outline-tab") {
outline.update();
@@ -123,10 +125,6 @@ export const initFramework = () => {
}, Constants.TIMEOUT_INPUT);
}, Constants.TIMEOUT_INPUT);
}
-
- scrimElement.addEventListener(getEventName(), () => {
- closePanel();
- });
document.getElementById("modelClose").addEventListener(getEventName(), () => {
closePanel();
});
diff --git a/app/src/mobile/util/menu.ts b/app/src/mobile/util/menu.ts
index ab7d45149..db371319a 100644
--- a/app/src/mobile/util/menu.ts
+++ b/app/src/mobile/util/menu.ts
@@ -62,7 +62,7 @@ const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) =
fetchPost("/api/setting/logoutCloudUser", {}, () => {
window.siyuan.user = null;
closePanel();
- document.getElementById("menuAccount").innerHTML = `${window.siyuan.languages.login}`;
+ document.getElementById("menuAccount").innerHTML = ``;
processSync();
});
});
@@ -71,7 +71,7 @@ const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) =
fetchPost("/api/account/deactivate", {}, () => {
window.siyuan.user = null;
closePanel();
- document.getElementById("menuAccount").innerHTML = `${window.siyuan.languages.login}`;
+ document.getElementById("menuAccount").innerHTML = ``;
processSync();
});
});
@@ -91,9 +91,9 @@ const showAccountInfo = (modelElement: HTMLElement, modelMainElement: Element) =
showAccountInfo(modelElement, modelMainElement);
const menuAccountElement = document.getElementById("menuAccount");
if (window.siyuan.user) {
- menuAccountElement.innerHTML = `
${window.siyuan.user.userName}`;
+ menuAccountElement.innerHTML = ``;
} else {
- menuAccountElement.innerHTML = `${window.siyuan.languages.login}`;
+ menuAccountElement.innerHTML = ``;
}
processSync();
});
@@ -117,70 +117,85 @@ const genWorkspace = (workspaceDirElement: Element) => {
export const popMenu = () => {
activeBlur();
hideKeyboardToolbar();
- const modelElement = document.getElementById("model");
- const modelMainElement = document.getElementById("modelMain");
- const scrimElement = document.querySelector(".scrim");
const menuElement = document.getElementById("menu");
if (menuElement.innerHTML !== "") {
menuElement.style.right = "0";
- scrimElement.classList.remove("fn__none");
return;
}
-
let accountHTML = "";
if (window.siyuan.user && !window.siyuan.config.readonly) {
- accountHTML = `
-
- ${window.siyuan.user.userName}
+ accountHTML = `
+
+
`;
} else if (!window.siyuan.config.readonly) {
- accountHTML = `
- ${window.siyuan.languages.login}
+ accountHTML = ``;
}
- menuElement.innerHTML = `
-
-
-
-
-
-
-
- ${window.siyuan.languages.lockScreen}
+ menuElement.innerHTML = `
+
${accountHTML}
-
- ${window.siyuan.languages.cloud}
+
-
- ${window.siyuan.languages.help}
+
-
- ${window.siyuan.languages.about}
+
-
- ${window.siyuan.languages.safeQuit}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
// 只能用 click，否则无法上下滚动 https://github.com/siyuan-note/siyuan/issues/6628
processSync();
+ const modelElement = document.getElementById("model");
+ const modelMainElement = document.getElementById("modelMain");
menuElement.addEventListener("click", (event) => {
let target = event.target as HTMLElement;
while (target && !target.isEqualNode(menuElement)) {
- if (target.id === "menuSearch") {
+ if (target.classList.contains("b3-menu__title")) {
+ closePanel();
+ event.preventDefault();
+ event.stopPropagation();
+ break;
+ } else if (target.id === "menuSearch") {
popSearch(modelElement, modelMainElement);
event.preventDefault();
event.stopPropagation();
@@ -353,8 +368,8 @@ ${accountHTML}
}, response => {
window.siyuan.user = response.data;
closePanel();
- document.getElementById("menuAccount").innerHTML = `
-${window.siyuan.user.userName}`;
+ document.getElementById("menuAccount").innerHTML = `
+`;
processSync();
});
});
@@ -370,8 +385,8 @@ ${accountHTML}
}, response => {
window.siyuan.user = response.data;
closePanel();
- document.getElementById("menuAccount").innerHTML = `
-${window.siyuan.user.userName}`;
+ document.getElementById("menuAccount").innerHTML = `
+`;
processSync();
});
});
@@ -382,7 +397,6 @@ ${accountHTML}
}
});
menuElement.style.right = "0";
- scrimElement.classList.remove("fn__none");
};
const initAbout = () => {
@@ -507,12 +521,6 @@ const initAbout = () => {
${window.siyuan.languages.slogan}
-
-
-
-
- ${window.siyuan.languages.feedback}
-
${window.siyuan.languages.slogan}
会泽百家 至公天下
${window.siyuan.languages.about1}
diff --git a/app/src/mobile/util/touch.ts b/app/src/mobile/util/touch.ts
index ec853b6ab..4fb3f86e7 100644
--- a/app/src/mobile/util/touch.ts
+++ b/app/src/mobile/util/touch.ts
@@ -34,7 +34,7 @@ export const handleTouchStart = (event: TouchEvent) => {
xDiff = 0;
yDiff = 0;
clientX = event.touches[0].clientX;
- if ((clientX < 48 || clientX > window.innerWidth - 24) && document.querySelector(".scrim").classList.contains("fn__none")) {
+ if ((clientX < 48 || clientX > window.innerWidth - 24)) {
clientY = event.touches[0].clientY;
} else {
clientX = null;
diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index f540c10f8..4d05c81b7 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -208,16 +208,16 @@ export class Gutter {
openAttr(protyle.wysiwyg.element.querySelector(`[data-node-id="${id}"]`), protyle);
} else {
this.renderMenu(protyle, buttonElement);
- if (isMobile()) {
- window.siyuan.menus.menu.fullscreen();
- } else {
- window.siyuan.menus.menu.popup({x: event.clientX - 16, y: event.clientY - 16}, true);
- }
// https://ld246.com/article/1648433751993
if (!protyle.toolbar.range) {
protyle.toolbar.range = getEditorRange(protyle.wysiwyg.element.firstElementChild);
}
- focusByRange(protyle.toolbar.range);
+ if (isMobile()) {
+ window.siyuan.menus.menu.fullscreen();
+ } else {
+ window.siyuan.menus.menu.popup({x: event.clientX - 16, y: event.clientY - 16}, true);
+ focusByRange(protyle.toolbar.range);
+ }
}
});
this.element.addEventListener("contextmenu", (event: MouseEvent & { target: HTMLInputElement }) => {