From 58f1cea811db472cd56667cce7db1fbacaa6c53e Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 25 Jan 2024 13:12:12 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/10244 --- app/src/protyle/scroll/event.ts | 2 +- app/src/protyle/ui/hideElements.ts | 5 +++++ app/src/protyle/util/onGet.ts | 2 +- app/src/protyle/util/resize.ts | 2 +- app/src/protyle/util/setEditMode.ts | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/protyle/scroll/event.ts b/app/src/protyle/scroll/event.ts index 7780ec815..0706aabe4 100644 --- a/app/src/protyle/scroll/event.ts +++ b/app/src/protyle/scroll/event.ts @@ -33,7 +33,7 @@ export const scrollEvent = (protyle: IProtyle, element: HTMLElement) => { } if (!window.siyuan.dragElement) { // https://ld246.com/article/1649638389841 - hideElements(["gutter"], protyle); + hideElements(["gutterOnly"], protyle); } if (protyle.scroll && !protyle.scroll.element.classList.contains("fn__none")) { diff --git a/app/src/protyle/ui/hideElements.ts b/app/src/protyle/ui/hideElements.ts index b8bc4f18a..ac3956535 100644 --- a/app/src/protyle/ui/hideElements.ts +++ b/app/src/protyle/ui/hideElements.ts @@ -27,6 +27,11 @@ export const hideElements = (panels: string[], protyle?: IProtyle, focusHide = f item.classList.remove("protyle-wysiwyg--hl"); }); } + // 不能 remove("protyle-wysiwyg--hl") 否则打开页签的时候 "cb-get-hl" 高亮会被移除 + if (protyle.gutter && panels.includes("gutterOnly")) { + protyle.gutter.element.classList.add("fn__none"); + protyle.gutter.element.innerHTML = ""; + } if (protyle.toolbar && panels.includes("toolbar")) { protyle.toolbar.element.classList.add("fn__none"); protyle.toolbar.element.style.display = ""; diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts index 14177982a..5303f2074 100644 --- a/app/src/protyle/util/onGet.ts +++ b/app/src/protyle/util/onGet.ts @@ -57,7 +57,7 @@ export const onGet = (options: { return; } } - hideElements(["gutter"], options.protyle); + hideElements(["gutterOnly"], options.protyle); options.protyle.block.parentID = options.data.data.parentID; options.protyle.block.parent2ID = options.data.data.parent2ID; options.protyle.block.rootID = options.data.data.rootID; diff --git a/app/src/protyle/util/resize.ts b/app/src/protyle/util/resize.ts index 6a8189da2..ec352afc6 100644 --- a/app/src/protyle/util/resize.ts +++ b/app/src/protyle/util/resize.ts @@ -6,7 +6,7 @@ import {lineNumberRender} from "../render/highlightRender"; import {stickyRow} from "../render/av/row"; export const resize = (protyle: IProtyle) => { - hideElements(["gutter"], protyle); + hideElements(["gutterOnly"], protyle) const abs = setPadding(protyle); const MIN_ABS = 4; // 不能 clearTimeout,否则 split 时左侧无法 resize diff --git a/app/src/protyle/util/setEditMode.ts b/app/src/protyle/util/setEditMode.ts index a0e3869a5..2426ab9ba 100644 --- a/app/src/protyle/util/setEditMode.ts +++ b/app/src/protyle/util/setEditMode.ts @@ -34,5 +34,5 @@ export const setEditMode = (protyle: IProtyle, type: TEditorMode) => { /// #endif resize(protyle); } - hideElements(["gutter", "toolbar", "select", "hint", "util"], protyle); + hideElements(["gutterOnly", "toolbar", "select", "hint", "util"], protyle); };