From 441abbcdae8d90354f7497ed81bcab40ae23f3cf Mon Sep 17 00:00:00 2001
From: Huakun <huakun.shen@huakunshen.com>
Date: Sat, 22 Feb 2025 07:21:15 -0500
Subject: [PATCH] Fix: clipboard paste timing (#191)

* fix(desktop): improve hotkey and paste functionality with refined key press timing

* fix(clipboard): streamline clipboard handling for macOS and add TODO for Windows/Linux support

* removed a comment
---
 apps/desktop/package.json                         |  2 +-
 apps/desktop/src/lib/utils/hotkey.ts              | 15 +++++++++++----
 .../routes/app/extension/clipboard/+page.svelte   | 13 +++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 3bb6b3f..86cf587 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@kksh/desktop",
-	"version": "0.1.26",
+	"version": "0.1.27",
 	"description": "",
 	"type": "module",
 	"scripts": {
diff --git a/apps/desktop/src/lib/utils/hotkey.ts b/apps/desktop/src/lib/utils/hotkey.ts
index dcebd2f..468b415 100644
--- a/apps/desktop/src/lib/utils/hotkey.ts
+++ b/apps/desktop/src/lib/utils/hotkey.ts
@@ -75,16 +75,23 @@ export async function updateAppHotkey(newHotkey: string[], oldHotkey?: string[]
  * @param keys - The array of keys to press and release.
  */
 export async function applyKeyComb(keys: userInput.Key[]) {
-	await Promise.all(keys.map((key) => userInput.key("KeyPress", key)))
-	await sleep(50)
-	await Promise.all(keys.map((key) => userInput.key("KeyRelease", key)))
+	// await Promise.all(keys.map((key) => userInput.key("KeyPress", key)))
+	for (const key of keys) {
+		await userInput.key("KeyPress", key)
+		await sleep(20)
+	}
+	await sleep(100)
+	for (const key of keys) {
+		await userInput.key("KeyRelease", key)
+		await sleep(20)
+	}
 }
 
 /**
  * Simulates a paste operation based on the operating system.
  * On macOS, it uses Command+V. On Windows and Linux, it uses Shift+Insert.
  */
-export function paste() {
+export async function paste() {
 	const _platform = os.platform()
 	if (_platform === "macos") {
 		return applyKeyComb(["MetaLeft", "KeyV"])
diff --git a/apps/desktop/src/routes/app/extension/clipboard/+page.svelte b/apps/desktop/src/routes/app/extension/clipboard/+page.svelte
index c364f1b..bac90d4 100644
--- a/apps/desktop/src/routes/app/extension/clipboard/+page.svelte
+++ b/apps/desktop/src/routes/app/extension/clipboard/+page.svelte
@@ -191,14 +191,11 @@
 					return Promise.reject(new Error("No data found"))
 				}
 				return writeToClipboard(data).then(async () => {
-					if (_platform === "macos") {
-						// TODO: add support for Windows and Linux
-						return app
-							.hide()
-							.then(() => sleep(100))
-							.then(() => curWin.hide())
-							.then(() => paste())
-					}
+					return app
+						.hide()
+						.then(() => sleep(100))
+						.then(() => curWin.hide())
+						.then(() => paste())
 				})
 			})
 			.then(() => toast.success("Copied to clipboard"))