From a61e861503a7a3a6523900e45628e576e55a1839 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sun, 9 Apr 2023 23:21:29 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/7597 --- app/src/mobile/util/MobileBackFoward.ts | 3 +++ app/src/protyle/preview/image.ts | 8 ++++---- app/src/types/index.d.ts | 5 +++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/mobile/util/MobileBackFoward.ts b/app/src/mobile/util/MobileBackFoward.ts index d134b7c31..00b413748 100644 --- a/app/src/mobile/util/MobileBackFoward.ts +++ b/app/src/mobile/util/MobileBackFoward.ts @@ -128,6 +128,9 @@ export const goBack = () => { } else if (document.getElementById("model").style.transform === "translateY(0px)") { document.getElementById("model").style.transform = ""; return; + } else if (window.siyuan.viewer && !window.siyuan.viewer.destroyed) { + window.siyuan.viewer.destroy(); + return; } else if (document.getElementById("menu").style.transform === "translateX(0px)" || document.getElementById("sidebar").style.transform === "translateX(0px)") { closePanel(); diff --git a/app/src/protyle/preview/image.ts b/app/src/protyle/preview/image.ts index dbd079b01..e27ab4bbb 100644 --- a/app/src/protyle/preview/image.ts +++ b/app/src/protyle/preview/image.ts @@ -18,7 +18,7 @@ export const previewImage = (src: string, id: string) => { }); imagesElement.innerHTML = html; // @ts-ignore - const viewer = new Viewer(imagesElement, { + window.siyuan.viewer = new Viewer(imagesElement, { title: [1, (image: HTMLImageElement, imageData: IObject) => { let name = image.alt; if (!name) { @@ -31,7 +31,7 @@ export const previewImage = (src: string, id: string) => { initialViewIndex, transition: false, hidden: function () { - viewer.destroy(); + window.siyuan.viewer.destroy(); }, toolbar: { zoomIn: true, @@ -46,11 +46,11 @@ export const previewImage = (src: string, id: string) => { flipHorizontal: true, flipVertical: true, close: function () { - viewer.destroy(); + window.siyuan.viewer.destroy(); }, }, }); - viewer.show(); + window.siyuan.viewer.show(); }); }); }; diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 23951bc32..b1975ff06 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -235,6 +235,11 @@ interface ISiyuan { bookmarkLabel?: string[] blockPanels: import("../block/Panel").BlockPanel[], dialogs: import("../dialog").Dialog[], + viewer?: { + destroyed: boolean, + show: () => void, + destroy: () => void, + } } interface IScrollAttr {