added window version open quick paste window with async required func…

…tion in rust
mayite · Aug 21, 2024 · cd50ce6 · cd50ce6
1 parent 044b4fb
commit cd50ce6
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 147 deletions.
diff --git a/packages/pastebar-app-ui/src/App.tsx b/packages/pastebar-app-ui/src/App.tsx
@@ -211,6 +211,10 @@ function App() {
         }
 
         if (settings.hotKeysShowHideMainAppWindow?.valueText) {
+          console.log(
+            'settings.hotKeysShowHideMainAppWindow?.valueText',
+            settings.hotKeysShowHideMainAppWindow?.valueText
+          )
           try {
             register(settings.hotKeysShowHideMainAppWindow?.valueText, async () => {
               if (document.hasFocus()) {
@@ -228,6 +232,10 @@ function App() {
         }
 
         if (settings.hotKeysShowHideQuickPasteWindow?.valueText) {
+          console.log(
+            'settings.hotKeysShowHideMainAppWindow?.valueText',
+            settings.hotKeysShowHideQuickPasteWindow?.valueText
+          )
           try {
             register(settings.hotKeysShowHideQuickPasteWindow?.valueText, async () => {
               await uiStore.toggleHistoryQuickPasteWindow()

diff --git a/packages/pastebar-app-ui/src/pages/main/ClipboardHistoryQuickPastePage.tsx b/packages/pastebar-app-ui/src/pages/main/ClipboardHistoryQuickPastePage.tsx
@@ -94,10 +94,7 @@ const loadPrismComponents = async () => {
 
 async function invokeCopyPasteHistoryItem(historyId: UniqueIdentifier) {
   try {
-    await invoke('set_focus_to_previous_window')
-    await new Promise(resolve => setTimeout(resolve, 200))
-    invoke('copy_paste_history_item', { historyId, delay: 0 })
-    appWindow?.close()
+    await invoke('quickpaste_hide_paste_close', { historyId })
   } catch (error) {
     console.error('Error copying history item:', error)
   }
@@ -578,7 +575,7 @@ export default function ClipboardHistoryQuickPastePage() {
                                 movePinnedClipboardHistoryUpDown(move)
                               }}
                               setSelectHistoryItem={() => {}}
-                              onCopy={setCopiedItem}
+                              onCopy={invokeCopyPasteHistoryItem}
                               onCopyPaste={invokeCopyPasteHistoryItem}
                               pastingCountDown={
                                 historyId === pastedItemValue
@@ -750,7 +747,7 @@ export default function ClipboardHistoryQuickPastePage() {
                           setHistoryFilters={setHistoryFilters}
                           setAppFilters={setAppFilters}
                           setSelectHistoryItem={() => {}}
-                          onCopy={setCopiedItem}
+                          onCopy={invokeCopyPasteHistoryItem}
                           onCopyPaste={invokeCopyPasteHistoryItem}
                           isKeyboardSelected={keyboardSelectedItemId === historyId}
                           setKeyboardSelected={id => {

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -11,12 +11,13 @@ rust-version = "1.75.0"
 version = "1.4"
 features = []
 
-[target.'cfg(windows)'.dependencies]
+[target.'cfg(target_os = "windows")'.dependencies]
+winapi = { version = "0.3", features = ["winuser", "windef"] }
 winreg = "0.52.0"
 
 [dependencies]
 fns = "0"
-enigo = "0.1.2"
+mouse_position = "0.1.4"
 keyring = "2.3.2"
 dotenv = "0.15.0"
 bcrypt = "0.15.1"