Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:lipstick: Unify mobile settings back buttons https://github.com/siyuan-note/siyuan/issues/19881

Daniel7a5859bfc4dc
diff --git a/app/src/assets/scss/main/_mobile.scss b/app/src/assets/scss/main/_mobile.scss
index 4e3af75bc6..7475142c1e 100644
--- a/app/src/assets/scss/main/_mobile.scss
+++ b/app/src/assets/scss/main/_mobile.scss
@@ -1292,6 +1292,12 @@ body.mobile-topbar--merged {
top: 0;
transform: translateX(100vw);
+ > .toolbar {
+ flex-shrink: 0;
+ padding-left: max(5px, env(safe-area-inset-left));
+ padding-right: max(5px, env(safe-area-inset-right));
+ }
+
.mobile-main-menu {
&__search {
background-color: var(--b3-theme-surface);
diff --git a/app/src/mobile/menu/index.ts b/app/src/mobile/menu/index.ts
index cec96845fa..8ca78d99a9 100644
--- a/app/src/mobile/menu/index.ts
+++ b/app/src/mobile/menu/index.ts
@@ -68,7 +68,7 @@ const renderMobilePluginDockMenu = (app: App, menuElement: HTMLElement) => {
/** 分发单层元素的点击:handled 表示已响应,ignored 表示继续向上查找,abort 表示终止本次事件处理 */
const dispatchMobileMainMenuClick = (app: App, target: HTMLElement, search: IMainMenuSearch):
"handled" | "ignored" | "abort" => {
- if (target.classList.contains("b3-menu__title")) {
+ if (target.dataset.type === "close-menu") {
closePanel();
return "handled";
}
diff --git a/app/src/mobile/menu/mainMenu.ts b/app/src/mobile/menu/mainMenu.ts
index 6c97e4c3c9..0b505881fe 100644
--- a/app/src/mobile/menu/mainMenu.ts
+++ b/app/src/mobile/menu/mainMenu.ts
@@ -308,8 +308,8 @@ const renderMobileMainMenuGroupHTML = (group: IMobileMainMenuGroup) =>
</div>`;
/** 生成主菜单容器 `#menu` 的内容,分组与条目均由 `MOBILE_MAIN_MENU_GROUPS` 推导 */
-export const renderMobileMainMenuHTML = () => `<div class="b3-menu__title">
- <svg class="b3-menu__icon" role="img" aria-label="${escapeAttr(window.siyuan.languages.returnLabel)}"><use xlink:href="#iconLeft"></use></svg>
+export const renderMobileMainMenuHTML = () => `<div class="toolbar toolbar--border" data-type="close-menu">
+ <svg class="toolbar__icon" role="img" aria-label="${escapeAttr(window.siyuan.languages.returnLabel)}"><use xlink:href="#iconLeft"></use></svg>
</div>
<div class="mobile-main-menu__search" data-prevent-swipe>
<input placeholder="${window.siyuan.languages.searchPlaceholder}" class="b3-text-field fn__block" autocomplete="off" autocorrect="off" spellcheck="false">