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

* fix(positioner): pass correct values through IPC

followup to https://github.com/tauri-apps/plugins-workspace/pull/1822

* build api & remove packageManager field

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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);

plugins/positioner/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";async function o(t,o={},e){return window.__TAURI_INTERNALS__.invoke(t,o,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(e=t.Position||(t.Position={}))[e.TopLeft=0]="TopLeft",e[e.TopRight=1]="TopRight",e[e.BottomLeft=2]="BottomLeft",e[e.BottomRight=3]="BottomRight",e[e.TopCenter=4]="TopCenter",e[e.BottomCenter=5]="BottomCenter",e[e.LeftCenter=6]="LeftCenter",e[e.RightCenter=7]="RightCenter",e[e.Center=8]="Center",e[e.TrayLeft=9]="TrayLeft",e[e.TrayBottomLeft=10]="TrayBottomLeft",e[e.TrayRight=11]="TrayRight",e[e.TrayBottomRight=12]="TrayBottomRight",e[e.TrayCenter=13]="TrayCenter",e[e.TrayBottomCenter=14]="TrayBottomCenter",t.handleIconState=async function(t){await async function(t){await o("plugin:positioner|set_tray_icon_state",{position:t.position,size:t.size})}(t.rect)},t.moveWindow=async function(t){await o("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";async function e(t,e={},o){return window.__TAURI_INTERNALS__.invoke(t,e,o)}var o;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(o=t.Position||(t.Position={}))[o.TopLeft=0]="TopLeft",o[o.TopRight=1]="TopRight",o[o.BottomLeft=2]="BottomLeft",o[o.BottomRight=3]="BottomRight",o[o.TopCenter=4]="TopCenter",o[o.BottomCenter=5]="BottomCenter",o[o.LeftCenter=6]="LeftCenter",o[o.RightCenter=7]="RightCenter",o[o.Center=8]="Center",o[o.TrayLeft=9]="TrayLeft",o[o.TrayBottomLeft=10]="TrayBottomLeft",o[o.TrayRight=11]="TrayRight",o[o.TrayBottomRight=12]="TrayBottomRight",o[o.TrayCenter=13]="TrayCenter",o[o.TrayBottomCenter=14]="TrayBottomCenter",t.handleIconState=async function(t){const o={};o[`${t.rect.size.type}`]={width:t.rect.size.width,height:t.rect.size.height};const i={};i[`${t.rect.position.type}`]={x:t.rect.position.x,y:t.rect.position.y},await e("plugin:positioner|set_tray_icon_state",{position:i,size:o})},t.moveWindow=async function(t){await e("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})}

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,
+    position,
-    size: rect.size
+    size
   })
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

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"
   }
 }

pnpm-lock.yaml

@@ -143,37 +143,37 @@ importers:
   plugins/autostart:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/barcode-scanner:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/biometric:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/cli:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/clipboard-manager:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/deep-link:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/deep-link/examples/app:
@@ -198,79 +198,79 @@ importers:
   plugins/dialog:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/fs:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/geolocation:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/global-shortcut:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/haptics:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/http:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/log:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/nfc:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/notification:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/os:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/positioner:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/process:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/shell:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/single-instance/examples/vanilla:
@@ -282,13 +282,13 @@ importers:
   plugins/sql:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/store:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/store/examples/AppSettingsManager:
@@ -306,25 +306,25 @@ importers:
   plugins/stronghold:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/updater:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/upload:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/websocket:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
   plugins/websocket/examples/tauri-app:
@@ -346,7 +346,7 @@ importers:
   plugins/window-state:
     dependencies:
       '@tauri-apps/api':
-        specifier: ^2.0.0-rc.4
+        specifier: ^2.0.0-rc.6
         version: 2.0.0-rc.6
 
 packages:
@@ -2330,9 +2330,9 @@ snapshots:
       - encoding
       - mocha
 
-  '@covector/assemble@0.12.0':
+  '@covector/assemble@0.12.0(mocha@10.7.3)':
     dependencies:
-      '@covector/command': 0.8.0
+      '@covector/command': 0.8.0(mocha@10.7.3)
       '@covector/files': 0.8.0
       effection: 2.0.8(mocha@10.7.3)
       js-yaml: 4.1.0
@@ -2343,9 +2343,10 @@ snapshots:
       unified: 9.2.2
     transitivePeerDependencies:
       - encoding
+      - mocha
       - supports-color
 
-  '@covector/changelog@0.12.0':
+  '@covector/changelog@0.12.0(mocha@10.7.3)':
     dependencies:
       '@covector/files': 0.8.0
       effection: 2.0.8(mocha@10.7.3)
@@ -2355,14 +2356,16 @@ snapshots:
       unified: 9.2.2
     transitivePeerDependencies:
       - encoding
+      - mocha
       - supports-color
 
-  '@covector/command@0.8.0':
+  '@covector/command@0.8.0(mocha@10.7.3)':
     dependencies:
-      '@effection/process': 2.1.4
+      '@effection/process': 2.1.4(mocha@10.7.3)
       effection: 2.0.8(mocha@10.7.3)
     transitivePeerDependencies:
       - encoding
+      - mocha
 
   '@covector/files@0.8.0':
     dependencies:
@@ -2409,10 +2412,8 @@ snapshots:
     dependencies:
       effection: 2.0.8(mocha@10.7.3)
       mocha: 10.7.3
-    transitivePeerDependencies:
-      - encoding
 
-  '@effection/process@2.1.4':
+  '@effection/process@2.1.4(mocha@10.7.3)':
     dependencies:
       cross-spawn: 7.0.3
       ctrlc-windows: 2.1.0
@@ -2420,6 +2421,7 @@ snapshots:
       shellwords: 0.1.1
     transitivePeerDependencies:
       - encoding
+      - mocha
 
   '@effection/stream@2.0.6':
     dependencies:
@@ -3223,9 +3225,9 @@ snapshots:
     dependencies:
       '@clack/prompts': 0.7.0
       '@covector/apply': 0.10.0(mocha@10.7.3)
-      '@covector/assemble': 0.12.0
+      '@covector/assemble': 0.12.0(mocha@10.7.3)
-      '@covector/changelog': 0.12.0
+      '@covector/changelog': 0.12.0(mocha@10.7.3)
-      '@covector/command': 0.8.0
+      '@covector/command': 0.8.0(mocha@10.7.3)
       '@covector/files': 0.8.0
       effection: 2.0.8(mocha@10.7.3)
       globby: 11.1.0

shared/template/package.json

@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "2.0.0-rc.4"
+    "@tauri-apps/api": "^2.0.0-rc.6"
   }
 }