From 4b542c9ff2e90c9194353844265c8aa8efce9aca Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 6 Apr 2023 20:32:40 +0800 Subject: [PATCH] :bug: fix https://github.com/siyuan-note/siyuan/issues/7901 --- app/src/protyle/breadcrumb/index.ts | 8 -------- app/src/protyle/util/setEditMode.ts | 12 +++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 5ea7b6786..256462b48 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -335,14 +335,6 @@ export class Breadcrumb { accelerator: window.siyuan.config.keymap.editor.general.wysiwyg.custom, click: () => { setEditMode(protyle, "wysiwyg"); - protyle.scroll.lastScrollTop = 0; - fetchPost("/api/filetree/getDoc", { - id: protyle.block.rootID, - size: window.siyuan.config.editor.dynamicLoadBlocks, - }, getResponse => { - onGet(getResponse, protyle); - window.siyuan.menus.menu.remove(); - }); } }]; editSubmenu.push({ diff --git a/app/src/protyle/util/setEditMode.ts b/app/src/protyle/util/setEditMode.ts index 4b89db52a..42760637c 100644 --- a/app/src/protyle/util/setEditMode.ts +++ b/app/src/protyle/util/setEditMode.ts @@ -11,6 +11,11 @@ export const setEditMode = (protyle: IProtyle, type: TEditorMode) => { protyle.scroll?.element.classList.add("fn__none"); if (protyle.options.render.breadcrumb) { protyle.breadcrumb?.element.classList.add("fn__none"); + if (protyle.block.showAll) { + const exitFocusElement = protyle.breadcrumb.element.parentElement.querySelector('[data-type="exit-focus"]') + exitFocusElement.classList.add("fn__none"); + exitFocusElement.nextElementSibling.classList.add("fn__none"); + } } protyle.preview.render(protyle); } else if (type === "wysiwyg") { @@ -26,7 +31,12 @@ export const setEditMode = (protyle: IProtyle, type: TEditorMode) => { } if (protyle.options.render.breadcrumb) { protyle.breadcrumb?.element.classList.remove("fn__none"); + if (protyle.block.showAll) { + const exitFocusElement = protyle.breadcrumb.element.parentElement.querySelector('[data-type="exit-focus"]') + exitFocusElement.classList.remove("fn__none"); + exitFocusElement.nextElementSibling.classList.remove("fn__none"); + } } } - hideElements( ["gutter", "toolbar", "select", "hint", "util"], protyle); + hideElements(["gutter", "toolbar", "select", "hint", "util"], protyle); };