fix(menu): ensure init & drop is done on main thread (#8582)

* fix(menu): ensure init & drop is done on main thread

* move macros back

* fix doctests

* fix macos doctests

* generate inner types and add drop implementation on inner

* clippy

* fix leftoever merge conflicts

* fix doctests

* update api example

* add missing change file

* move macro

* fix tray import

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.app>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>

Author: amrbashir

.changes/menu-accelerator-generics.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:breaking'
+---
+
+All menu item constructors `accelerator` argument have been changed to `Option<impl AsRef<str>>` so when providing `None` you need to specify the generic argument like `None::<&str>`.

.changes/menu-init-drop-main-thread.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:bug'
+---
+
+Ensure initalize logic and dropping of menu item is done on the main thread, this fixes the crash when a menu item is dropped on another thread.

.changes/menu-init-result.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:breaking'
+---
+
+All menu item constructors have been changed to return a `Result<Self>`

core/tauri/src/app.rs

@@ -1285,9 +1285,9 @@ tauri::Builder::default()
   ///       "File",
   ///       true,
   ///       &[
-  ///         &PredefinedMenuItem::close_window(handle, None),
+  ///         &PredefinedMenuItem::close_window(handle, None)?,
   ///         #[cfg(target_os = "macos")]
-  ///         &MenuItem::new(handle, "Hello", true, None),
+  ///         &MenuItem::new(handle, "Hello", true, None::<&str>)?,
   ///       ],
   ///     )?
   ///   ]));

core/tauri/src/lib.rs

@@ -954,51 +954,6 @@ pub(crate) mod sealed {
   }
 }
 
-#[cfg(any(test, feature = "test"))]
-#[cfg_attr(docsrs, doc(cfg(feature = "test")))]
-pub mod test;
-
-#[cfg(test)]
-mod tests {
-  use cargo_toml::Manifest;
-  use std::{env::var, fs::read_to_string, path::PathBuf, sync::OnceLock};
-
-  static MANIFEST: OnceLock<Manifest> = OnceLock::new();
-  const CHECKED_FEATURES: &str = include_str!(concat!(env!("OUT_DIR"), "/checked_features"));
-
-  fn get_manifest() -> &'static Manifest {
-    MANIFEST.get_or_init(|| {
-      let manifest_dir = PathBuf::from(var("CARGO_MANIFEST_DIR").unwrap());
-      Manifest::from_path(manifest_dir.join("Cargo.toml")).expect("failed to parse Cargo manifest")
-    })
-  }
-
-  #[test]
-  fn features_are_documented() {
-    let manifest_dir = PathBuf::from(var("CARGO_MANIFEST_DIR").unwrap());
-    let lib_code = read_to_string(manifest_dir.join("src/lib.rs")).expect("failed to read lib.rs");
-
-    for f in get_manifest().features.keys() {
-      if !(f.starts_with("__") || f == "default" || lib_code.contains(&format!("*{f}**"))) {
-        panic!("Feature {f} is not documented");
-      }
-    }
-  }
-
-  #[test]
-  fn aliased_features_exist() {
-    let checked_features = CHECKED_FEATURES.split(',');
-    let manifest = get_manifest();
-    for checked_feature in checked_features {
-      if !manifest.features.iter().any(|(f, _)| f == checked_feature) {
-        panic!(
-          "Feature {checked_feature} was checked in the alias build step but it does not exist in core/tauri/Cargo.toml"
-        );
-      }
-    }
-  }
-}
-
 #[derive(Deserialize)]
 #[serde(untagged)]
 pub(crate) enum IconDto {
@@ -1035,22 +990,67 @@ impl From<IconDto> for Icon {
 
 #[allow(unused)]
 macro_rules! run_main_thread {
-  ($self:ident, $ex:expr) => {{
+  ($handle:ident, $ex:expr) => {{
     use std::sync::mpsc::channel;
     let (tx, rx) = channel();
-    let self_ = $self.clone();
     let task = move || {
       let f = $ex;
-      let _ = tx.send(f(self_));
+      let _ = tx.send(f());
     };
-    $self.app_handle.run_on_main_thread(Box::new(task))?;
-    rx.recv().map_err(|_| crate::Error::FailedToReceiveMessage)
+    $handle
+      .run_on_main_thread(task)
+      .and_then(|_| rx.recv().map_err(|_| crate::Error::FailedToReceiveMessage))
   }};
 }
 
 #[allow(unused)]
 pub(crate) use run_main_thread;
 
+#[cfg(any(test, feature = "test"))]
+#[cfg_attr(docsrs, doc(cfg(feature = "test")))]
+pub mod test;
+
+#[cfg(test)]
+mod tests {
+  use cargo_toml::Manifest;
+  use std::{env::var, fs::read_to_string, path::PathBuf, sync::OnceLock};
+
+  static MANIFEST: OnceLock<Manifest> = OnceLock::new();
+  const CHECKED_FEATURES: &str = include_str!(concat!(env!("OUT_DIR"), "/checked_features"));
+
+  fn get_manifest() -> &'static Manifest {
+    MANIFEST.get_or_init(|| {
+      let manifest_dir = PathBuf::from(var("CARGO_MANIFEST_DIR").unwrap());
+      Manifest::from_path(manifest_dir.join("Cargo.toml")).expect("failed to parse Cargo manifest")
+    })
+  }
+
+  #[test]
+  fn features_are_documented() {
+    let manifest_dir = PathBuf::from(var("CARGO_MANIFEST_DIR").unwrap());
+    let lib_code = read_to_string(manifest_dir.join("src/lib.rs")).expect("failed to read lib.rs");
+
+    for f in get_manifest().features.keys() {
+      if !(f.starts_with("__") || f == "default" || lib_code.contains(&format!("*{f}**"))) {
+        panic!("Feature {f} is not documented");
+      }
+    }
+  }
+
+  #[test]
+  fn aliased_features_exist() {
+    let checked_features = CHECKED_FEATURES.split(',');
+    let manifest = get_manifest();
+    for checked_feature in checked_features {
+      if !manifest.features.iter().any(|(f, _)| f == checked_feature) {
+        panic!(
+          "Feature {checked_feature} was checked in the alias build step but it does not exist in core/tauri/Cargo.toml"
+        );
+      }
+    }
+  }
+}
+
 #[cfg(test)]
 mod test_utils {
   use proptest::prelude::*;

core/tauri/src/menu/builders/check.rs

@@ -67,7 +67,7 @@ impl CheckMenuItemBuilder {
   }
 
   /// Build the menu item
-  pub fn build<R: Runtime, M: Manager<R>>(self, manager: &M) -> CheckMenuItem<R> {
+  pub fn build<R: Runtime, M: Manager<R>>(self, manager: &M) -> crate::Result<CheckMenuItem<R>> {
     if let Some(id) = self.id {
       CheckMenuItem::with_id(
         manager,

core/tauri/src/menu/builders/icon.rs

@@ -87,7 +87,7 @@ impl IconMenuItemBuilder {
   }
 
   /// Build the menu item
-  pub fn build<R: Runtime, M: Manager<R>>(self, manager: &M) -> IconMenuItem<R> {
+  pub fn build<R: Runtime, M: Manager<R>>(self, manager: &M) -> crate::Result<IconMenuItem<R>> {
     if self.icon.is_some() {
       if let Some(id) = self.id {
         IconMenuItem::with_id(