An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:sparkles: Close Android desktop overlays before navigating back https://github.com/siyuan-note/siyuan/issues/20390
Daniel537d2a855c9f
diff --git a/app/guide/20210808180117-6v0mkxr/20240113110040-7sgw8kl.sy b/app/guide/20210808180117-6v0mkxr/20240113110040-7sgw8kl.syindex 9aec8ae7f4..bc45b8bda7 100644--- a/app/guide/20210808180117-6v0mkxr/20240113110040-7sgw8kl.sy+++ b/app/guide/20210808180117-6v0mkxr/20240113110040-7sgw8kl.sy@@ -7,7 +7,7 @@"id": "20240113110040-7sgw8kl","title": "Mobile App","type": "doc",- "updated": "20261004052629"+ "updated": "20261010114821"},"Children": [{@@ -16,7 +16,7 @@"HeadingLevel": 2,"Properties": {"id": "20240113110114-xav9o1n",- "updated": "20260921210136"+ "updated": "20261010114821"},"Children": [{@@ -98,6 +98,20 @@}]},+ {+ "ID": "20261010114821-igdube1",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261010114821-igdube1",+ "updated": "20261010114821"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "When using desktop layout on Android, the system Back button first closes the topmost dialog, menu, editing overlay, image preview or floating drawer. Each press closes one layer and preserves the browsing state underneath. With no dismissible layer open, Back performs the original page navigation."+ }+ ]+ },{"ID": "20240113110114-rugjxcf","Type": "NodeHeading",diff --git a/app/guide/20210808180117-czj9bvb/20240113102857-c63dmo5.sy b/app/guide/20210808180117-czj9bvb/20240113102857-c63dmo5.syindex bc9f6569ea..3eb1be54fe 100644--- a/app/guide/20210808180117-czj9bvb/20240113102857-c63dmo5.sy+++ b/app/guide/20210808180117-czj9bvb/20240113102857-c63dmo5.sy@@ -7,7 +7,7 @@"id": "20240113102857-c63dmo5","title": "移动端 App","type": "doc",- "updated": "20261004052629"+ "updated": "20261010114821"},"Children": [{@@ -16,7 +16,7 @@"HeadingLevel": 2,"Properties": {"id": "20240113102857-aof1w7f",- "updated": "20260921210136"+ "updated": "20261010114821"},"Children": [{@@ -98,6 +98,20 @@}]},+ {+ "ID": "20261010114821-9zssb7v",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261010114821-9zssb7v",+ "updated": "20261010114821"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "在 Android 上使用桌面布局时,系统返回键会先关闭当前最上层的弹窗、菜单、编辑浮层、图片预览或浮动抽屉,每次只关闭一层并保留底层浏览状态。没有可关闭的浮层时,才执行原有的页面返回行为。"+ }+ ]+ },{"ID": "20240113103514-zn9zqby","Type": "NodeHeading",diff --git a/app/guide/20211226090932-5lcq56f/20240113110500-dz2ae4n.sy b/app/guide/20211226090932-5lcq56f/20240113110500-dz2ae4n.syindex 47066e49f9..128f88ff52 100644--- a/app/guide/20211226090932-5lcq56f/20240113110500-dz2ae4n.sy+++ b/app/guide/20211226090932-5lcq56f/20240113110500-dz2ae4n.sy@@ -7,7 +7,7 @@"id": "20240113110500-dz2ae4n","title": "行動端 App","type": "doc",- "updated": "20261004052629"+ "updated": "20261010114821"},"Children": [{@@ -16,7 +16,7 @@"HeadingLevel": 2,"Properties": {"id": "20240113110513-8s7tp6d",- "updated": "20260921210136"+ "updated": "20261010114821"},"Children": [{@@ -98,6 +98,20 @@}]},+ {+ "ID": "20261010114821-z8mdm4l",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261010114821-z8mdm4l",+ "updated": "20261010114821"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "在 Android 上使用桌面佈局時,系統返回鍵會先關閉目前最上層的對話框、選單、編輯浮層、圖片預覽或浮動抽屜,每次只關閉一層並保留底層瀏覽狀態。沒有可關閉的浮層時,才執行原有的頁面返回行為。"+ }+ ]+ },{"ID": "20240113110513-zvmefnd","Type": "NodeHeading",diff --git a/app/guide/20240530133126-axarxgx/20240530101000-e6z5okf.sy b/app/guide/20240530133126-axarxgx/20240530101000-e6z5okf.syindex e63b50c87e..b2ba8b7704 100644--- a/app/guide/20240530133126-axarxgx/20240530101000-e6z5okf.sy+++ b/app/guide/20240530133126-axarxgx/20240530101000-e6z5okf.sy@@ -8,7 +8,7 @@"id": "20240530101000-e6z5okf","title": "モバイルアプリ","type": "doc",- "updated": "20261004052629"+ "updated": "20261010114821"},"Children": [{@@ -18,7 +18,7 @@"Properties": {"ID": "20240530101000-peznsnc","id": "20240530101000-2nn9stf",- "updated": "20260921210136"+ "updated": "20261010114821"},"Children": [{@@ -82,6 +82,20 @@}]},+ {+ "ID": "20261010114821-jcdqygo",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261010114821-jcdqygo",+ "updated": "20261010114821"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "Android でデスクトップレイアウトを使用する場合、システムの戻るボタンは最上位のダイアログ、メニュー、編集用の浮動画面、画像プレビューまたはフローティングドロワーを先に閉じます。1 回の操作で 1 つの画面だけを閉じ、背後の閲覧状態を保持します。閉じられる浮動画面がない場合に、従来のページ移動を行います。"+ }+ ]+ },{"ID": "20240530101000-tylg3qg","Type": "NodeHeading",diff --git a/app/src/boot/globalEvent/nativeBack.test.ts b/app/src/boot/globalEvent/nativeBack.test.tsnew file mode 100644index 0000000000..7d6a48dfca--- /dev/null+++ b/app/src/boot/globalEvent/nativeBack.test.ts@@ -0,0 +1,149 @@+import {test} from "node:test";+import * as assert from "node:assert/strict";+import {readFileSync} from "node:fs";+import {runInNewContext} from "node:vm";+import {ModuleKind, ScriptTarget, transpileModule} from "typescript";++const code = transpileModule(readFileSync("src/boot/globalEvent/nativeBack.ts", "utf8"), {+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},+}).outputText;++const setup = (android = true) => {+ const closed: string[] = [];+ const elements: Record<string, ReturnType<typeof element>[]> = {};+ const element = (name: string, zIndex: number, hidden = false) => ({+ name, isConnected: true, parentElement: null as HTMLElement | null, dataset: {} as Record<string, string>,+ style: {zIndex: String(zIndex), opacity: "1"},+ classList: {contains: (value: string) => value === "av__richtext-mask" && name === "rich-text"},+ closest: (): unknown => hidden ? {} : null,+ querySelector: (): null => null,+ getAttribute: () => "false",+ contains: (): boolean => false,+ dispatchEvent: (event: {type: string}) => { closed.push(name + ":" + event.type); elements[".av__mask"] = []; },+ remove: () => { closed.push(name); Object.keys(elements).forEach(key => { elements[key] = elements[key].filter(item => item.name !== name); }); },+ });+ const dialogs: Array<{element: unknown, destroy: () => void}> = [];+ const panels: Array<{element: unknown, x: number, destroy: () => void}> = [];+ const dock = element("drawer", 100);+ let drawerOpen = true;+ let floating = true;+ const siyuan = {dialogs, blockPanels: panels,+ menus: {menu: {element: element("menu", 50, true), remove: () => { closed.push("menu"); }}},+ layout: {rightDock: {layout: {element: dock}, isFloating: () => floating,+ isPanelVisible: () => drawerOpen, togglePanel: (visible: boolean) => { drawerOpen = visible; closed.push("drawer"); }}},+ viewer: {destroyed: true, viewer: element("viewer", 300), hide: () => { closed.push("viewer-hidden"); siyuan.viewer.destroyed = true; }},+ };+ const window = {siyuan, JSAndroid: android ? {} : undefined, history: {back: () => closed.push("history")},+ goBack: undefined as (() => void) | undefined};+ const api = {} as typeof import("./nativeBack");+ runInNewContext(code, {exports: api, window, document: {+ querySelectorAll: (selector: string) => elements[selector] || [], activeElement: null,+ }, getComputedStyle: (item: ReturnType<typeof element>) => ({display: "block", visibility: "visible", ...item.style}),+ CustomEvent: class { constructor(public type: string) {} }, require: (name: string) => ({+ "../../util/zIndex": {getZIndex: (item: ReturnType<typeof element>) => Number(item.style.zIndex)},+ "../../protyle/render/av/cellEditor": {AV_CELL_EDITOR_CLOSE_EVENT: "cell-close"},+ "../../protyle/render/av/richTextEditor": {destroyAVRichTextEditor: (save: boolean) => {+ assert.equal(save, true); closed.push("rich-text-saved"); elements[".av__mask"] = [];+ }},+ })[name]});+ const addDialog = (name: string, zIndex: number) => {+ const inner = element(name, zIndex);+ const item = {element: {...element("dialog-root", 0), querySelector: () => inner},+ destroy: () => { closed.push(name); dialogs.splice(dialogs.indexOf(item), 1); }};+ dialogs.push(item);+ return item;+ };+ return {api, window, siyuan, element, elements, closed, addDialog, dock,+ setFloating(value: boolean) { floating = value; }, setDrawer(value: boolean) { drawerOpen = value; }};+};++test("Android desktop back closes the highest menu, dialog and drawer one at a time, then uses history", () => {+ const state = setup();+ state.addDialog("first-dialog", 150);+ state.addDialog("top-dialog", 200);+ state.siyuan.menus.menu.element = state.element("menu", 250);+ state.siyuan.menus.menu.remove = () => {+ state.closed.push("menu"); state.siyuan.menus.menu.element.isConnected = false;+ };+ state.api.registerDesktopBackNavigation();+ for (let i = 0; i < 5; i++) state.window.goBack();+ assert.deepEqual(state.closed, ["menu", "top-dialog", "first-dialog", "drawer", "history"]);+});++test("a higher dialog closes ahead of an older menu regardless of array order", () => {+ const state = setup();+ state.siyuan.menus.menu.element = state.element("menu", 120);+ state.addDialog("highest-dialog", 200);+ state.addDialog("older-dialog", 160);+ assert.equal(state.api.closeDesktopBackLayer(), true);+ assert.deepEqual(state.closed, ["highest-dialog"]);+});++test("cell and rich text editors use their cleanup handlers before the parent dialog", () => {+ const state = setup();+ state.addDialog("dialog", 100);+ state.elements[".av__mask"] = [state.element("rich-text", 200)];+ state.api.closeDesktopBackLayer();+ assert.deepEqual(state.closed, ["rich-text-saved"]);+ state.elements[".av__mask"] = [state.element("cell", 210)];+ state.api.closeDesktopBackLayer();+ assert.deepEqual(state.closed, ["rich-text-saved", "cell:cell-close"]);+});++test("image previews run hidden cleanup and ordinary dock panels do not consume back", () => {+ const state = setup();+ state.setFloating(false);+ state.siyuan.viewer.destroyed = false;+ state.api.closeDesktopBackLayer();+ assert.deepEqual(state.closed, ["viewer-hidden"]);+ assert.equal(state.api.closeDesktopBackLayer(), false);+ state.api.registerDesktopBackNavigation();+ state.window.goBack();+ assert.deepEqual(state.closed, ["viewer-hidden", "history"]);+});++test("a popup inherits its parent's layer and hidden overlays do not consume back", () => {+ const state = setup();+ state.setDrawer(false);+ state.addDialog("dialog", 200);+ const mask = state.element("cell", 10);+ mask.parentElement = state.element("parent", 300) as unknown as HTMLElement;+ state.elements[".av__mask"] = [mask];+ state.api.closeDesktopBackLayer();+ assert.deepEqual(state.closed, ["cell:cell-close"]);+ const hiddenParent = state.element("parent", 400);+ hiddenParent.style.opacity = "0";+ mask.parentElement = hiddenParent as unknown as HTMLElement;+ state.elements[".av__mask"] = [mask];+ state.api.closeDesktopBackLayer();+ assert.deepEqual(state.closed, ["cell:cell-close", "dialog"]);+});++test("only the highest unpinned block popup closes on each back press", () => {+ const state = setup();+ state.setDrawer(false);+ for (const [name, zIndex, pin] of [["first", 150, "false"], ["top", 200, "false"], ["pinned", 250, "true"]] as const) {+ const element = state.element(name, zIndex);+ element.getAttribute = () => pin;+ const panel = {element, x: 1, destroy: () => {+ state.closed.push(name); state.siyuan.blockPanels.splice(state.siyuan.blockPanels.indexOf(panel), 1);+ }};+ state.siyuan.blockPanels.push(panel);+ }+ state.api.closeDesktopBackLayer();+ assert.deepEqual(state.closed, ["top"]);+ state.api.closeDesktopBackLayer();+ assert.deepEqual(state.closed, ["top", "first"]);+ assert.equal(state.api.closeDesktopBackLayer(), false);+});++test("closing dialogs consume repeated back presses and a plain browser keeps its own navigation", () => {+ const state = setup(false);+ state.setDrawer(false);+ const dialog = state.addDialog("closing", 200);+ dialog.element.dataset.dialogClosing = "true";+ dialog.element.querySelector = (): null => null;+ assert.equal(state.api.closeDesktopBackLayer(), true);+ state.api.registerDesktopBackNavigation();+ assert.equal(state.window.goBack, undefined);+});diff --git a/app/src/boot/globalEvent/nativeBack.ts b/app/src/boot/globalEvent/nativeBack.tsnew file mode 100644index 0000000000..f5c83b96c5--- /dev/null+++ b/app/src/boot/globalEvent/nativeBack.ts@@ -0,0 +1,88 @@+import {destroyAVRichTextEditor} from "../../protyle/render/av/richTextEditor";+import {AV_CELL_EDITOR_CLOSE_EVENT} from "../../protyle/render/av/cellEditor";+import {getZIndex} from "../../util/zIndex";++// Android 桌面布局按实际层级关闭一个浮层,保留底层文档和面板的浏览状态。+export const closeDesktopBackLayer = () => {+ const siyuan = window.siyuan;+ if (!siyuan) {+ return false;+ }+ const layers: Array<{zIndex: number, close: () => void}> = [];+ const addLayer = (element: HTMLElement | null | undefined, close: () => void) => {+ if (!element?.isConnected || element.closest(".fn__none")) {+ return;+ }+ let zIndex = 0;+ for (let parent = element; parent; parent = parent.parentElement) {+ const style = getComputedStyle(parent);+ if (style.display === "none" || style.visibility === "hidden" || style.opacity === "0") {+ return;+ }+ const computedZIndex = Number(style.zIndex);+ zIndex = Math.max(zIndex, getZIndex(parent), Number.isFinite(computedZIndex) ? computedZIndex : 0);+ }+ layers.push({zIndex, close});+ };+ const menu = siyuan.menus?.menu;+ addLayer(menu?.element, () => menu.remove(true));+ siyuan.dialogs?.forEach(dialog => {+ addLayer(dialog.element.querySelector(".b3-dialog"), () => dialog.destroy());+ });+ siyuan.blockPanels?.forEach(panel => {+ if ((panel.targetElement || typeof panel.x === "number") && panel.element.getAttribute("data-pin") === "false") {+ addLayer(panel.element, () => panel.destroy());+ }+ });+ const viewer = siyuan.viewer;+ if (viewer && !viewer.destroyed) {+ addLayer(viewer.viewer, () => viewer.hide());+ }+ document.querySelectorAll<HTMLElement>(".protyle-img").forEach(element => {+ addLayer(element, () => element.remove());+ });+ document.querySelectorAll<HTMLElement>(".av__panel").forEach(element => {+ addLayer(element, () => {+ if ((element.querySelector('[data-type="goSearchRollupCol"]') && !element.querySelector(".b3-text-field")) ||+ element.querySelector('[data-type="addAssetExist"]')) {+ element.dispatchEvent(new CustomEvent("click", {detail: "close"}));+ } else {+ element.remove();+ }+ });+ });+ document.querySelectorAll<HTMLElement>(".av__mask").forEach(element => {+ addLayer(element, () => {+ if (element.classList.contains("av__richtext-mask")) {+ destroyAVRichTextEditor(true);+ } else {+ if (element.contains(document.activeElement)) {+ (document.activeElement as HTMLElement).blur();+ }+ element.dispatchEvent(new CustomEvent(AV_CELL_EDITOR_CLOSE_EVENT));+ }+ });+ });+ [siyuan.layout?.leftDock, siyuan.layout?.rightDock, siyuan.layout?.bottomDock].forEach(dock => {+ if (dock?.isFloating() && dock.isPanelVisible() && dock.layout.element.style.opacity === "1") {+ addLayer(dock.layout.element, () => dock.togglePanel(false));+ }+ });+ layers.sort((left, right) => right.zIndex - left.zIndex);+ if (layers.length > 0) {+ layers[0].close();+ return true;+ }+ // 关闭动画尚未结束时仍消费返回,避免连续按键触发整页导航。+ return siyuan.dialogs?.some(dialog => dialog.element.dataset.dialogClosing === "true") ?? false;+};++export const registerDesktopBackNavigation = () => {+ if (window.JSAndroid) {+ window.goBack = () => {+ if (!closeDesktopBackLayer()) {+ window.history.back();+ }+ };+ }+};diff --git a/app/src/index.ts b/app/src/index.tsindex 64137c6af9..60742702df 100644--- a/app/src/index.ts+++ b/app/src/index.ts@@ -7,6 +7,7 @@ import {systemConfig} from "./config/systemConfig";import {openStandaloneDatabaseItemByURI} from "./protyle/render/av/openStandaloneDatabaseItem";/// #if BROWSERimport "./util/iosWindowControls";+import {registerDesktopBackNavigation} from "./boot/globalEvent/nativeBack";/// #endifimport {Menus} from "./menus";import {Model} from "./layout/Model";@@ -412,6 +413,7 @@ window.openFileByURL = (openURL) => {};/// #if BROWSER+registerDesktopBackNavigation();window.showKeyboardToolbar = () => {// 防止 Pad 端报错};diff --git a/app/src/types/protyle.d.ts b/app/src/types/protyle.d.tsindex 132e65d246..8eebdcf8d2 100644--- a/app/src/types/protyle.d.ts+++ b/app/src/types/protyle.d.ts@@ -179,6 +179,8 @@ declare class Viewer {public destroy(): voidpublic show(): void++ public hide(): void}declare class Lute {