fix(api): fix dpi types serialization (#9376)

* fix(api): fix dpi types serialization closes #9370 * Update api-position-size-args.md * lint * setMinSize and setMaxSize * Update api-position-size-args.md
tauri-apps · Apr 15, 2024 · 48a7a78 · 48a7a78
1 parent 1d39876
commit 48a7a78
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 68 deletions.
diff --git a/.changes/api-position-size-args.md b/.changes/api-position-size-args.md
@@ -0,0 +1,5 @@
+---
+"@tauri-apps/api": "patch:bug"
+---
+
+Fix `Window/Webview/WebviewWindow.setSize`, `Window/Webview/WebviewWindow.setPostion`, `Window/WebviewWindow.setMinSize`, `Window/WebviewWindow.setMaxSize`, `Window/WebviewWindow.setCursorPosition` and `Menu/Submenu.popup` methods failing with invalid args.
diff --git a/core/tauri/scripts/bundle.global.js b/core/tauri/scripts/bundle.global.js
diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock
diff --git a/tooling/api/src/menu/menu.ts b/tooling/api/src/menu/menu.ts
@@ -245,9 +245,10 @@ export class Menu extends MenuItemBase {
   ): Promise<void> {
     let atValue = null
     if (at) {
-      atValue = {
-        type: at instanceof PhysicalPosition ? 'Physical' : 'Logical',
-        data: at
+      atValue = {} as Record<string, unknown>
+      atValue[`${at instanceof PhysicalPosition ? 'Physical' : 'Logical'}`] = {
+        x: at.x,
+        y: at.y
       }
     }
     return invoke('plugin:menu|popup', {

diff --git a/tooling/api/src/menu/submenu.ts b/tooling/api/src/menu/submenu.ts
@@ -245,9 +245,10 @@ export class Submenu extends MenuItemBase {
   ): Promise<void> {
     let atValue = null
     if (at) {
-      atValue = {
-        type: at instanceof PhysicalPosition ? 'Physical' : 'Logical',
-        data: at
+      atValue = {} as Record<string, unknown>
+      atValue[`${at instanceof PhysicalPosition ? 'Physical' : 'Logical'}`] = {
+        x: at.x,
+        y: at.y
       }
     }
     return invoke('plugin:menu|popup', {

diff --git a/tooling/api/src/webview.ts b/tooling/api/src/webview.ts
@@ -417,15 +417,15 @@ class Webview {
       )
     }
 
+    const value = {} as Record<string, unknown>
+    value[`${size.type}`] = {
+      width: size.width,
+      height: size.height
+    }
+
     return invoke('plugin:webview|set_webview_size', {
       label: this.label,
-      value: {
-        type: size.type,
-        data: {
-          width: size.width,
-          height: size.height
-        }
-      }
+      value
     })
   }
 
@@ -452,15 +452,15 @@ class Webview {
       )
     }
 
+    const value = {} as Record<string, unknown>
+    value[`${position.type}`] = {
+      x: position.x,
+      y: position.y
+    }
+
     return invoke('plugin:webview|set_webview_position', {
       label: this.label,
-      value: {
-        type: position.type,
-        data: {
-          x: position.x,
-          y: position.y
-        }
-      }
+      value
     })
   }
 

diff --git a/tooling/api/src/window.ts b/tooling/api/src/window.ts
@@ -1227,15 +1227,15 @@ class Window {
       )
     }
 
+    const value = {} as Record<string, unknown>
+    value[`${size.type}`] = {
+      width: size.width,
+      height: size.height
+    }
+
     return invoke('plugin:window|set_size', {
       label: this.label,
-      value: {
-        type: size.type,
-        data: {
-          width: size.width,
-          height: size.height
-        }
-      }
+      value
     })
   }
 
@@ -1259,17 +1259,18 @@ class Window {
       )
     }
 
+    let value = null as Record<string, unknown> | null
+    if (size) {
+      value = {}
+      value[`${size.type}`] = {
+        width: size.width,
+        height: size.height
+      }
+    }
+
     return invoke('plugin:window|set_min_size', {
       label: this.label,
-      value: size
-        ? {
-            type: size.type,
-            data: {
-              width: size.width,
-              height: size.height
-            }
-          }
-        : null
+      value
     })
   }
 
@@ -1293,17 +1294,18 @@ class Window {
       )
     }
 
+    let value = null as Record<string, unknown> | null
+    if (size) {
+      value = {}
+      value[`${size.type}`] = {
+        width: size.width,
+        height: size.height
+      }
+    }
+
     return invoke('plugin:window|set_max_size', {
       label: this.label,
-      value: size
-        ? {
-            type: size.type,
-            data: {
-              width: size.width,
-              height: size.height
-            }
-          }
-        : null
+      value
     })
   }
 
@@ -1330,15 +1332,15 @@ class Window {
       )
     }
 
+    const value = {} as Record<string, unknown>
+    value[`${position.type}`] = {
+      x: position.x,
+      y: position.y
+    }
+
     return invoke('plugin:window|set_position', {
       label: this.label,
-      value: {
-        type: position.type,
-        data: {
-          x: position.x,
-          y: position.y
-        }
-      }
+      value
     })
   }
 
@@ -1516,15 +1518,15 @@ class Window {
       )
     }
 
+    const value = {} as Record<string, unknown>
+    value[`${position.type}`] = {
+      x: position.x,
+      y: position.y
+    }
+
     return invoke('plugin:window|set_cursor_position', {
       label: this.label,
-      value: {
-        type: position.type,
-        data: {
-          x: position.x,
-          y: position.y
-        }
-      }
+      value
     })
   }