From 4221b574c9bf189cd65d8ec18bdd71328ba49694 Mon Sep 17 00:00:00 2001
From: Huakun Shen <huakun.shen@huakunshen.com>
Date: Thu, 13 Feb 2025 23:13:35 -0500
Subject: [PATCH] fix(desktop): global hot key register during init must be
 after appConfig.init (#113)

---
 apps/desktop/package.json                  |  2 +-
 apps/desktop/src/lib/utils/init.ts         | 10 +++++-----
 apps/desktop/src/routes/+layout.svelte     |  6 ------
 apps/desktop/src/routes/app/+layout.svelte |  2 ++
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 344d6ca..e0f97da 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@kksh/desktop",
-	"version": "0.1.21",
+	"version": "0.1.22",
 	"description": "",
 	"type": "module",
 	"scripts": {
diff --git a/apps/desktop/src/lib/utils/init.ts b/apps/desktop/src/lib/utils/init.ts
index dc6ef64..85480d0 100644
--- a/apps/desktop/src/lib/utils/init.ts
+++ b/apps/desktop/src/lib/utils/init.ts
@@ -14,10 +14,10 @@ export function init() {
 	}
 
 	if (!dev) {
-		document.addEventListener("contextmenu", function (event) {
-			event.preventDefault()
-			console.warn("contextmenu disabled in release mode", event)
-		})
+		// document.addEventListener("contextmenu", function (event) {
+		// 	event.preventDefault()
+		// 	console.warn("contextmenu disabled in release mode", event)
+		// })
 	}
 }
 
@@ -31,6 +31,6 @@ export function initMainWindow() {
 		info(`Registering hotkey: ${hotkeyStr}`)
 		registerAppHotkey(hotkeyStr)
 	} else {
-		console.log("No hotkey found in confi")
+		console.log("No hotkey found in config")
 	}
 }
diff --git a/apps/desktop/src/routes/+layout.svelte b/apps/desktop/src/routes/+layout.svelte
index e69a8bd..98d1042 100644
--- a/apps/desktop/src/routes/+layout.svelte
+++ b/apps/desktop/src/routes/+layout.svelte
@@ -1,16 +1,10 @@
 <script lang="ts">
 	import { ParaglideJS } from "@inlang/paraglide-sveltekit"
 	import { i18n } from "$lib/i18n"
-	import { onMount } from "svelte"
 	import "../app.css"
-	import { init } from "@/utils/init"
 	import { ModeWatcher, ThemeWrapper } from "@kksh/svelte5"
 	import { Toaster } from "svelte-sonner"
 
-	onMount(() => {
-		init()
-	})
-
 	let { children } = $props()
 </script>
 
diff --git a/apps/desktop/src/routes/app/+layout.svelte b/apps/desktop/src/routes/app/+layout.svelte
index 420d5bb..005de12 100644
--- a/apps/desktop/src/routes/app/+layout.svelte
+++ b/apps/desktop/src/routes/app/+layout.svelte
@@ -6,6 +6,7 @@
 	import { appsLoader } from "@/stores/apps"
 	import { initDeeplink } from "@/utils/deeplink"
 	import { updateAppHotkey } from "@/utils/hotkey"
+	import { init as initApp } from "@/utils/init"
 	import { globalKeyDownHandler, globalKeyUpHandler, goBackOrCloseOnEscape } from "@/utils/key"
 	import { listenToWindowBlur } from "@/utils/tauri-events"
 	import { isInMainWindow } from "@/utils/window"
@@ -63,6 +64,7 @@
 			.catch(error)
 		quickLinks.init()
 		appConfig.init().then(() => {
+			initApp()
 			console.log("appConfig.language", $appConfig.language)
 			setLanguageTag($appConfig.language as AvailableLanguageTag)
 			switchToLanguage($appConfig.language as AvailableLanguageTag)