untagged & YesNoCancel

Author: amrbashir

package.json

@@ -35,5 +35,6 @@
   },
   "engines": {
     "pnpm": "^10.0.0"
-  }
+  },
+  "packageManager": "[email protected]+sha512.cdf928fca20832cd59ec53826492b7dc25dc524d4370b6b4adbf65803d32efaa6c1c88147c0ae4e8d579a6c9eec715757b50d4fa35eea179d868eada4ed043af"
 }

plugins/dialog/api-iife.js

@@ -82,7 +82,11 @@ interface SaveDialogOptions {
  *
  * @since 2.3.0
  */
-export type MessageDialogDefaultButtons = 'Ok' | 'OkCancel' | 'YesNo'
+export type MessageDialogDefaultButtons =
+  | 'Ok'
+  | 'OkCancel'
+  | 'YesNo'
+  | 'YesNoCancel'
 
 /**
  * The Yes, No and Cancel buttons of a message dialog.
@@ -307,22 +311,6 @@ async function save(options: SaveDialogOptions = {}): Promise<string | null> {
  */
 export type MessageDialogResult = 'Yes' | 'No' | 'Ok' | 'Cancel' | (string & {})
 
-type MessageDialogResultRust =
-  | 'Yes'
-  | 'No'
-  | 'Ok'
-  | 'Cancel'
-  | { Custom: string }
-
-/** Internal function to convert the result to JS. */
-function resultToJS(res: MessageDialogResultRust): MessageDialogResult {
-  if (typeof res === 'string') {
-    return res
-  } else {
-    return res.Custom
-  }
-}
-
 /**
  * Shows a message dialog with an `Ok` button.
  * @example
@@ -346,15 +334,13 @@ async function message(
 ): Promise<MessageDialogResult> {
   const opts = typeof options === 'string' ? { title: options } : options
 
-  const res = await invoke<MessageDialogResultRust>('plugin:dialog|message', {
+  return invoke<MessageDialogResult>('plugin:dialog|message', {
     message: message.toString(),
     title: opts?.title?.toString(),
     kind: opts?.kind,
     okButtonLabel: opts?.okLabel?.toString(),
     buttons: buttonsToRust(opts?.buttons)
   })
-
-  return resultToJS(res)
 }
 
 /**

plugins/dialog/guest-js/index.ts

@@ -13,7 +13,7 @@ use rfd::{AsyncFileDialog, AsyncMessageDialog};
 use serde::de::DeserializeOwned;
 use tauri::{plugin::PluginApi, AppHandle, Runtime};
 
-use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder};
+use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder, CANCEL, NO, YES};
 
 pub fn init<R: Runtime, C: DeserializeOwned>(
     app: &AppHandle<R>,
@@ -115,6 +115,9 @@ impl From<MessageDialogButtons> for rfd::MessageButtons {
             MessageDialogButtons::YesNo => Self::YesNo,
             MessageDialogButtons::OkCustom(ok) => Self::OkCustom(ok),
             MessageDialogButtons::OkCancelCustom(ok, cancel) => Self::OkCancelCustom(ok, cancel),
+            MessageDialogButtons::YesNoCancel => {
+                Self::YesNoCancelCustom(YES.into(), NO.into(), CANCEL.into())
+            }
             MessageDialogButtons::YesNoCancelCustom(yes, no, cancel) => {
                 Self::YesNoCancelCustom(yes, no, cancel)
             }

plugins/dialog/src/desktop.rs

@@ -243,6 +243,7 @@ impl<R: Runtime> MessageDialogBuilder<R> {
             MessageDialogButtons::Ok => (Some(OK), None, None),
             MessageDialogButtons::OkCancel => (Some(OK), None, Some(CANCEL)),
             MessageDialogButtons::YesNo => (Some(YES), Some(NO), None),
+            MessageDialogButtons::YesNoCancel => (Some(YES), Some(NO), Some(CANCEL)),
             MessageDialogButtons::OkCustom(ok) => (Some(ok.as_str()), None, None),
             MessageDialogButtons::OkCancelCustom(ok, cancel) => {
                 (Some(ok.as_str()), None, Some(cancel.as_str()))

plugins/dialog/src/lib.rs

@@ -61,6 +61,8 @@ pub enum MessageDialogButtons {
     OkCancel,
     /// 2 buttons `Yes` and `No` with OS default dialog texts
     YesNo,
+    /// 3 buttons `Yes`, `No` and `Cancel` with OS default dialog texts
+    YesNoCancel,
     /// A single `Ok` button with custom text
     OkCustom(String),
     /// 2 buttons `Ok` and `Cancel` with custom texts
@@ -71,6 +73,7 @@ pub enum MessageDialogButtons {
 
 /// Result of a message dialog
 #[derive(Debug, Default, Clone, PartialEq, Eq, Deserialize, Serialize)]
+#[serde(untagged)]
 pub enum MessageDialogResult {
     Yes,
     No,