From 7399e531e0e112f2d4af48c4cbdc6674f9ad1fb4 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 25 Jul 2022 11:17:28 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20Android=20=E7=AB=AF=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=20PNG=20=E7=B2=98=E8=B4=B4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5494?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/protyle/toolbar/index.ts | 16 ++++++++++------ app/src/protyle/util/compatibility.ts | 1 - app/src/types/index.d.ts | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts index 4261b9af3..fb352f519 100644 --- a/app/src/protyle/toolbar/index.ts +++ b/app/src/protyle/toolbar/index.ts @@ -7,7 +7,9 @@ import { focusSideBlock, getEditorRange, getSelectionOffset, - getSelectionPosition, setFirstNodeRange, setLastNodeRange + getSelectionPosition, + setFirstNodeRange, + setLastNodeRange } from "../util/selection"; import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName, hasClosestByMatchTag} from "../util/hasClosest"; import {Link} from "./Link"; @@ -18,11 +20,7 @@ import {mathRender} from "../markdown/mathRender"; import {getEventName} from "../util/compatibility"; import {upDownHint} from "../../util/upDownHint"; import {highlightRender} from "../markdown/highlightRender"; -import { - getContenteditableElement, - hasNextSibling, - hasPreviousSibling -} from "../wysiwyg/getBlock"; +import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock"; import {processRender} from "../util/processCode"; import {BlockRef} from "./BlockRef"; import {hintMoveBlock, hintRef, hintRenderAssets, hintRenderTemplate, hintRenderWidget} from "../hint/extend"; @@ -746,6 +744,12 @@ export class Toolbar { }); }, 100); /// #endif + + // TODO: V,Android 端图片复制 PNG 粘贴问题 https://github.com/siyuan-note/siyuan/issues/5494 + // if ("android" === window.siyuan.config.system.container && window.JSAndroid) { + // window.JSAndroid.writeImageClipboard(uri); + // return; + // } break; } }); diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts index 885b3881c..d6e3bbe07 100644 --- a/app/src/protyle/util/compatibility.ts +++ b/app/src/protyle/util/compatibility.ts @@ -2,7 +2,6 @@ export const writeText = async (text: string) => { try { // navigator.clipboard.writeText 抛出异常不进入 catch,这里需要先处理移动端复制 if ("android" === window.siyuan.config.system.container && window.JSAndroid) { - window.JSAndroid.writeClipboard(text); return; } diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 9903a4793..196cc8ff2 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -16,6 +16,7 @@ interface Window { openExternal(url: string): void changeStatusBarColor(color: string, mode: number): void writeClipboard(text: string): void + writeImageClipboard(uri: string): void } goBack(): void