starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-01-11 20:00:29 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Catch clipboard errors

Browse Source
This commit is contained in:
Gregory Schier
2024-08-10 07:33:10 -07:00
parent dab10d79fe
commit 2f9532cf53
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src-tauri/capabilities/capabilities.json
View File

@@ -11,6 +11,7 @@
"core:event:allow-listen",
"core:event:allow-unlisten",
"os:allow-os-type",
"clipboard-manager:allow-clear",
"clipboard-manager:allow-write-text",
"clipboard-manager:allow-read-text",
"dialog:allow-open",

2
src-tauri/gen/schemas/capabilities.json
View File

@@ -1 +1 @@
{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["core:event:allow-emit","core:event:allow-listen","core:event:allow-unlisten","os:allow-os-type","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-is-fullscreen","core:window:allow-maximize","core:window:allow-minimize","core:window:allow-toggle-maximize","core:window:allow-set-decorations","core:window:allow-set-title","core:window:allow-start-dragging","core:window:allow-unmaximize","core:window:allow-theme","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}
{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["core:event:allow-emit","core:event:allow-listen","core:event:allow-unlisten","os:allow-os-type","clipboard-manager:allow-write-text","clipboard-manager:allow-clear","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-is-fullscreen","core:window:allow-maximize","core:window:allow-minimize","core:window:allow-toggle-maximize","core:window:allow-set-decorations","core:window:allow-set-title","core:window:allow-start-dragging","core:window:allow-unmaximize","core:window:allow-theme","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}

21
src-web/hooks/useClipboardText.ts
View File

@@ -1,8 +1,8 @@
import { readText, writeText } from '@tauri-apps/plugin-clipboard-manager';
import { clear, readText, writeText } from '@tauri-apps/plugin-clipboard-manager';
import { useCallback, useEffect } from 'react';
import { createGlobalState } from 'react-use';
import { useToast } from '../components/ToastContext';
import { useWindowFocus } from './useWindowFocus';
import { createGlobalState } from 'react-use';
const useClipboardTextState = createGlobalState<string>('');
@@ -12,12 +12,21 @@ export function useClipboardText({ disableToast }: { disableToast?: boolean } =
const toast = useToast();
useEffect(() => {
readText().then(setValue);
readText()
.then(setValue)
.catch(() => {
// Clipboard probably empty
setValue('');
});
}, [focused, setValue]);
const setText = useCallback(
(text: string) => {
writeText(text).catch(console.error);
(text: string | null) => {
if (text == null) {
clear().catch(console.error);
} else {
writeText(text).catch(console.error);
}
if (text != '' && !disableToast) {
toast.show({
id: 'copied',
@@ -25,7 +34,7 @@ export function useClipboardText({ disableToast }: { disableToast?: boolean } =
message: 'Copied to clipboard',
});
}
setValue(text);
setValue(text || '');
},
[disableToast, setValue, toast],
);

2
src-web/hooks/useImportCurl.ts
View File

@@ -40,7 +40,7 @@ export function useImportCurl({ clearClipboard }: { clearClipboard?: boolean } =
});
if (clearClipboard) {
setClipboardText('');
setClipboardText(null);
}
},
});