From fe87dc2170dc2542e50c9894410596ecccededee Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 2 Sep 2022 20:42:59 +0800
Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/5794

---
 app/src/protyle/gutter/index.ts    | 13 ++++++++++++-
 app/src/protyle/wysiwyg/keydown.ts | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index b36d61ea1..39dba6413 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -27,6 +27,7 @@ import {confirmDialog} from "../../dialog/confirmDialog";
 import {enableProtyle} from "../util/onGet";
 import {countBlockWord} from "../../layout/status";
 import {Constants} from "../../constants";
+import {openFileById} from "../../editor/util";
 
 export class Gutter {
     public element: HTMLElement;
@@ -1180,7 +1181,17 @@ export class Gutter {
             accelerator: window.siyuan.config.keymap.general.enterBack.custom,
             label: window.siyuan.languages.enterBack,
             click() {
-                zoomOut(protyle, protyle.block.parent2ID, id);
+                if (!protyle.block.showAll) {
+                    const ids = protyle.path.split("/");
+                    if (ids.length > 2) {
+                        openFileById({
+                            id: ids[ids.length - 2],
+                            action: [Constants.CB_GET_FOCUS, Constants.CB_GET_SCROLL]
+                        });
+                    }
+                } else {
+                    zoomOut(protyle, protyle.block.parent2ID, id);
+                }
             }
         }).element);
         if (!window.siyuan.config.readonly) {
diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts
index 0adc67703..be40eb2bc 100644
--- a/app/src/protyle/wysiwyg/keydown.ts
+++ b/app/src/protyle/wysiwyg/keydown.ts
@@ -408,7 +408,17 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
         }
 
         if (matchHotKey(window.siyuan.config.keymap.general.enterBack.custom, event)) {
-            zoomOut(protyle, protyle.block.parent2ID, nodeElement.getAttribute("data-node-id"));
+            if (!protyle.block.showAll) {
+                const ids = protyle.path.split("/");
+                if (ids.length > 2) {
+                    openFileById({
+                        id: ids[ids.length - 2],
+                        action: [Constants.CB_GET_FOCUS, Constants.CB_GET_SCROLL]
+                    });
+                }
+            } else {
+                zoomOut(protyle, protyle.block.parent2ID, nodeElement.getAttribute("data-node-id"));
+            }
             event.preventDefault();
             event.stopPropagation();
             return;
@@ -1639,7 +1649,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
                 event.preventDefault();
                 event.stopPropagation();
                 return true;
-            }else if (matchHotKey(window.siyuan.config.keymap.editor.general.refPopover.custom, event)) {
+            } else if (matchHotKey(window.siyuan.config.keymap.editor.general.refPopover.custom, event)) {
                 // open popover
                 window.siyuan.blockPanels.push(new BlockPanel({
                     targetElement: refElement,