Merge pull request #774 from tidalcycles/tauri-clipboard

fix: share copy to clipboard + alert
tidalcycles · Nov 2, 2023 · 9ec5d33 · 9ec5d33
2 parents 1e5edfc + 8d3ba2a
commit 9ec5d33
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 2 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -17,7 +17,7 @@ tauri-build = { version = "1.4.0", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.4.0", features = ["fs-all"] }
+tauri = { version = "1.4.0", features = [ "dialog-all", "clipboard-write-text", "fs-all"] }
 midir = "0.9.1"
 tokio = { version = "1.29.0", features = ["full"] }
 rosc = "0.10.1"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -13,6 +13,12 @@
   },
   "tauri": {
     "allowlist": {
+      "dialog": {
+        "all": true
+      },
+      "clipboard": {
+        "writeText": true
+      },
       "all": false,
       "fs": {
         "all": true,

diff --git a/website/src/repl/Repl.jsx b/website/src/repl/Repl.jsx
@@ -23,6 +23,7 @@ import { settingPatterns } from '../settings.mjs';
 import { code2hash, hash2code } from './helpers.mjs';
 import { isTauri } from '../tauri.mjs';
 import { useWidgets } from '@strudel.cycles/react/src/hooks/useWidgets.mjs';
+import { writeText } from '@tauri-apps/api/clipboard';
 
 const { latestCode } = settingsMap.get();
 
@@ -270,7 +271,11 @@ export function Repl({ embedded = false }) {
     if (!error) {
       setLastShared(activeCode || code);
       // copy shareUrl to clipboard
-      await navigator.clipboard.writeText(shareUrl);
+      if (isTauri()) {
+        await writeText(shareUrl);
+      } else {
+        await navigator.clipboard.writeText(shareUrl);
+      }
       const message = `Link copied to clipboard: ${shareUrl}`;
       alert(message);
       // alert(message);