1
0
mirror of https://github.com/spacebarchat/client.git synced 2024-11-22 02:12:38 +01:00

fix tauri

This commit is contained in:
Puyodead1 2024-06-17 14:47:54 -04:00
parent 4770dc31ab
commit f371a972e5
No known key found for this signature in database
GPG Key ID: A4FA4FEC0DD353FC
2 changed files with 52 additions and 60 deletions

View File

@ -121,11 +121,7 @@ dependencies:
version: 6.12.4
mobx-react-lite:
specifier: ^4.0.7
<<<<<<< HEAD
version: 4.0.7(mobx@6.12.0)(react-dom@18.2.0)(react-native@0.74.2)(react@18.2.0)
=======
version: 4.0.7(mobx@6.12.4)(react-dom@18.2.0)(react-native@0.73.6)(react@18.2.0)
>>>>>>> 716d10a (Bump mobx from 6.12.0 to 6.12.4)
version: 4.0.7(mobx@6.12.4)(react-dom@18.2.0)(react-native@0.74.2)(react@18.2.0)
murmurhash-js:
specifier: ^1.0.0
version: 1.0.0
@ -2490,7 +2486,7 @@ packages:
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
jest-message-util: 27.5.1
jest-util: 27.5.1
@ -2501,7 +2497,7 @@ packages:
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies:
'@jest/types': 28.1.3
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
jest-message-util: 28.1.3
jest-util: 28.1.3
@ -2522,7 +2518,7 @@ packages:
'@jest/test-result': 27.5.1
'@jest/transform': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
ansi-escapes: 4.3.2
chalk: 4.1.2
emittery: 0.8.1
@ -2565,7 +2561,7 @@ packages:
dependencies:
'@jest/fake-timers': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-mock: 27.5.1
/@jest/environment@29.7.0:
@ -2574,7 +2570,7 @@ packages:
dependencies:
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-mock: 29.7.0
dev: false
@ -2590,7 +2586,7 @@ packages:
dependencies:
'@jest/types': 27.5.1
'@sinonjs/fake-timers': 8.1.0
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-message-util: 27.5.1
jest-mock: 27.5.1
jest-util: 27.5.1
@ -2601,7 +2597,7 @@ packages:
dependencies:
'@jest/types': 29.6.3
'@sinonjs/fake-timers': 10.3.0
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-message-util: 29.7.0
jest-mock: 29.7.0
jest-util: 29.7.0
@ -2629,7 +2625,7 @@ packages:
'@jest/test-result': 27.5.1
'@jest/transform': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
collect-v8-coverage: 1.0.2
exit: 0.1.2
@ -2731,7 +2727,7 @@ packages:
dependencies:
'@types/istanbul-lib-coverage': 2.0.6
'@types/istanbul-reports': 3.0.4
'@types/node': 20.11.21
'@types/node': 20.14.2
'@types/yargs': 15.0.19
chalk: 4.1.2
dev: false
@ -2742,7 +2738,7 @@ packages:
dependencies:
'@types/istanbul-lib-coverage': 2.0.6
'@types/istanbul-reports': 3.0.4
'@types/node': 20.11.21
'@types/node': 20.14.2
'@types/yargs': 16.0.9
chalk: 4.1.2
@ -2753,7 +2749,7 @@ packages:
'@jest/schemas': 28.1.3
'@types/istanbul-lib-coverage': 2.0.6
'@types/istanbul-reports': 3.0.4
'@types/node': 20.11.21
'@types/node': 20.14.2
'@types/yargs': 17.0.32
chalk: 4.1.2
dev: true
@ -4445,26 +4441,26 @@ packages:
resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==}
dependencies:
'@types/connect': 3.4.38
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/bonjour@3.5.13:
resolution: {integrity: sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/connect-history-api-fallback@1.5.4:
resolution: {integrity: sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==}
dependencies:
'@types/express-serve-static-core': 4.17.43
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/connect@3.4.38:
resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/debug@4.1.12:
@ -4503,7 +4499,7 @@ packages:
/@types/express-serve-static-core@4.17.43:
resolution: {integrity: sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
'@types/qs': 6.9.12
'@types/range-parser': 1.2.7
'@types/send': 0.17.4
@ -4521,7 +4517,7 @@ packages:
/@types/graceful-fs@4.1.9:
resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
/@types/hast@2.3.10:
resolution: {integrity: sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==}
@ -4553,7 +4549,7 @@ packages:
/@types/http-proxy@1.17.14:
resolution: {integrity: sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/istanbul-lib-coverage@2.0.6:
@ -4614,7 +4610,7 @@ packages:
/@types/node-forge@1.3.11:
resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
/@types/node@10.17.60:
resolution: {integrity: sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==}
@ -4626,11 +4622,6 @@ packages:
undici-types: 5.26.5
dev: false
/@types/node@20.11.21:
resolution: {integrity: sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==}
dependencies:
undici-types: 5.26.5
/@types/node@20.14.2:
resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==}
dependencies:
@ -4714,7 +4705,7 @@ packages:
/@types/resolve@1.17.1:
resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/retry@0.12.0:
@ -4729,7 +4720,7 @@ packages:
resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==}
dependencies:
'@types/mime': 1.3.5
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/serve-index@1.9.4:
@ -4743,13 +4734,13 @@ packages:
dependencies:
'@types/http-errors': 2.0.4
'@types/mime': 3.0.4
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/sockjs@0.3.36:
resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/stack-utils@2.0.3:
@ -4782,7 +4773,7 @@ packages:
/@types/ws@8.5.10:
resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
dev: true
/@types/yargs-parser@21.0.3:
@ -6174,7 +6165,7 @@ packages:
engines: {node: '>=12.13.0'}
hasBin: true
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
escape-string-regexp: 4.0.0
is-wsl: 2.2.0
lighthouse-logger: 1.4.2
@ -9469,7 +9460,7 @@ packages:
'@jest/environment': 27.5.1
'@jest/test-result': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
co: 4.6.0
dedent: 0.7.0
@ -9597,7 +9588,7 @@ packages:
'@jest/environment': 27.5.1
'@jest/fake-timers': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-mock: 27.5.1
jest-util: 27.5.1
jsdom: 16.7.0
@ -9614,7 +9605,7 @@ packages:
'@jest/environment': 27.5.1
'@jest/fake-timers': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-mock: 27.5.1
jest-util: 27.5.1
@ -9625,7 +9616,7 @@ packages:
'@jest/environment': 29.7.0
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-mock: 29.7.0
jest-util: 29.7.0
dev: false
@ -9644,7 +9635,7 @@ packages:
dependencies:
'@jest/types': 27.5.1
'@types/graceful-fs': 4.1.9
'@types/node': 20.11.21
'@types/node': 20.14.2
anymatch: 3.1.3
fb-watchman: 2.0.2
graceful-fs: 4.2.11
@ -9665,7 +9656,7 @@ packages:
'@jest/source-map': 27.5.1
'@jest/test-result': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
co: 4.6.0
expect: 27.5.1
@ -9754,14 +9745,14 @@ packages:
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
/jest-mock@29.7.0:
resolution: {integrity: sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
dependencies:
'@jest/types': 29.6.3
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-util: 29.7.0
dev: false
@ -9819,7 +9810,7 @@ packages:
'@jest/test-result': 27.5.1
'@jest/transform': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
emittery: 0.8.1
graceful-fs: 4.2.11
@ -9874,7 +9865,7 @@ packages:
resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
graceful-fs: 4.2.11
/jest-snapshot@27.5.1:
@ -9911,7 +9902,7 @@ packages:
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
dependencies:
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
ci-info: 3.9.0
graceful-fs: 4.2.11
@ -9922,7 +9913,7 @@ packages:
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies:
'@jest/types': 28.1.3
'@types/node': 20.11.21
'@types/node': 20.14.2
chalk: 4.1.2
ci-info: 3.9.0
graceful-fs: 4.2.11
@ -9985,7 +9976,7 @@ packages:
dependencies:
'@jest/test-result': 27.5.1
'@jest/types': 27.5.1
'@types/node': 20.11.21
'@types/node': 20.14.2
ansi-escapes: 4.3.2
chalk: 4.1.2
jest-util: 27.5.1
@ -9997,7 +9988,7 @@ packages:
dependencies:
'@jest/test-result': 28.1.3
'@jest/types': 28.1.3
'@types/node': 20.11.21
'@types/node': 20.14.2
ansi-escapes: 4.3.2
chalk: 4.1.2
emittery: 0.10.2
@ -10009,7 +10000,7 @@ packages:
resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
engines: {node: '>= 10.13.0'}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
merge-stream: 2.0.0
supports-color: 7.2.0
dev: true
@ -10018,7 +10009,7 @@ packages:
resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
engines: {node: '>= 10.13.0'}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
merge-stream: 2.0.0
supports-color: 8.1.1
@ -10026,7 +10017,7 @@ packages:
resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
merge-stream: 2.0.0
supports-color: 8.1.1
dev: true
@ -10035,7 +10026,7 @@ packages:
resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==}
engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
dependencies:
'@types/node': 20.11.21
'@types/node': 20.14.2
jest-util: 29.7.0
merge-stream: 2.0.0
supports-color: 8.1.1
@ -11318,11 +11309,7 @@ packages:
hasBin: true
dev: false
<<<<<<< HEAD
/mobx-react-lite@4.0.7(mobx@6.12.0)(react-dom@18.2.0)(react-native@0.74.2)(react@18.2.0):
=======
/mobx-react-lite@4.0.7(mobx@6.12.4)(react-dom@18.2.0)(react-native@0.73.6)(react@18.2.0):
>>>>>>> 716d10a (Bump mobx from 6.12.0 to 6.12.4)
/mobx-react-lite@4.0.7(mobx@6.12.4)(react-dom@18.2.0)(react-native@0.74.2)(react@18.2.0):
resolution: {integrity: sha512-RjwdseshK9Mg8On5tyJZHtGD+J78ZnCnRaxeQDSiciKVQDUbfZcXhmld0VMxAwvcTnPEHZySGGewm467Fcpreg==}
peerDependencies:
mobx: ^6.9.0

View File

@ -1,6 +1,6 @@
use tauri::{
menu::{Menu, MenuItem},
tray::{ClickType, TrayIconBuilder},
tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
Manager, Runtime,
};
@ -22,7 +22,12 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
_ => {}
})
.on_tray_icon_event(|tray, event| {
if event.click_type == ClickType::Left {
if let TrayIconEvent::Click {
button: MouseButton::Left,
button_state: MouseButtonState::Up,
..
} = event
{
let app = tray.app_handle();
if let Some(window) = app.get_webview_window("main") {
let _ = window.show();