Merge remote-tracking branch 'origin/dev' into dev

app/src/menus/commonMenuItem.ts

@@ -774,6 +774,8 @@ export const openMenu = (src: string, onlyMenu = false) => {
         click: () => {
             if (window.siyuan.config.system.container === "ios") {
                 window.location.href = src;
+            } else if (window.siyuan.config.system.container === "android" && window.JSAndroid) {
+                window.JSAndroid.openExternal(src);
             } else {
                 window.open(src);
             }

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 {
+import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock";
-    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;
             }
         });

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;
         }

app/src/protyle/wysiwyg/index.ts

@@ -1473,6 +1473,8 @@ export class WYSIWYG {
                         /// #else
                         if (window.siyuan.config.system.container === "ios") {
                             window.location.href = linkAddress;
+                        } else if (window.siyuan.config.system.container === "android" && window.JSAndroid) {
+                            window.JSAndroid.openExternal(linkAddress);
                         } else {
                             window.open(linkAddress);
                         }
@@ -1486,6 +1488,8 @@ export class WYSIWYG {
                     /// #else
                     if (window.siyuan.config.system.container === "ios") {
                         window.location.href = linkAddress;
+                    } else if (window.siyuan.config.system.container === "android" && window.JSAndroid) {
+                        window.JSAndroid.openExternal(linkAddress);
                     } else {
                         window.open(linkAddress);
                     }

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

kernel/go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/88250/css v0.1.2
 	github.com/88250/flock v0.8.2
 	github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583
-	github.com/88250/lute v1.7.4-0.20220722022200-f3b7c70d4f93
+	github.com/88250/lute v1.7.5-0.20220724154255-81edef2f3ae2
 	github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1
 	github.com/88250/pdfcpu v0.3.13
 	github.com/88250/protyle v0.0.0-20220519012506-0a2c8dc24397

kernel/go.sum

@@ -58,8 +58,8 @@ github.com/88250/gulu v1.2.0/go.mod h1:ZhEJ98UjR2y7j2toGj4/b+1rRELcZFQAPq/Yjyin2
 github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583 h1:FhA/zJemLrbOYJpdMIMBezO5rGigQSdPR1kv+aztHfA=
 github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
 github.com/88250/lute v1.7.4-0.20220426011157-34c9bfa2e148/go.mod h1:Bdu9LRNjQhtL3TftbtpjIWTwDVAXoS7AD8QsZQPk7zo=
-github.com/88250/lute v1.7.4-0.20220722022200-f3b7c70d4f93 h1:AzY5cIRFjRHBnXELeOls8DAVKuZ9jTOBW/yBicb3C6U=
+github.com/88250/lute v1.7.5-0.20220724154255-81edef2f3ae2 h1:nwgPx0LUAQ1sWlcBm/VSNK7RAHBdtOTNiPaEUFnuISQ=
-github.com/88250/lute v1.7.4-0.20220722022200-f3b7c70d4f93/go.mod h1:Bdu9LRNjQhtL3TftbtpjIWTwDVAXoS7AD8QsZQPk7zo=
+github.com/88250/lute v1.7.5-0.20220724154255-81edef2f3ae2/go.mod h1:Bdu9LRNjQhtL3TftbtpjIWTwDVAXoS7AD8QsZQPk7zo=
 github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1 h1:9Cb+iN639vUI2OcIBc+4oGwml9/0J6bL6dWNb8Al+1s=
 github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1/go.mod h1:jH6MMPr8G7AMzaVmWHXZQiB1DKO3giWbcWZ7UoJ1teI=
 github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=