fix(positioner): pass correct values through IPC

followup to #1822
tauri-apps · Oct 2, 2024 · a828fc0 · a828fc0
1 parent f12d356
commit a828fc0
Show file tree

Hide file tree

Showing 31 changed files with 83 additions and 72 deletions.
diff --git a/package.json b/package.json
@@ -31,5 +31,6 @@
   },
   "engines": {
     "pnpm": "^9.0.0"
-  }
+  },
+  "packageManager": "pnpm@9.11.0+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b"
 }
diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/barcode-scanner/package.json b/plugins/barcode-scanner/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/biometric/package.json b/plugins/biometric/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/cli/package.json b/plugins/cli/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/clipboard-manager/package.json b/plugins/clipboard-manager/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/fs/package.json b/plugins/fs/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/geolocation/package.json b/plugins/geolocation/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/global-shortcut/package.json b/plugins/global-shortcut/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/haptics/package.json b/plugins/haptics/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/http/package.json b/plugins/http/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/log/package.json b/plugins/log/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/nfc/package.json b/plugins/nfc/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/notification/package.json b/plugins/notification/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/os/package.json b/plugins/os/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md
@@ -94,8 +94,8 @@ import {
 const action = async (event: TrayIconEvent) => {
   // add the handle in the action to update the state
   await handleIconState(event);
-  if ("click" in event) {
-    const { click } = event;
+
+  if (event.type === "Click") {
     // note this option requires enabling the `tray-icon`
     //   feature in the Cargo.toml
     await moveWindow(Position.TrayLeft);

diff --git a/plugins/positioner/guest-js/index.ts b/plugins/positioner/guest-js/index.ts
@@ -40,12 +40,20 @@ export async function moveWindow(to: Position): Promise<void> {
 }
 
 export async function handleIconState(event: TrayIconEvent): Promise<void> {
-  await invokeSetTrayIconState(event.rect)
-}
+  const size = {} as Record<string, unknown>
+  size[`${event.rect.size.type}`] = {
+    width: event.rect.size.width,
+    height: event.rect.size.height
+  }
+
+  const position = {} as Record<string, unknown>
+  position[`${event.rect.position.type}`] = {
+    x: event.rect.position.x,
+    y: event.rect.position.y
+  }
 
-async function invokeSetTrayIconState(rect: TrayIconEvent['rect']) {
   await invoke('plugin:positioner|set_tray_icon_state', {
-    position: rect.position,
-    size: rect.size
+    position,
+    size
   })
 }
diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/process/package.json b/plugins/process/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/shell/package.json b/plugins/shell/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/sql/package.json b/plugins/sql/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/store/package.json b/plugins/store/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/updater/package.json b/plugins/updater/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/upload/package.json b/plugins/upload/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }
diff --git a/plugins/window-state/package.json b/plugins/window-state/package.json
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }