From f3513e9408ad725656c7b25030f79ddf3ab5ea84 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Tue, 14 Mar 2023 23:26:18 +0800
Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/7655

---
 app/src/mobile/util/MobileBackFoward.ts |  4 ++++
 app/src/mobile/util/closePanel.ts       | 12 ++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/mobile/util/MobileBackFoward.ts b/app/src/mobile/util/MobileBackFoward.ts
index 4950916f8..9e43e933e 100644
--- a/app/src/mobile/util/MobileBackFoward.ts
+++ b/app/src/mobile/util/MobileBackFoward.ts
@@ -8,6 +8,7 @@ import {highlightRender} from "../../protyle/markdown/highlightRender";
 import {blockRender} from "../../protyle/markdown/blockRender";
 import {disabledForeverProtyle, disabledProtyle, enableProtyle} from "../../protyle/util/onGet";
 import {setStorageVal} from "../../protyle/util/compatibility";
+import {closePanel} from "./closePanel";
 
 const forwardStack: IBackStack[] = [];
 
@@ -113,6 +114,9 @@ export const goBack = () => {
         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;
diff --git a/app/src/mobile/util/closePanel.ts b/app/src/mobile/util/closePanel.ts
index e6a5b7e2b..4369038c3 100644
--- a/app/src/mobile/util/closePanel.ts
+++ b/app/src/mobile/util/closePanel.ts
@@ -1,10 +1,6 @@
 export const closePanel = () => {
-    const menuElement = document.getElementById("menu");
-    const sidebarElement = document.getElementById("sidebar");
-    const scrimElement = document.querySelector(".scrim");
-    const modelElement = document.getElementById("model");
-    menuElement.style.right = "-100vw";
-    sidebarElement.style.left = "-100vw";
-    modelElement.style.top = "-200vh";
-    scrimElement.classList.add("fn__none");
+    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");
 };