Merge branch 'main' into macstoresubmit

README.md

@@ -1,7 +1,15 @@
 # PasteBar - Limitless, Free Clipboard Manager for Mac and Windows.
+![pastebar-screenshot-main-split](https://github.com/user-attachments/assets/c3024edb-67ae-4e92-a02f-a0957fb153a2)
 
-* **Rust**: Tauri, Diesel ORM, Reqwest, Anyhow, Serde, Tokio.
-* **Javascript**: Typescript, React, Vite, TailwindCSS, Signals, Jotai, Zustand.
+- Effortless Management Of Everything You Copy and Paste.
+- Private, Safe and Secure Stored on Your Local Device.
+- Free and Open Source
+
+### Stack
+* **Rust**: Tauri Apps, Diesel ORM, Reqwest, Anyhow, Serde, Tokio.
+* **Javascript**: Typescript, React, React Query, Vite, TailwindCSS, Signals, Jotai, Zustand.
+
+https://www.pastebar.app
 
 # Build Local PastBar App
 

entitlements_prod.plist

@@ -16,4 +16,4 @@
     <true/>
 
   </dict>
-</plist>
+</plist>

package-lock.json

@@ -56,7 +56,7 @@
         "@tanstack/react-query": "5.25.0",
         "@tanstack/react-query-devtools": "5.25.0",
         "@tanstack/react-query-persist-client": "5.25.0",
-        "@tauri-apps/api": "^1.5.3",
+        "@tauri-apps/api": "^1.6.0",
         "@types/node": "^20.10.0",
         "@uiw/codemirror-extensions-langs": "^4.21.21",
         "@uiw/codemirror-theme-github": "^4.21.21",
@@ -135,7 +135,7 @@
       "devDependencies": {
         "@changesets/cli": "^2.27.1",
         "@tailwindcss/line-clamp": "^0.4.4",
-        "@tauri-apps/cli": "^1.5.6",
+        "@tauri-apps/cli": "^1.6.0",
         "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "@types/bcryptjs": "^2.4.6",
         "@types/codemirror": "^5.60.15",
@@ -7019,9 +7019,9 @@
       }
     },
     "node_modules/@tauri-apps/api": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.5.3.tgz",
-      "integrity": "sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.6.0.tgz",
+      "integrity": "sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg==",
       "engines": {
         "node": ">= 14.6.0",
         "npm": ">= 6.6.0",
@@ -7033,9 +7033,9 @@
       }
     },
     "node_modules/@tauri-apps/cli": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.5.6.tgz",
-      "integrity": "sha512-k4Y19oVCnt7WZb2TnDzLqfs7o98Jq0tUoVMv+JQSzuRDJqaVu2xMBZ8dYplEn+EccdR5SOMyzaLBJWu38TVK1A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.0.tgz",
+      "integrity": "sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==",
       "dev": true,
       "bin": {
         "tauri": "tauri.js"
@@ -7048,22 +7048,22 @@
         "url": "https://opencollective.com/tauri"
       },
       "optionalDependencies": {
-        "@tauri-apps/cli-darwin-arm64": "1.5.6",
-        "@tauri-apps/cli-darwin-x64": "1.5.6",
-        "@tauri-apps/cli-linux-arm-gnueabihf": "1.5.6",
-        "@tauri-apps/cli-linux-arm64-gnu": "1.5.6",
-        "@tauri-apps/cli-linux-arm64-musl": "1.5.6",
-        "@tauri-apps/cli-linux-x64-gnu": "1.5.6",
-        "@tauri-apps/cli-linux-x64-musl": "1.5.6",
-        "@tauri-apps/cli-win32-arm64-msvc": "1.5.6",
-        "@tauri-apps/cli-win32-ia32-msvc": "1.5.6",
-        "@tauri-apps/cli-win32-x64-msvc": "1.5.6"
+        "@tauri-apps/cli-darwin-arm64": "1.6.0",
+        "@tauri-apps/cli-darwin-x64": "1.6.0",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.0",
+        "@tauri-apps/cli-linux-arm64-gnu": "1.6.0",
+        "@tauri-apps/cli-linux-arm64-musl": "1.6.0",
+        "@tauri-apps/cli-linux-x64-gnu": "1.6.0",
+        "@tauri-apps/cli-linux-x64-musl": "1.6.0",
+        "@tauri-apps/cli-win32-arm64-msvc": "1.6.0",
+        "@tauri-apps/cli-win32-ia32-msvc": "1.6.0",
+        "@tauri-apps/cli-win32-x64-msvc": "1.6.0"
       }
     },
     "node_modules/@tauri-apps/cli-darwin-arm64": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.5.6.tgz",
-      "integrity": "sha512-NNvG3XLtciCMsBahbDNUEvq184VZmOveTGOuy0So2R33b/6FDkuWaSgWZsR1mISpOuP034htQYW0VITCLelfqg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.0.tgz",
+      "integrity": "sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==",
       "cpu": [
         "arm64"
       ],
@@ -7077,9 +7077,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-darwin-x64": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.5.6.tgz",
-      "integrity": "sha512-nkiqmtUQw3N1j4WoVjv81q6zWuZFhBLya/RNGUL94oafORloOZoSY0uTZJAoeieb3Y1YK0rCHSDl02MyV2Fi4A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.0.tgz",
+      "integrity": "sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==",
       "cpu": [
         "x64"
       ],
@@ -7093,9 +7093,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.5.6.tgz",
-      "integrity": "sha512-z6SPx+axZexmWXTIVPNs4Tg7FtvdJl9EKxYN6JPjOmDZcqA13iyqWBQal2DA/GMZ1Xqo3vyJf6EoEaKaliymPQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.0.tgz",
+      "integrity": "sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==",
       "cpu": [
         "arm"
       ],
@@ -7109,9 +7109,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm64-gnu": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.5.6.tgz",
-      "integrity": "sha512-QuQjMQmpsCbzBrmtQiG4uhnfAbdFx3nzm+9LtqjuZlurc12+Mj5MTgqQ3AOwQedH3f7C+KlvbqD2AdXpwTg7VA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.0.tgz",
+      "integrity": "sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==",
       "cpu": [
         "arm64"
       ],
@@ -7125,9 +7125,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm64-musl": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.6.tgz",
-      "integrity": "sha512-8j5dH3odweFeom7bRGlfzDApWVOT4jIq8/214Wl+JeiNVehouIBo9lZGeghZBH3XKFRwEvU23i7sRVjuh2s8mg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.0.tgz",
+      "integrity": "sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==",
       "cpu": [
         "arm64"
       ],
@@ -7141,9 +7141,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-x64-gnu": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.5.6.tgz",
-      "integrity": "sha512-gbFHYHfdEGW0ffk8SigDsoXks6USpilF6wR0nqB/JbWzbzFR/sBuLVNQlJl1RKNakyJHu+lsFxGy0fcTdoX8xA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.0.tgz",
+      "integrity": "sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==",
       "cpu": [
         "x64"
       ],
@@ -7157,9 +7157,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-x64-musl": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.6.tgz",
-      "integrity": "sha512-9v688ogoLkeFYQNgqiSErfhTreLUd8B3prIBSYUt+x4+5Kcw91zWvIh+VSxL1n3KCGGsM7cuXhkGPaxwlEh1ug==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.0.tgz",
+      "integrity": "sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==",
       "cpu": [
         "x64"
       ],
@@ -7173,9 +7173,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-arm64-msvc": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.5.6.tgz",
-      "integrity": "sha512-DRNDXFNZb6y5IZrw+lhTTA9l4wbzO4TNRBAlHAiXUrH+pRFZ/ZJtv5WEuAj9ocVSahVw2NaK5Yaold4NPAxHog==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.0.tgz",
+      "integrity": "sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==",
       "cpu": [
         "arm64"
       ],
@@ -7189,9 +7189,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-ia32-msvc": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.5.6.tgz",
-      "integrity": "sha512-oUYKNR/IZjF4fsOzRpw0xesl2lOjhsQEyWlgbpT25T83EU113Xgck9UjtI7xemNI/OPCv1tPiaM1e7/ABdg5iA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.0.tgz",
+      "integrity": "sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==",
       "cpu": [
         "ia32"
       ],
@@ -7205,9 +7205,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-x64-msvc": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.5.6.tgz",
-      "integrity": "sha512-RmEf1os9C8//uq2hbjXi7Vgz9ne7798ZxqemAZdUwo1pv3oLVZSz1/IvZmUHPdy2e6zSeySqWu1D0Y3QRNN+dg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.0.tgz",
+      "integrity": "sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==",
       "cpu": [
         "x64"
       ],
@@ -23028,95 +23028,95 @@
       }
     },
     "@tauri-apps/api": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.5.3.tgz",
-      "integrity": "sha512-zxnDjHHKjOsrIzZm6nO5Xapb/BxqUq1tc7cGkFXsFkGTsSWgCPH1D8mm0XS9weJY2OaR73I3k3S+b7eSzJDfqA=="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.6.0.tgz",
+      "integrity": "sha512-rqI++FWClU5I2UBp4HXFvl+sBWkdigBkxnpJDQUWttNyG7IZP4FwQGhTNL5EOw0vI8i6eSAJ5frLqO7n7jbJdg=="
     },
     "@tauri-apps/cli": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.5.6.tgz",
-      "integrity": "sha512-k4Y19oVCnt7WZb2TnDzLqfs7o98Jq0tUoVMv+JQSzuRDJqaVu2xMBZ8dYplEn+EccdR5SOMyzaLBJWu38TVK1A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.6.0.tgz",
+      "integrity": "sha512-DBBpBl6GhTzm8ImMbKkfaZ4fDTykWrC7Q5OXP4XqD91recmDEn2LExuvuiiS3HYe7uP8Eb5B9NPHhqJb+Zo7qQ==",
       "dev": true,
       "requires": {
-        "@tauri-apps/cli-darwin-arm64": "1.5.6",
-        "@tauri-apps/cli-darwin-x64": "1.5.6",
-        "@tauri-apps/cli-linux-arm-gnueabihf": "1.5.6",
-        "@tauri-apps/cli-linux-arm64-gnu": "1.5.6",
-        "@tauri-apps/cli-linux-arm64-musl": "1.5.6",
-        "@tauri-apps/cli-linux-x64-gnu": "1.5.6",
-        "@tauri-apps/cli-linux-x64-musl": "1.5.6",
-        "@tauri-apps/cli-win32-arm64-msvc": "1.5.6",
-        "@tauri-apps/cli-win32-ia32-msvc": "1.5.6",
-        "@tauri-apps/cli-win32-x64-msvc": "1.5.6"
+        "@tauri-apps/cli-darwin-arm64": "1.6.0",
+        "@tauri-apps/cli-darwin-x64": "1.6.0",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "1.6.0",
+        "@tauri-apps/cli-linux-arm64-gnu": "1.6.0",
+        "@tauri-apps/cli-linux-arm64-musl": "1.6.0",
+        "@tauri-apps/cli-linux-x64-gnu": "1.6.0",
+        "@tauri-apps/cli-linux-x64-musl": "1.6.0",
+        "@tauri-apps/cli-win32-arm64-msvc": "1.6.0",
+        "@tauri-apps/cli-win32-ia32-msvc": "1.6.0",
+        "@tauri-apps/cli-win32-x64-msvc": "1.6.0"
       }
     },
     "@tauri-apps/cli-darwin-arm64": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.5.6.tgz",
-      "integrity": "sha512-NNvG3XLtciCMsBahbDNUEvq184VZmOveTGOuy0So2R33b/6FDkuWaSgWZsR1mISpOuP034htQYW0VITCLelfqg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.6.0.tgz",
+      "integrity": "sha512-SNRwUD9nqGxY47mbY1CGTt/jqyQOU7Ps7Mx/mpgahL0FVUDiCEY/5L9QfEPPhEgccgcelEVn7i6aQHIkHyUtCA==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-darwin-x64": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.5.6.tgz",
-      "integrity": "sha512-nkiqmtUQw3N1j4WoVjv81q6zWuZFhBLya/RNGUL94oafORloOZoSY0uTZJAoeieb3Y1YK0rCHSDl02MyV2Fi4A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.6.0.tgz",
+      "integrity": "sha512-g2/uDR/eeH2arvuawA4WwaEOqv/7jDO/ZLNI3JlBjP5Pk8GGb3Kdy0ro1xQzF94mtk2mOnOXa4dMgAet4sUJ1A==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-arm-gnueabihf": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.5.6.tgz",
-      "integrity": "sha512-z6SPx+axZexmWXTIVPNs4Tg7FtvdJl9EKxYN6JPjOmDZcqA13iyqWBQal2DA/GMZ1Xqo3vyJf6EoEaKaliymPQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.6.0.tgz",
+      "integrity": "sha512-EVwf4oRkQyG8BpSrk0gqO7oA0sDM2MdNDtJpMfleYFEgCxLIOGZKNqaOW3M7U+0Y4qikmG3TtRK+ngc8Ymtrjg==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-arm64-gnu": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.5.6.tgz",
-      "integrity": "sha512-QuQjMQmpsCbzBrmtQiG4uhnfAbdFx3nzm+9LtqjuZlurc12+Mj5MTgqQ3AOwQedH3f7C+KlvbqD2AdXpwTg7VA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.6.0.tgz",
+      "integrity": "sha512-YdpY17cAySrhK9dX4BUVEmhAxE2o+6skIEFg8iN/xrDwRxhaNPI9I80YXPatUTX54Kx55T5++25VJG9+3iw83A==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-arm64-musl": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.5.6.tgz",
-      "integrity": "sha512-8j5dH3odweFeom7bRGlfzDApWVOT4jIq8/214Wl+JeiNVehouIBo9lZGeghZBH3XKFRwEvU23i7sRVjuh2s8mg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.6.0.tgz",
+      "integrity": "sha512-4U628tuf2U8pMr4tIBJhEkrFwt+46dwhXrDlpdyWSZtnop5RJAVKHODm0KbWns4xGKfTW1F3r6sSv+2ZxLcISA==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-x64-gnu": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.5.6.tgz",
-      "integrity": "sha512-gbFHYHfdEGW0ffk8SigDsoXks6USpilF6wR0nqB/JbWzbzFR/sBuLVNQlJl1RKNakyJHu+lsFxGy0fcTdoX8xA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.6.0.tgz",
+      "integrity": "sha512-AKRzp76fVUaJyXj5KRJT9bJyhwZyUnRQU0RqIRqOtZCT5yr6qGP8rjtQ7YhCIzWrseBlOllc3Qvbgw3Yl0VQcA==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-linux-x64-musl": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.5.6.tgz",
-      "integrity": "sha512-9v688ogoLkeFYQNgqiSErfhTreLUd8B3prIBSYUt+x4+5Kcw91zWvIh+VSxL1n3KCGGsM7cuXhkGPaxwlEh1ug==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.6.0.tgz",
+      "integrity": "sha512-0edIdq6aMBTaRMIXddHfyAFL361JqulLLd2Wi2aoOie7DkQ2MYh6gv3hA7NB9gqFwNIGE+xtJ4BkXIP2tSGPlg==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-win32-arm64-msvc": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.5.6.tgz",
-      "integrity": "sha512-DRNDXFNZb6y5IZrw+lhTTA9l4wbzO4TNRBAlHAiXUrH+pRFZ/ZJtv5WEuAj9ocVSahVw2NaK5Yaold4NPAxHog==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.6.0.tgz",
+      "integrity": "sha512-QwWpWk4ubcwJ1rljsRAmINgB2AwkyzZhpYbalA+MmzyYMREcdXWGkyixWbRZgqc6fEWEBmq5UG73qz5eBJiIKg==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-win32-ia32-msvc": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.5.6.tgz",
-      "integrity": "sha512-oUYKNR/IZjF4fsOzRpw0xesl2lOjhsQEyWlgbpT25T83EU113Xgck9UjtI7xemNI/OPCv1tPiaM1e7/ABdg5iA==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.6.0.tgz",
+      "integrity": "sha512-Vtw0yxO9+aEFuhuxQ57ALG43tjECopRimRuKGbtZYDCriB/ty5TrT3QWMdy0dxBkpDTu3Rqsz30sbDzw6tlP3Q==",
       "dev": true,
       "optional": true
     },
     "@tauri-apps/cli-win32-x64-msvc": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.5.6.tgz",
-      "integrity": "sha512-RmEf1os9C8//uq2hbjXi7Vgz9ne7798ZxqemAZdUwo1pv3oLVZSz1/IvZmUHPdy2e6zSeySqWu1D0Y3QRNN+dg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.6.0.tgz",
+      "integrity": "sha512-h54FHOvGi7+LIfRchzgZYSCHB1HDlP599vWXQQJ/XnwJY+6Rwr2E5bOe/EhqoG8rbGkfK0xX3KPAvXPbUlmggg==",
       "dev": true,
       "optional": true
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pastebar-app",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "private": true,
   "scripts": {
     "dev": "tauri dev",
@@ -67,7 +67,7 @@
     "@tanstack/react-query": "5.25.0",
     "@tanstack/react-query-devtools": "5.25.0",
     "@tanstack/react-query-persist-client": "5.25.0",
-    "@tauri-apps/api": "^1.5.3",
+    "@tauri-apps/api": "^1.6.0",
     "@types/node": "^20.10.0",
     "@uiw/codemirror-extensions-langs": "^4.21.21",
     "@uiw/codemirror-theme-github": "^4.21.21",
@@ -149,7 +149,7 @@
   "devDependencies": {
     "@changesets/cli": "^2.27.1",
     "@tailwindcss/line-clamp": "^0.4.4",
-    "@tauri-apps/cli": "^1.5.6",
+    "@tauri-apps/cli": "^1.6.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/bcryptjs": "^2.4.6",
     "@types/codemirror": "^5.60.15",

packages/pastebar-app-ui/src/layout/NavBar.tsx

@@ -142,7 +142,6 @@ export function NavBar() {
 
   useEffect(() => {
     if (systemTheme) {
-      // invoke('set_icon', { name: 'main', isDark: systemTheme === 'dark' })
       setSystemTheme(systemTheme)
     }
   }, [systemTheme])
@@ -251,12 +250,18 @@ export function NavBar() {
     navigate('/app-settings/preferences', { replace: true })
   })
 
-  useHotkeys('ctrl+q', () => {
+  useHotkeys(['ctrl+q'], () => {
     if (isWindows) {
       closeWindow()
     }
   })
 
+  useHotkeys(['meta+q'], () => {
+    if (!isWindows) {
+      closeWindow()
+    }
+  })
+
   useHotkeys(['alt+n', 'ctrl+n', 'meta+n'], async () => {
     await toggleIsSplitPanelView()
   })

src-tauri/Cargo.toml

@@ -37,7 +37,7 @@ reqwest = "0.11.12"
 nanoid = "0.4.0"
 anyhow = "1.0.66"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6", features = [ "api-all", "system-tray", "icon-png", "clipboard", "updater", "reqwest-client"] }
+tauri = { version = "1.7", features = [ "api-all", "system-tray", "icon-png", "clipboard", "updater", "reqwest-client"] }
 tokio = { version = "1.28.2", features = ["full"] } 
 #single-instance = "0.3.3"
 
@@ -73,7 +73,7 @@ regex = "1.9.3"
 
 lang_detect = { path = "libs/lang_detect" }
 auto-launch = { path = "libs/auto-launch" }
-tao = { path = "libs/tao-0.16.7" }
+# tao = { path = "libs/tao-0.16.7" }
 mid = { path = "libs/mid-hardware-id" }
 
 linkify = "0.10.0"
@@ -99,8 +99,8 @@ default = ["custom-protocol"]
 system-tray = ["tauri/system-tray"]
 custom-protocol = ["tauri/custom-protocol"]
 
-[patch.crates-io]
-tao = { path = "libs/tao-0.16.7" }
+# [patch.crates-io]
+# tao = { path = "libs/tao-0.16.7" }
 
 [profile.release]
 # panic = "abort" # Strip expensive panic clean-up logic