V2 update with availble types performance tweaks

Cargo.toml

@@ -16,7 +16,7 @@ serde = "1.0"
 thiserror = "1.0"
 base64 = "0.22.1"
 image = "0.25.1"
-clipboard-rs = "0.2.0"
+clipboard-rs = "0.2.1"
 
 [build-dependencies]
-tauri-plugin = { version = "2.0.0-beta.15", features = ["build"] }
+tauri-plugin = { version = "2.0.0-beta", features = ["build"] }

examples/demo/package.json

@@ -37,7 +37,7 @@
   "type": "module",
   "dependencies": {
     "@floating-ui/dom": "1.5.3",
-    "@tauri-apps/api": "2.0.0-beta.11",
+    "@tauri-apps/api": "^2.0.0-beta",
     "tauri-plugin-clipboard-api": "link:../../"
   }
 }

examples/demo/src-tauri/capabilities/default.json

@@ -6,15 +6,9 @@
     "main"
   ],
   "permissions": [
-    "path:default",
-    "event:default",
-    "window:default",
-    "webview:default",
-    "app:default",
-    "resources:default",
-    "image:default",
-    "menu:default",
-    "tray:default",
+    "core:event:default",
+    "core:path:default",
+    "core:window:default",
     "clipboard:read-all",
     "clipboard:write-all",
     "clipboard:monitor-all"

examples/demo/src/lib/components/listener.svelte

@@ -29,6 +29,7 @@
 	let unlistenImageUpdate: UnlistenFn;
 	let unlistenHtmlUpdate: UnlistenFn;
 	let unlistenRTF: UnlistenFn;
+	let unlistenAvail: UnlistenFn;
 	let unlistenClipboard: () => Promise<void>;
 	let unlistenFiles: UnlistenFn;
 	const has = {
@@ -65,14 +66,14 @@
 		});
 		unlistenClipboard = await startListening();
 
-		onClipboardUpdate(async () => {
+		unlistenAvail = await onClipboardUpdate(async (values) => {
 			clear();
-			has.hasHTML = await hasHTML();
-			has.hasImage = await hasImage();
-			has.hasText = await hasText();
-			has.hasRTF = await hasRTF();
-			has.hasFiles = await hasFiles();
-			console.log('plugin:clipboard://clipboard-monitor/update event received');
+			console.log('plugin:clipboard://clipboard-monitor/update event received', values);
+			has.hasHTML = values.html;
+			has.hasImage = values.image;
+			has.hasText = values.text;
+			has.hasRTF = values.rtf
+			has.hasFiles = values.files;
 		});
 	});
 
@@ -86,6 +87,7 @@
 		if (unlistenHtmlUpdate) unlistenHtmlUpdate();
 		if (unlistenFiles) unlistenFiles();
 		if (unlistenClipboard) unlistenClipboard();
+		if (unlistenAvail) unlistenAvail();
 	});
 </script>
 

guest-js/api.ts

@@ -48,6 +48,14 @@ export const ClipboardChangedFilesPayloadSchema = v.object({
 })
 export type ClipboardChangedPayload = v.InferOutput<typeof ClipboardChangedPayloadSchema>
 
+export interface ClipboardState {
+  text: boolean,
+  html: boolean,
+  rtf: boolean,
+  image: boolean,
+  files: boolean,
+}
+
 export function hasText() {
   return invoke<boolean>(HAS_TEXT_COMMAND)
 }
@@ -333,13 +341,13 @@ export function listenToClipboard(
 
 /**
  * This listen to clipboard monitor update event, and trigger the callback function.
- * However from this event we don't know whether it's text or image, no real data is returned.
- * Use with listenToClipboard function.
  * @param cb callback
  * @returns unlisten function
  */
-export function onClipboardUpdate(cb: () => void) {
-  return listen(MONITOR_UPDATE_EVENT, cb)
+export async function onClipboardUpdate(cb: (state: ClipboardState) => void) {
+  return await listen<ClipboardState>(MONITOR_UPDATE_EVENT, (event) => {
+    cb(event.payload)
+  })
 }
 
 export async function onTextUpdate(cb: (text: string) => void): Promise<UnlistenFn> {

package.json

@@ -26,7 +26,7 @@
   "peerDependencies": {},
   "dependencies": {
     "valibot": "^0.40.0",
-    "@tauri-apps/api": "2.0.0-beta.11"
+    "@tauri-apps/api": "^2.0.0-beta"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "^0.4.4",

permissions/autogenerated/reference.md

@@ -1,5 +1,5 @@
 
-### Permission Table 
+## Permission Table 
 
 <table>
 <tr>