Merge pull request #357 from trifle-labs/no-share-just-copy

just copy to clipboard if possible

src/visuals.js

@@ -2670,27 +2670,15 @@ export const Visuals = {
   async shareCanvas(showPopup = true) {
     const file = this.shareCanvasBlob
     if (!file) throw new Error('Nothing available to share!')
-
-    if (navigator.share) {
-      console.log('sharing canvas...')
-      try {
-        await navigator.share({ files: [file] })
-        return undefined
-      } catch (e) {
-        // ignore user aborting
-        if (e?.name === 'AbortError') return undefined
-        console.error('Couldnt share via navigator', e)
-        // don't throw error, try clipboard
-      }
-    }
-
+    let copySuccess = false
     if (navigator.clipboard && navigator.clipboard.write) {
       try {
         console.log('trying to copy canvas to clipboard...')
         await navigator.clipboard.write([
           new ClipboardItem({ 'image/png': file })
         ])
         const msg = 'Copied results to your clipboard.'
+        copySuccess = true
         if (showPopup) {
           this.popup = {
             header: 'Go Share!',
@@ -2713,6 +2701,18 @@ export const Visuals = {
         throw new Error("Couldn't copy to clipboard. Blocked by browser?")
       }
     }
+    if (navigator.share && !copySuccess) {
+      console.log('sharing canvas...')
+      try {
+        await navigator.share({ files: [file] })
+        return undefined
+      } catch (e) {
+        // ignore user aborting
+        if (e?.name === 'AbortError') return undefined
+        console.error('Couldnt share via navigator', e)
+        // don't throw error, try clipboard
+      }
+    }
 
     if (!showPopup) return
     this.popup = {