fix(positioner): pass correct values through IPC (tauri-apps#1858)

amrbashir · gezihuzi · commit d33143bf7324 · 2024-10-03T23:59:02.000+08:00
* fix(positioner): pass correct values through IPC followup to tauri-apps#1822 * build api & remove packageManager field
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
@@ -102,8 +102,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/api-iife.js b/plugins/positioner/api-iife.js
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"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/shared/template/package.json b/shared/template/package.json

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@`
`24`	`24`	`"LICENSE"`
`25`	`25`	`],`
`26`	`26`	`"dependencies": {`
`27`		`- "@tauri-apps/api": "^2.0.0-rc.4"`
	`27`	`+ "@tauri-apps/api": "^2.0.0-rc.6"`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@`
`25`	`25`	`"LICENSE"`
`26`	`26`	`],`
`27`	`27`	`"dependencies": {`
`28`		`- "@tauri-apps/api": "^2.0.0-rc.4"`
	`28`	`+ "@tauri-apps/api": "^2.0.0-rc.6"`
`29`	`29`	`}`
`30`	`30`	`}`